Merge tag 'efi-2020-07-rc2-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / arch / arm / dts / at91sam9260.dtsi

diff --git a/arch/arm/dts/at91sam9260.dtsi b/arch/arm/dts/at91sam9260.dtsi
index 0f25e336dab527fdcf7d0e8688b94b758c092cf3..800d96eb2fcc6b8e05708cc60c3ab6b2786c7d99 100644 (file)
--- a/arch/arm/dts/at91sam9260.dtsi
+++ b/arch/arm/dts/at91sam9260.dtsi
@@ -34,11 +34,9 @@
                tcb1 = &tcb1;
                i2c0 = &i2c0;
                ssc0 = &ssc0;
+               spi0 = &spi0;
        };
        cpus {
-               #address-cells = <0>;
-               #size-cells = <0>;
-
                cpu {
                        compatible = "arm,arm926ej-s";
                        device_type = "cpu";
@@ -439,7 +437,7 @@
                                u-boot,dm-pre-reloc;
                        };
 
-                       pinctrl@fffff400 {
+                       pinctrl: pinctrl@fffff400 {
                                #address-cells = <1>;
                                #size-cells = <1>;
                                compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
@@ -980,7 +978,7 @@
                                };
                        };
 
-                       rtc@fffffd20 {
+                       rtc: rtc@fffffd20 {
                                compatible = "atmel,at91sam9260-rtt";
                                reg = <0xfffffd20 0x10>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -988,7 +986,7 @@
                                status = "disabled";
                        };
 
-                       watchdog@fffffd40 {
+                       watchdog: watchdog@fffffd40 {
                                compatible = "atmel,at91sam9260-wdt";
                                reg = <0xfffffd40 0x10>;
                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;