Merge tag 'at91-ab-4.6-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / at91-sama5d2_xplained.dts

diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
index 77ddff036409f7cb84d28342f8b973ce9792d09e..5b65ffe0845afb0e601245523e9235e721e9dd93 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
@@ -114,9 +114,15 @@
 
                        macb0: ethernet@f8008000 {
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_macb0_default>;
+                               pinctrl-0 = <&pinctrl_macb0_default &pinctrl_macb0_phy_irq>;
                                phy-mode = "rmii";
                                status = "okay";
+
+                               ethernet-phy@1 {
+                                       reg = <0x1>;
+                                       interrupt-parent = <&pioA>;
+                                       interrupts = <73 IRQ_TYPE_LEVEL_LOW>;
+                               };
                        };
 
                        pdmic@f8018000 {
@@ -261,7 +267,29 @@
                                };
                        };
 
+                       adc: adc@fc030000 {
+                               vddana-supply = <&vdd_3v3_lp_reg>;
+                               vref-supply = <&vdd_3v3_lp_reg>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_adc_default>;
+                               status = "okay";
+                       };
+
                        pinctrl@fc038000 {
+                               /*
+                                * There is no real pinmux for ADC, if the pin
+                                * is not requested by another peripheral then
+                                * the muxing is done when channel is enabled.
+                                * Requesting pins for ADC is GPIO is
+                                * encouraged to prevent conflicts and to
+                                * disable bias in order to be in the same
+                                * state when the pin is not muxed to the adc.
+                                */
+                               pinctrl_adc_default: adc_default {
+                                       pinmux = <PIN_PD23__GPIO>;
+                                       bias-disable;
+                               };
+
                                pinctrl_flx0_default: flx0_default {
                                        pinmux = <PIN_PB28__FLEXCOM0_IO0>,
                                                 <PIN_PB29__FLEXCOM0_IO1>;
@@ -300,6 +328,10 @@
                                        bias-disable;
                                };
 
+                               pinctrl_macb0_phy_irq: macb0_phy_irq {
+                                       pinmux = <PIN_PC9__GPIO>;
+                               };
+
                                pinctrl_pdmic_default: pdmic_default {
                                        pinmux = <PIN_PB26__PDMIC_DAT>,
                                                <PIN_PB27__PDMIC_CLK>;