ARM: tegra: remove "0, " from DT unit addresses

Apparently the unit address in a DT node name is now supposed to be a
single integer value, rather than a comma-separated list of individual
cell values. Fix the U-Boot DTs to comply with this naming convention.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts
index a0f1d09bee58bc94411c9df839dd1adbf0dd47df..3758395c6f7633c3bc0ad0820ad5000218aefb62 100644 (file)
--- a/arch/arm/dts/tegra124-nyan-big.dts
+++ b/arch/arm/dts/tegra124-nyan-big.dts
@@ -15,8 +15,8 @@
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
                i2c5 = "/i2c@7000d100";
-               rtc0 = "/i2c@0,7000d000/pmic@40";
-               rtc1 = "/rtc@0,7000e000";
+               rtc0 = "/i2c@7000d000/pmic@40";
+               rtc1 = "/rtc@7000e000";
                mmc0 = "/sdhci@700b0600";
                mmc1 = "/sdhci@700b0400";
                spi0 = "/spi@7000d400";
@@ -58,7 +58,7 @@
                ddc-i2c-bus = <&dpaux>;
        };
 
-       sdhci@0,700b0400 { /* SD Card on this bus */
+       sdhci@700b0400 { /* SD Card on this bus */
                wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
        };
 
@@ -69,7 +69,7 @@
                nvidia,model = "GoogleNyanBig";
        };
 
