Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / sama5d3.dtsi

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 0bb5b6f..7c97965 100644 (file)
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -55,7 +55,7 @@
                interrupts = <46 IRQ_TYPE_LEVEL_HIGH 0>;
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x8000000>;
        };
@@ -83,6 +83,9 @@
        sram: sram@300000 {
                compatible = "mmio-sram";
                reg = <0x00300000 0x20000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges = <0 0x00300000 0x20000>;
        };
 
        ahb {
@@ -302,9 +305,7 @@
                        };
 
                        adc0: adc@f8018000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "atmel,at91sam9x5-adc";
+                               compatible = "atmel,sama5d3-adc";
                                reg = <0xf8018000 0x100>;
                                interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
@@ -330,30 +331,8 @@
                                atmel,adc-startup-time = <40>;
                                atmel,adc-use-external-triggers;
                                atmel,adc-vref = <3000>;
-                               atmel,adc-res = <10 12>;
                                atmel,adc-sample-hold-time = <11>;
-                               atmel,adc-res-names = "lowres", "highres";
                                status = "disabled";
-
-                               trigger0 {
-                                       trigger-name = "external-rising";
-                                       trigger-value = <0x1>;
-                                       trigger-external;
-                               };
-                               trigger1 {
-                                       trigger-name = "external-falling";
-                                       trigger-value = <0x2>;
-                                       trigger-external;
-                               };
-                               trigger2 {
-                                       trigger-name = "external-any";
-                                       trigger-value = <0x3>;
-                                       trigger-external;
-                               };
-                               trigger3 {
-                                       trigger-name = "continuous";
-                                       trigger-value = <0x6>;
-                               };
                        };
 
                        i2c2: i2c@f801c000 {
@@ -1073,6 +1052,9 @@
                        compatible = "mmio-sram";
                        no-memory-wc;
                        reg = <0x200000 0x2400>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0x200000 0x2400>;
                };
 
                usb0: gadget@500000 {