Merge tag 'Smack-for-5.11-io_uring-fix' of git://github.com/cschaufler/smack-next

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

diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 4d70194..730d118 100644 (file)
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -38,16 +38,17 @@
        };
 
        cpus {
-               #address-cells = <0>;
+               #address-cells = <1>;
                #size-cells = <0>;
 
-               cpu {
+               cpu@0 {
                        compatible = "arm,arm926ej-s";
                        device_type = "cpu";
+                       reg = <0>;
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x04000000>;
        };
@@ -75,6 +76,9 @@
        sram: sram@300000 {
                compatible = "mmio-sram";
                reg = <0x00300000 0x10000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges = <0 0x00300000 0x10000>;
        };
 
        ahb {
@@ -262,8 +266,6 @@
                        };
 
                        adc0: adc@fffd0000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9rl-adc";
                                reg = <0xfffd0000 0x100>;
                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -273,29 +275,6 @@
                                atmel,adc-channels-used = <0x3f>;
                                atmel,adc-vref = <3300>;
                                atmel,adc-startup-time = <40>;
-                               atmel,adc-res = <8 10>;
-                               atmel,adc-res-names = "lowres", "highres";
-                               atmel,adc-use-res = "highres";
-
-                               trigger0 {
-                                       trigger-name = "timer-counter-0";
-                                       trigger-value = <0x1>;
-                               };
-                               trigger1 {
-                                       trigger-name = "timer-counter-1";
-                                       trigger-value = <0x3>;
-                               };
-
-                               trigger2 {
-                                       trigger-name = "timer-counter-2";
-                                       trigger-value = <0x5>;
-                               };
-
-                               trigger3 {
-                                       trigger-name = "external";
-                                       trigger-value = <0x13>;
-                                       trigger-external;
-                               };
                        };
 
                        usb0: gadget@fffd4000 {