ARM: at91/dt: sama5d4: move ADC pinctrl to board device trees

The ADC pinctrl is board specific, move it to the board device trees.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
index 22ad7c9..07f4696 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
@@ -131,6 +131,15 @@
                        };
 
                        adc0: adc@fc034000 {
+                               pinctrl-names = "default";
+                               pinctrl-0 = <
+                                       /* external trigger conflicts with USBA_VBUS */
+                                       &pinctrl_adc0_ad0
+                                       &pinctrl_adc0_ad1
+                                       &pinctrl_adc0_ad2
+                                       &pinctrl_adc0_ad3
+                                       &pinctrl_adc0_ad4
+                                       >;
                                atmel,adc-vref = <3300>;
                                status = "okay";
                        };

diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts
index d782f29..49a59c7 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d4ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d4ek.dts
@@ -100,6 +100,15 @@
                        };
 
                        adc0: adc@fc034000 {
+                               pinctrl-names = "default";
+                               pinctrl-0 = <
+                                       /* external trigger conflicts with USBA_VBUS */
+                                       &pinctrl_adc0_ad0
+                                       &pinctrl_adc0_ad1
+                                       &pinctrl_adc0_ad2
+                                       &pinctrl_adc0_ad3
+                                       &pinctrl_adc0_ad4
+                                       >;
                                /* The vref depends on JP22 of EK. If connect 1-2 then use 3.3V. connect 2-3 use 3.0V */
                                atmel,adc-vref = <3300>;
                                /*atmel,adc-ts-wires = <4>;*/   /* Set up ADC touch screen */

diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 3e27e8a..261b6ac 100644 (file)
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -1193,15 +1193,6 @@
                                compatible = "atmel,at91sam9x5-adc";
                                reg = <0xfc034000 0x100>;
                                interrupts = <44 IRQ_TYPE_LEVEL_HIGH 5>;
-                               pinctrl-names = "default";
-                               pinctrl-0 = <
-                                       /* external trigger is conflict with USBA_VBUS */
-                                       &pinctrl_adc0_ad0
-                                       &pinctrl_adc0_ad1
-                                       &pinctrl_adc0_ad2
-                                       &pinctrl_adc0_ad3
-                                       &pinctrl_adc0_ad4
-                                       >;
                                clocks = <&adc_clk>,
                                         <&adc_op_clk>;
                                clock-names = "adc_clk", "adc_op_clk";