Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes

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

diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index b1a26b4..b44e639 100644 (file)
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -124,7 +124,7 @@
                };
        };
 
-       ns_sram: sram@00200000 {
+       ns_sram: sram@200000 {
                compatible = "mmio-sram";
                reg = <0x00200000 0x20000>;
        };
@@ -135,13 +135,13 @@
                #size-cells = <1>;
                ranges;
 
-               nfc_sram: sram@00100000 {
+               nfc_sram: sram@100000 {
                        compatible = "mmio-sram";
                        no-memory-wc;
                        reg = <0x00100000 0x2400>;
                };
 
-               usb0: gadget@00300000 {
+               usb0: gadget@300000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "atmel,sama5d3-udc";
@@ -271,7 +271,7 @@
                        };
                };
 
-               usb1: ohci@00400000 {
+               usb1: ohci@400000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00400000 0x100000>;
                        interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -280,7 +280,7 @@
                        status = "disabled";
                };
 
-               usb2: ehci@00500000 {
+               usb2: ehci@500000 {
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00500000 0x100000>;
                        interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -289,7 +289,7 @@
                        status = "disabled";
                };
 
-               L2: cache-controller@00a00000 {
+               L2: cache-controller@a00000 {
                        compatible = "arm,pl310-cache";
                        reg = <0x00a00000 0x1000>;
                        interrupts = <63 IRQ_TYPE_LEVEL_HIGH 4>;