Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / arch / arm / boot / dts / at91sam9g45.dtsi

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index cbcc058..9cdaecf 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -632,40 +632,41 @@
                        };
 
                        adc0: adc@fffb0000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                compatible = "atmel,at91sam9260-adc";
                                reg = <0xfffb0000 0x100>;
                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
                                atmel,adc-use-external-triggers;
                                atmel,adc-channels-used = <0xff>;
                                atmel,adc-vref = <3300>;
-                               atmel,adc-num-channels = <8>;
                                atmel,adc-startup-time = <40>;
-                               atmel,adc-channel-base = <0x30>;
-                               atmel,adc-drdy-mask = <0x10000>;
-                               atmel,adc-status-register = <0x1c>;
-                               atmel,adc-trigger-register = <0x08>;
                                atmel,adc-res = <8 10>;
                                atmel,adc-res-names = "lowres", "highres";
                                atmel,adc-use-res = "highres";
 
                                trigger@0 {
+                                       reg = <0>;
                                        trigger-name = "external-rising";
                                        trigger-value = <0x1>;
                                        trigger-external;
                                };
                                trigger@1 {
+                                       reg = <1>;
                                        trigger-name = "external-falling";
                                        trigger-value = <0x2>;
                                        trigger-external;
                                };
 
                                trigger@2 {
+                                       reg = <2>;
                                        trigger-name = "external-any";
                                        trigger-value = <0x3>;
                                        trigger-external;
                                };
 
                                trigger@3 {
+                                       reg = <3>;
                                        trigger-name = "continuous";
                                        trigger-value = <0x6>;
                                };
@@ -817,6 +818,7 @@
                              >;
                        atmel,nand-addr-offset = <21>;
                        atmel,nand-cmd-offset = <22>;
+                       atmel,nand-has-dma;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_nand>;
                        gpios = <&pioC 8 GPIO_ACTIVE_HIGH