-       pinmux@0,70000868 {
+       pinmux@70000868 {
                pinctrl-names = "default";
                pinctrl-0 = <&pinmux_default>;
 

diff --git a/arch/arm/dts/tegra124-nyan.dtsi b/arch/arm/dts/tegra124-nyan.dtsi
index 1b6931fae80633dd43c2039eb3e6cd3dedb287de..780131f7361c7ed4bedf02c8c2e423a99b766190 100644 (file)
--- a/arch/arm/dts/tegra124-nyan.dtsi
+++ b/arch/arm/dts/tegra124-nyan.dtsi
@@ -3,8 +3,8 @@
 
 / {
        aliases {
-               rtc0 = "/i2c@0,7000d000/pmic@40";
-               rtc1 = "/rtc@0,7000e000";
+               rtc0 = "/i2c@7000d000/pmic@40";
+               rtc1 = "/rtc@7000e000";
                serial0 = &uarta;
        };
 

diff --git a/arch/arm/dts/tegra210-e2220-1170.dts b/arch/arm/dts/tegra210-e2220-1170.dts
index 69af9cfe2a3d702bf3c64fb6bd93f1933b773e86..70cd72b561031c787c568fbaa2f1fdd9fae62719 100644 (file)
--- a/arch/arm/dts/tegra210-e2220-1170.dts
+++ b/arch/arm/dts/tegra210-e2220-1170.dts
@@ -11,35 +11,35 @@
        };
 
        aliases {
-               i2c0 = "/i2c@0,7000d000";
-               mmc0 = "/sdhci@0,700b0600";
-               mmc1 = "/sdhci@0,700b0000";
-               usb0 = "/usb@0,7d000000";
+               i2c0 = "/i2c@7000d000";
+               mmc0 = "/sdhci@700b0600";
+               mmc1 = "/sdhci@700b0000";
+               usb0 = "/usb@7d000000";
        };
 
        memory {
                reg = <0x0 0x80000000 0x0 0xc0000000>;
        };
 
-       sdhci@0,700b0000 {
+       sdhci@700b0000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
-       sdhci@0,700b0600 {
+       sdhci@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;
        };
 
-       i2c@0,7000d000 {
+       i2c@7000d000 {
                status = "okay";
                clock-frequency = <400000>;
        };
 
-       usb@0,7d000000 {
+       usb@7d000000 {
                status = "okay";
                dr_mode = "peripheral";
        };

diff --git a/arch/arm/dts/tegra210-p2371-0000.dts b/arch/arm/dts/tegra210-p2371-0000.dts
index 44315476275ff738db6d8c6677af8337ad2f2a74..d9612962bd8ceacc01712ac8240695772c344b56 100644 (file)
--- a/arch/arm/dts/tegra210-p2371-0000.dts
+++ b/arch/arm/dts/tegra210-p2371-0000.dts
@@ -11,35 +11,35 @@
        };
 
        aliases {
-               i2c0 = "/i2c@0,7000d000";
-               mmc0 = "/sdhci@0,700b0600";
-               mmc1 = "/sdhci@0,700b0000";
-               usb0 = "/usb@0,7d000000";
+               i2c0 = "/i2c@7000d000";
+               mmc0 = "/sdhci@700b0600";
+               mmc1 = "/sdhci@700b0000";
+               usb0 = "/usb@7d000000";
        };
 
        memory {
                reg = <0x0 0x80000000 0x0 0xc0000000>;
        };
 
-       sdhci@0,700b0000 {
+       sdhci@700b0000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
-       sdhci@0,700b0600 {
+       sdhci@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;
        };
 
-       i2c@0,7000d000 {
+       i2c@7000d000 {
                status = "okay";
                clock-frequency = <400000>;
        };
 
-       usb@0,7d000000 {
+       usb@7d000000 {
                status = "okay";
                dr_mode = "otg";
                nvidia,vbus-gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/dts/tegra210-p2371-2180.dts b/arch/arm/dts/tegra210-p2371-2180.dts
index aa18dd27ceafb5d14f4de835ea5e3a4ffcd8f7c5..0dc06a4721812e50e5182b973368b698d2f3f39b 100644 (file)
--- a/arch/arm/dts/tegra210-p2371-2180.dts
+++ b/arch/arm/dts/tegra210-p2371-2180.dts
@@ -11,17 +11,17 @@
        };
 
        aliases {
-               i2c0 = "/i2c@0,7000d000";
-               mmc0 = "/sdhci@0,700b0600";
-               mmc1 = "/sdhci@0,700b0000";
-               usb0 = "/usb@0,7d000000";
+               i2c0 = "/i2c@7000d000";
+               mmc0 = "/sdhci@700b0600";
+               mmc1 = "/sdhci@700b0000";
+               usb0 = "/usb@7d000000";
        };
 
        memory {
                reg = <0x0 0x80000000 0x0 0xc0000000>;
        };
 
-       pcie-controller@0,01003000 {
+       pcie-controller@01003000 {
                status = "okay";
 
                pci@1,0 {
@@ -33,7 +33,7 @@
                };
        };
 
-       padctl@0,7009f000 {
+       padctl@7009f000 {
                pinctrl-0 = <&padctl_default>;
                pinctrl-names = "default";
 
@@ -71,7 +71,7 @@
                };
        };
 
-       sdhci@0,700b0000 {
+       sdhci@700b0000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
@@ -79,18 +79,18 @@
                bus-width = <4>;
        };
 
-       sdhci@0,700b0600 {
+       sdhci@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;
        };
 
-       i2c@0,7000d000 {
+       i2c@7000d000 {
                status = "okay";
                clock-frequency = <400000>;
        };
 
-       usb@0,7d000000 {
+       usb@7d000000 {
                status = "okay";
                dr_mode = "otg";
                nvidia,vbus-gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/dts/tegra210-p2571.dts b/arch/arm/dts/tegra210-p2571.dts
index d2ad9eded632f9de18a900747cc40183ba27b01a..2afcde5ca2ed406637db77d9eb081f2336de863e 100644 (file)
--- a/arch/arm/dts/tegra210-p2571.dts
+++ b/arch/arm/dts/tegra210-p2571.dts
@@ -11,83 +11,83 @@
        };
 
        aliases {
-               i2c0 = "/i2c@0,7000d000";
-               i2c1 = "/i2c@0,7000c000";
-               i2c2 = "/i2c@0,7000c400";
-               i2c3 = "/i2c@0,7000c500";
-               i2c4 = "/i2c@0,7000c700";
-               i2c5 = "/i2c@0,7000d100";
-               mmc0 = "/sdhci@0,700b0600";
-               mmc1 = "/sdhci@0,700b0000";
-               spi0 = "/spi@0,7000d400";
-               spi1 = "/spi@0,7000da00";
-               spi2 = "/spi@0,70410000";
-               usb0 = "/usb@0,7d000000";
+               i2c0 = "/i2c@7000d000";
+               i2c1 = "/i2c@7000c000";
+               i2c2 = "/i2c@7000c400";
+               i2c3 = "/i2c@7000c500";
+               i2c4 = "/i2c@7000c700";
+               i2c5 = "/i2c@7000d100";
+               mmc0 = "/sdhci@700b0600";
+               mmc1 = "/sdhci@700b0000";
+               spi0 = "/spi@7000d400";
+               spi1 = "/spi@7000da00";
+               spi2 = "/spi@70410000";
+               usb0 = "/usb@7d000000";
        };
 
        memory {
                reg = <0x0 0x80000000 0x0 0xc0000000>;
        };
 
-       i2c@0,7000c000 {
+       i2c@7000c000 {
                status = "okay";
                clock-frequency = <100000>;
        };
 
-       i2c@0,7000c400 {
+       i2c@7000c400 {
                status = "okay";
                clock-frequency = <100000>;
        };
 
-       i2c@0,7000c500 {
+       i2c@7000c500 {
                status = "okay";
                clock-frequency = <100000>;
        };
 
-       i2c@0,7000c700 {
+       i2c@7000c700 {
                status = "okay";
                clock-frequency = <100000>;
        };
 
-       i2c@0,7000d000 {
+       i2c@7000d000 {
                status = "okay";
                clock-frequency = <400000>;
        };
 
-       i2c@0,7000d100 {
+       i2c@7000d100 {
                status = "okay";
                clock-frequency = <400000>;
        };
 
-       spi@0,7000d400 {
+       spi@7000d400 {
                status = "okay";
                spi-max-frequency = <25000000>;
        };
 
-       spi@0,7000da00 {
+       spi@7000da00 {
                status = "okay";
                spi-max-frequency = <25000000>;
        };
 
-       spi@0,70410000 {
+       spi@70410000 {
                status = "okay";
                spi-max-frequency = <24000000>;
        };
 
-       sdhci@0,700b0000 {
+       sdhci@700b0000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
-       sdhci@0,700b0600 {
+       sdhci@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;
        };
 
-       usb@0,7d000000 {
+       usb@7d000000 {
                status = "okay";
                dr_mode = "otg";
        };

diff --git a/arch/arm/dts/tegra210.dtsi b/arch/arm/dts/tegra210.dtsi
index a8c2f1994ff720b1a78e6b28121a047d661c9d29..fd4cc793d906d6574f932e37eb8bbe5145af3411 100644 (file)
--- a/arch/arm/dts/tegra210.dtsi
+++ b/arch/arm/dts/tegra210.dtsi
@@ -12,7 +12,7 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
-       pcie-controller@0,01003000 {
+       pcie-controller@01003000 {
                compatible = "nvidia,tegra210-pcie";
                device_type = "pci";
                reg = <0x0 0x01003000 0x0 0x00000800   /* PADS registers */
@@ -78,7 +78,7 @@
                };
        };
 
-       gic: interrupt-controller@0,50041000 {
+       gic: interrupt-controller@50041000 {
                compatible = "arm,gic-400";
                #interrupt-cells = <3>;
                interrupt-controller;
@@ -91,14 +91,14 @@
                interrupt-parent = <&gic>;
        };
 
-       tegra_car: clock@0,60006000 {
+       tegra_car: clock@60006000 {
                compatible = "nvidia,tegra210-car";
                reg = <0x0 0x60006000 0x0 0x1000>;
                #clock-cells = <1>;
                #reset-cells = <1>;
        };
 
-       gpio: gpio@0,6000d000 {
+       gpio: gpio@6000d000 {
                compatible = "nvidia,tegra210-gpio", "nvidia,tegra30-gpio";
                reg = <0x0 0x6000d000 0x0 0x1000>;
                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
@@ -115,7 +115,7 @@
                interrupt-controller;
        };
 
-       i2c@0,7000c000 {
+       i2c@7000c000 {
                compatible = "nvidia,tegra210-i2c", "nvidia,tegra114-i2c";
                reg = <0x0 0x7000c000 0x0 0x100>;
                interrupts = <0 38 0x04>;
@@ -125,7 +125,7 @@
                status = "disabled";
        };
 
-       i2c@0,7000c400 {
+       i2c@7000c400 {
                compatible = "nvidia,tegra210-i2c", "nvidia,tegra114-i2c";
                reg = <0x0 0x7000c400 0x0 0x100>;
                interrupts = <0 84 0x04>;
@@ -135,7 +135,7 @@
                status = "disabled";
        };
 
-       i2c@0,7000c500 {
+       i2c@7000c500 {
                compatible = "nvidia,tegra210-i2c", "nvidia,tegra114-i2c";
                reg = <0x0 0x7000c500 0x0 0x100>;
                interrupts = <0 92 0x04>;
@@ -145,7 +145,7 @@
                status = "disabled";
        };
 
-       i2c@0,7000c700 {
+       i2c@7000c700 {
                compatible = "nvidia,tegra210-i2c", "nvidia,tegra114-i2c";
                reg = <0x0 0x7000c700 0x0 0x100>;
                interrupts = <0 120 0x04>;
@@ -155,7 +155,7 @@
                status = "disabled";
        };
 
-       i2c@0,7000d000 {
+       i2c@7000d000 {
                compatible = "nvidia,tegra210-i2c", "nvidia,tegra114-i2c";
                reg = <0x0 0x7000d000 0x0 0x100>;
                interrupts = <0 53 0x04>;
@@ -165,7 +165,7 @@
                status = "disabled";
        };
 
-       i2c@0,7000d100 {
+       i2c@7000d100 {
                compatible = "nvidia,tegra210-i2c", "nvidia,tegra114-i2c";
                reg = <0x0 0x7000d100 0x0 0x100>;
                interrupts = <0 53 0x04>;
@@ -175,7 +175,7 @@
                status = "disabled";
        };
 
-       uarta: serial@0,70006000 {
+       uarta: serial@70006000 {
                compatible = "nvidia,tegra210-uart", "nvidia,tegra20-uart";
                reg = <0x0 0x70006000 0x0 0x40>;
                reg-shift = <2>;
@@ -186,7 +186,7 @@
                status = "disabled";
        };
 
-       uartb: serial@0,70006040 {
+       uartb: serial@70006040 {
                compatible = "nvidia,tegra210-uart", "nvidia,tegra20-uart";
                reg = <0x0 0x70006040 0x0 0x40>;
                reg-shift = <2>;
@@ -197,7 +197,7 @@
                status = "disabled";
        };
 
-       uartc: serial@0,70006200 {
+       uartc: serial@70006200 {
                compatible = "nvidia,tegra210-uart", "nvidia,tegra20-uart";
                reg = <0x0 0x70006200 0x0 0x40>;
                reg-shift = <2>;
@@ -208,7 +208,7 @@
                status = "disabled";
        };
 
-       uartd: serial@0,70006300 {
+       uartd: serial@70006300 {
                compatible = "nvidia,tegra210-uart", "nvidia,tegra20-uart";
                reg = <0x0 0x70006300 0x0 0x40>;
                reg-shift = <2>;
@@ -219,7 +219,7 @@
                status = "disabled";
        };
 
-       spi@0,7000d400 {
+       spi@7000d400 {
                compatible = "nvidia,tegra210-spi", "nvidia,tegra114-spi";
                reg = <0x0 0x7000d400 0x0 0x200>;
                interrupts = <0 59 0x04>;
@@ -231,7 +231,7 @@
                status = "disabled";
        };
 
-       spi@0,7000d600 {
+       spi@7000d600 {
                compatible = "nvidia,tegra210-spi", "nvidia,tegra114-spi";
                reg = <0x0 0x7000d600 0x0 0x200>;
                interrupts = <0 82 0x04>;
@@ -243,7 +243,7 @@
                status = "disabled";
        };
 
-       spi@0,7000d800 {
+       spi@7000d800 {
                compatible = "nvidia,tegra210-spi", "nvidia,tegra114-spi";
                reg = <0x0 0x7000d800 0x0 0x200>;
                interrupts = <0 83 0x04>;
@@ -255,7 +255,7 @@
                status = "disabled";
        };
 
-       spi@0,7000da00 {
+       spi@7000da00 {
                compatible = "nvidia,tegra210-spi", "nvidia,tegra114-spi";
                reg = <0x0 0x7000da00 0x0 0x200>;
                interrupts = <0 93 0x04>;
@@ -267,7 +267,7 @@
                status = "disabled";
        };
 
-       spi@0,70410000 {
+       spi@70410000 {
                compatible = "nvidia,tegra210-qspi";
                reg = <0x0 0x70410000 0x0 0x1000>;
                interrupts = <0 10 0x04>;
@@ -277,7 +277,7 @@
                status = "disabled";
        };
 
-       padctl: padctl@0,7009f000 {
+       padctl: padctl@7009f000 {
                compatible = "nvidia,tegra210-xusb-padctl";
                reg = <0x0 0x7009f000 0x0 0x1000>;
                resets = <&tegra_car 142>;
@@ -285,7 +285,7 @@
                #phy-cells = <1>;
        };
 
-       sdhci@0,700b0000 {
+       sdhci@700b0000 {
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0000 0x0 0x200>;
                interrupts = <0 14 0x04>;
@@ -295,7 +295,7 @@
                status = "disabled";
        };
 
-       sdhci@0,700b0200 {
+       sdhci@700b0200 {
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0200 0x0 0x200>;
                interrupts = <0 15 0x04>;
@@ -305,7 +305,7 @@
                status = "disabled";
        };
 
-       sdhci@0,700b0400 {
+       sdhci@700b0400 {
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0400 0x0 0x200>;
                interrupts = <0 19 0x04>;
@@ -315,7 +315,7 @@
                status = "disabled";
        };
 
-       sdhci@0,700b0600 {
+       sdhci@700b0600 {
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0600 0x0 0x200>;
                interrupts = <0 31 0x04>;
@@ -325,7 +325,7 @@
                status = "disabled";
        };
 
-       usb@0,7d000000 {
+       usb@7d000000 {
                compatible = "nvidia,tegra210-ehci";
                reg = <0x0 0x7d000000 0x0 0x4000>;
                interrupts = <0 20 0x04>;
@@ -336,7 +336,7 @@
                status = "disabled";
        };
 
-       usb@0,7d004000 {
+       usb@7d004000 {
                compatible = "nvidia,tegra210-ehci";
                reg = <0x0 0x7d004000 0x0 0x4000>;
                interrupts = < 53 >;