Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 1fbee2a..2ab730f 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -41,16 +41,17 @@
                pwm0 = &pwm0;
        };
        cpus {
-               #address-cells = <0>;
+               #address-cells = <1>;
                #size-cells = <0>;
 
-               cpu {
+               cpu@0 {
                        compatible = "arm,arm926ej-s";
                        device_type = "cpu";
+                       reg = <0>;
                };
        };
 
-       memory {
+       memory@70000000 {
                device_type = "memory";
                reg = <0x70000000 0x10000000>;
        };
@@ -78,6 +79,9 @@
        sram: sram@300000 {
                compatible = "mmio-sram";
                reg = <0x00300000 0x10000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges = <0 0x00300000 0x10000>;
        };
 
        ahb {
@@ -808,8 +812,6 @@
                        };
 
                        adc0: adc@fffb0000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                                compatible = "atmel,at91sam9g45-adc";
                                reg = <0xfffb0000 0x100>;
                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -818,31 +820,6 @@
                                atmel,adc-channels-used = <0xff>;
                                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 = "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>;
-                               };
                        };
 
                        isi@fffb4000 {
@@ -871,7 +848,6 @@
                                compatible = "atmel,hsmci";
                                reg = <0xfff80000 0x600>;
                                interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
-                               pinctrl-names = "default";
                                dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
@@ -885,7 +861,6 @@
                                compatible = "atmel,hsmci";
                                reg = <0xfffd0000 0x600>;
                                interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;
-                               pinctrl-names = "default";
                                dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>;
                                dma-names = "rxtx";
                                #address-cells = <1>;