Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / keystone-k2l.dtsi

diff --git a/arch/arm/boot/dts/keystone-k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi
index 4431310bc922bf3c6e4de97f4bcd0dc2ee262056..4370e6513aa4ff23c5e0b01c03250b9de2401b76 100644 (file)
--- a/arch/arm/boot/dts/keystone-k2l.dtsi
+++ b/arch/arm/boot/dts/keystone-k2l.dtsi
@@ -43,7 +43,7 @@
        soc {
                /include/ "keystone-k2l-clocks.dtsi"
 
-               uart2: serial@02348400 {
+               uart2: serial@2348400 {
                        compatible = "ti,da830-uart", "ns16550a";
                        current-speed = <115200>;
                        reg-shift = <2>;
@@ -53,7 +53,7 @@
                        interrupts = <GIC_SPI 432 IRQ_TYPE_EDGE_RISING>;
                };
 
-               uart3:  serial@02348800 {
+               uart3:  serial@2348800 {
                        compatible = "ti,da830-uart", "ns16550a";
                        current-speed = <115200>;
                        reg-shift = <2>;
@@ -63,7 +63,7 @@
                        interrupts = <GIC_SPI 435 IRQ_TYPE_EDGE_RISING>;
                };
 
-               k2l_pmx: pinmux@02620690 {
+               k2l_pmx: pinmux@2620690 {
                        compatible = "pinctrl-single";
                        reg = <0x02620690 0xc>;
                        #address-cells = <1>;
@@ -213,7 +213,7 @@
                        };
                };
 
-               msm_ram: msmram@0c000000 {
+               msm_ram: msmram@c000000 {
                        compatible = "mmio-sram";
                        reg = <0x0c000000 0x200000>;
                        ranges = <0x0 0x0c000000 0x200000>;
@@ -225,7 +225,7 @@
                        };
                };
 
-               psc: power-sleep-controller@02350000 {
+               psc: power-sleep-controller@2350000 {
                        pscrst: reset-controller {
                                compatible = "ti,k2l-pscrst", "ti,syscon-reset";
                                #reset-cells = <1>;
@@ -247,7 +247,7 @@
                        clocks = <&clkosr>;
                };
 
-               dspgpio0: keystone_dsp_gpio@02620240 {
+               dspgpio0: keystone_dsp_gpio@2620240 {
                        compatible = "ti,keystone-dsp-gpio";
                        gpio-controller;
                        #gpio-cells = <2>;