summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJosh Wu <josh.wu@atmel.com>2015-01-04 12:02:31 +0300
committerNicolas Ferre <nicolas.ferre@atmel.com>2015-01-15 18:14:17 +0300
commitfbe18601a521d2ac2a6190107970a4e882a06a5d (patch)
treec3a6130c58a279e4e81312d3d12da27287caf4ae /arch
parent97889b14ed6f18e85dedca32116c2e4502b445c6 (diff)
downloadlinux-fbe18601a521d2ac2a6190107970a4e882a06a5d.tar.xz
ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK
For sama5d3xmb board, the pins: pinctrl_isi_pck_as_mck is pck1, and used to provide MCK for camera sensor. We change its name to: pinctrl_pck1_as_isi_mck. As we want camera sensor instead of ISI to configure the pck1 (ISI_MCK) pin. So we remove this pinctrl from ISI DT node. It will be added in sensor's DT node. Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/sama5d3xmb.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index db47f8b81837..d9464fce4c0e 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -61,7 +61,7 @@
isi: isi@f0034000 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_isi_data_0_7 &pinctrl_isi_pck_as_mck>;
+ pinctrl-0 = <&pinctrl_isi_data_0_7>;
};
mmc1: mmc@f8000000 {
@@ -117,7 +117,7 @@
<AT91_PIOD 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD30 periph B */
};
- pinctrl_isi_pck_as_mck: isi_pck_as_mck-0 {
+ pinctrl_pck1_as_isi_mck: pck1_as_isi_mck-0 {
atmel,pins =
<AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
};