[U-Boot] [PATCH 09/60] ARM: tegra: correct 64-bit DT unit addresses

Stephen Warren
2016-04-19T20:58:49Z

From: Stephen Warren <swarren@nvidia.com>

In most current Tegra DT files, 64-bit addresses are represented in unit
addresses as a pair of comma-separated 32-bit values. Apparently this
isn't the correct representation for simple busses, and the unit address
should be represented as a single 64-bit value. Update U-Boot's DTs to fix
this issue.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
arch/arm/dts/tegra124-nyan-big.dts | 8 +++---
arch/arm/dts/tegra124-nyan.dtsi | 4 +--
arch/arm/dts/tegra210-e2220-1170.dts | 16 +++++------
arch/arm/dts/tegra210-p2371-0000.dts | 16 +++++------
arch/arm/dts/tegra210-p2371-2180.dts | 20 +++++++-------
arch/arm/dts/tegra210-p2571.dts | 48 ++++++++++++++++-----------------
arch/arm/dts/tegra210.dtsi | 52 ++++++++++++++++++------------------
7 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts
index 20e0be30e980..75821fcda647 100644
--- a/arch/arm/dts/tegra124-nyan-big.dts
+++ b/arch/arm/dts/tegra124-nyan-big.dts
@@ -15,8 +15,8 @@
i2c3 = "/i2c at 7000c500";
i2c4 = "/i2c at 7000c700";
i2c5 = "/i2c at 7000d100";
- rtc0 = "/i2c at 0,7000d000/pmic at 40";
- rtc1 = "/rtc at 0,7000e000";
+ rtc0 = "/i2c at 7000d000/pmic at 40";
+ rtc1 = "/rtc at 7000e000";
sdhci0 = "/sdhci at 700b0600";
sdhci1 = "/sdhci at 700b0400";
spi0 = "/spi at 7000d400";
@@ -58,7 +58,7 @@
ddc-i2c-bus = <&dpaux>;
};

- sdhci at 0,700b0400 { /* SD Card on this bus */
+ sdhci at 700b0400 { /* SD Card on this bus */
wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
};

@@ -69,7 +69,7 @@
nvidia,model = "GoogleNyanBig";
};

- pinmux at 0,70000868 {
+ pinmux at 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 1b6931fae806..780131f7361c 100644
--- a/arch/arm/dts/tegra124-nyan.dtsi
+++ b/arch/arm/dts/tegra124-nyan.dtsi
@@ -3,8 +3,8 @@

/ {
aliases {
- rtc0 = "/i2c at 0,7000d000/pmic at 40";
- rtc1 = "/rtc at 0,7000e000";
+ rtc0 = "/i2c at 7000d000/pmic at 40";
+ rtc1 = "/rtc at 7000e000";
serial0 = &uarta;
};

diff --git a/arch/arm/dts/tegra210-e2220-1170.dts b/arch/arm/dts/tegra210-e2220-1170.dts
index 75efbba1061e..fe27a81e4337 100644
--- a/arch/arm/dts/tegra210-e2220-1170.dts
+++ b/arch/arm/dts/tegra210-e2220-1170.dts
@@ -11,34 +11,34 @@
};

aliases {
- i2c0 = "/i2c at 0,7000d000";
- sdhci0 = "/sdhci at 0,700b0600";
- sdhci1 = "/sdhci at 0,700b0000";
- usb0 = "/usb at 0,7d000000";
+ i2c0 = "/i2c at 7000d000";
+ sdhci0 = "/sdhci at 700b0600";
+ sdhci1 = "/sdhci at 700b0000";
+ usb0 = "/usb at 7d000000";
};

memory {
reg = <0x0 0x80000000 0x0 0xc0000000>;
};

- sdhci at 0,700b0000 {
+ sdhci at 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 at 0,700b0600 {
+ sdhci at 700b0600 {
status = "okay";
bus-width = <8>;
};

- i2c at 0,7000d000 {
+ i2c at 7000d000 {
status = "okay";
clock-frequency = <400000>;
};

- usb at 0,7d000000 {
+ usb at 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 10172a23ad70..3f0e14d62c2c 100644
--- a/arch/arm/dts/tegra210-p2371-0000.dts
+++ b/arch/arm/dts/tegra210-p2371-0000.dts
@@ -11,34 +11,34 @@
};

aliases {
- i2c0 = "/i2c at 0,7000d000";
- sdhci0 = "/sdhci at 0,700b0600";
- sdhci1 = "/sdhci at 0,700b0000";
- usb0 = "/usb at 0,7d000000";
+ i2c0 = "/i2c at 7000d000";
+ sdhci0 = "/sdhci at 700b0600";
+ sdhci1 = "/sdhci at 700b0000";
+ usb0 = "/usb at 7d000000";
};

memory {
reg = <0x0 0x80000000 0x0 0xc0000000>;
};

- sdhci at 0,700b0000 {
+ sdhci at 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 at 0,700b0600 {
+ sdhci at 700b0600 {
status = "okay";
bus-width = <8>;
};

- i2c at 0,7000d000 {
+ i2c at 7000d000 {
status = "okay";
clock-frequency = <400000>;
};

- usb at 0,7d000000 {
+ usb at 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 bf35497d83f7..c1f40e91e318 100644
--- a/arch/arm/dts/tegra210-p2371-2180.dts
+++ b/arch/arm/dts/tegra210-p2371-2180.dts
@@ -11,17 +11,17 @@
};

aliases {
- i2c0 = "/i2c at 0,7000d000";
- sdhci0 = "/sdhci at 0,700b0600";
- sdhci1 = "/sdhci at 0,700b0000";
- usb0 = "/usb at 0,7d000000";
+ i2c0 = "/i2c at 7000d000";
+ sdhci0 = "/sdhci at 700b0600";
+ sdhci1 = "/sdhci at 700b0000";
+ usb0 = "/usb at 7d000000";
};

memory {
reg = <0x0 0x80000000 0x0 0xc0000000>;
};

- pcie-controller at 0,01003000 {
+ pcie-controller at 01003000 {
status = "okay";

pci at 1,0 {
@@ -33,7 +33,7 @@
};
};

- padctl at 0,7009f000 {
+ padctl at 7009f000 {
pinctrl-0 = <&padctl_default>;
pinctrl-names = "default";

@@ -71,7 +71,7 @@
};
};

- sdhci at 0,700b0000 {
+ sdhci at 700b0000 {
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio TEGRA_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
@@ -79,17 +79,17 @@
bus-width = <4>;
};

- sdhci at 0,700b0600 {
+ sdhci at 700b0600 {
status = "okay";
bus-width = <8>;
};

- i2c at 0,7000d000 {
+ i2c at 7000d000 {
status = "okay";
clock-frequency = <400000>;
};

- usb at 0,7d000000 {
+ usb at 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 de35bba44bef..ca413904964d 100644
--- a/arch/arm/dts/tegra210-p2571.dts
+++ b/arch/arm/dts/tegra210-p2571.dts
@@ -11,82 +11,82 @@
};

aliases {
- i2c0 = "/i2c at 0,7000d000";
- i2c1 = "/i2c at 0,7000c000";
- i2c2 = "/i2c at 0,7000c400";
- i2c3 = "/i2c at 0,7000c500";
- i2c4 = "/i2c at 0,7000c700";
- i2c5 = "/i2c at 0,7000d100";
- sdhci0 = "/sdhci at 0,700b0600";
- sdhci1 = "/sdhci at 0,700b0000";
- spi0 = "/spi at 0,7000d400";
- spi1 = "/spi at 0,7000da00";
- spi2 = "/spi at 0,70410000";
- usb0 = "/usb at 0,7d000000";
+ i2c0 = "/i2c at 7000d000";
+ i2c1 = "/i2c at 7000c000";
+ i2c2 = "/i2c at 7000c400";
+ i2c3 = "/i2c at 7000c500";
+ i2c4 = "/i2c at 7000c700";
+ i2c5 = "/i2c at 7000d100";
+ sdhci0 = "/sdhci at 700b0600";
+ sdhci1 = "/sdhci at 700b0000";
+ spi0 = "/spi at 7000d400";
+ spi1 = "/spi at 7000da00";
+ spi2 = "/spi at 70410000";
+ usb0 = "/usb at 7d000000";
};

memory {
reg = <0x0 0x80000000 0x0 0xc0000000>;
};

- i2c at 0,7000c000 {
+ i2c at 7000c000 {
status = "okay";
clock-frequency = <100000>;
};

- i2c at 0,7000c400 {
+ i2c at 7000c400 {
status = "okay";
clock-frequency = <100000>;
};

- i2c at 0,7000c500 {
+ i2c at 7000c500 {
status = "okay";
clock-frequency = <100000>;
};

- i2c at 0,7000c700 {
+ i2c at 7000c700 {
status = "okay";
clock-frequency = <100000>;
};

- i2c at 0,7000d000 {
+ i2c at 7000d000 {
status = "okay";
clock-frequency = <400000>;
};

- i2c at 0,7000d100 {
+ i2c at 7000d100 {
status = "okay";
clock-frequency = <400000>;
};

- spi at 0,7000d400 {
+ spi at 7000d400 {
status = "okay";
spi-max-frequency = <25000000>;
};

- spi at 0,7000da00 {
+ spi at 7000da00 {
status = "okay";
spi-max-frequency = <25000000>;
};

- spi at 0,70410000 {
+ spi at 70410000 {
status = "okay";
spi-max-frequency = <24000000>;
};

- sdhci at 0,700b0000 {
+ sdhci at 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 at 0,700b0600 {
+ sdhci at 700b0600 {
status = "okay";
bus-width = <8>;
};

- usb at 0,7d000000 {
+ usb at 7d000000 {
status = "okay";
dr_mode = "otg";
};
diff --git a/arch/arm/dts/tegra210.dtsi b/arch/arm/dts/tegra210.dtsi
index a8c2f1994ff7..fd4cc793d906 100644
--- a/arch/arm/dts/tegra210.dtsi
+++ b/arch/arm/dts/tegra210.dtsi
@@ -12,7 +12,7 @@
#address-cells = <2>;
#size-cells = <2>;

- pcie-controller at 0,01003000 {
+ pcie-controller at 01003000 {
compatible = "nvidia,tegra210-pcie";
device_type = "pci";
reg = <0x0 0x01003000 0x0 0x00000800 /* PADS registers */
@@ -78,7 +78,7 @@
};
};

- gic: interrupt-controller at 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 at 0,60006000 {
+ tegra_car: clock at 60006000 {
compatible = "nvidia,tegra210-car";
reg = <0x0 0x60006000 0x0 0x1000>;
#clock-cells = <1>;
#reset-cells = <1>;
};

- gpio: gpio at 0,6000d000 {
+ gpio: gpio at 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 at 0,7000c000 {
+ i2c at 7000c000 {
compatible = "nvidia,tegra210-i2c", "nvidia,tegra114-i2c";
reg = <0x0 0x7000c000 0x0 0x100>;
interrupts = <0 38 0x04>;
@@ -125,7 +125,7 @@
status = "disabled";
};

- i2c at 0,7000c400 {
+ i2c at 7000c400 {
compatible = "nvidia,tegra210-i2c", "nvidia,tegra114-i2c";
reg = <0x0 0x7000c400 0x0 0x100>;
interrupts = <0 84 0x04>;
@@ -135,7 +135,7 @@
status = "disabled";
};

- i2c at 0,7000c500 {
+ i2c at 7000c500 {
compatible = "nvidia,tegra210-i2c", "nvidia,tegra114-i2c";
reg = <0x0 0x7000c500 0x0 0x100>;
interrupts = <0 92 0x04>;
@@ -145,7 +145,7 @@
status = "disabled";
};

- i2c at 0,7000c700 {
+ i2c at 7000c700 {
compatible = "nvidia,tegra210-i2c", "nvidia,tegra114-i2c";
reg = <0x0 0x7000c700 0x0 0x100>;
interrupts = <0 120 0x04>;
@@ -155,7 +155,7 @@
status = "disabled";
};

- i2c at 0,7000d000 {
+ i2c at 7000d000 {
compatible = "nvidia,tegra210-i2c", "nvidia,tegra114-i2c";
reg = <0x0 0x7000d000 0x0 0x100>;
interrupts = <0 53 0x04>;
@@ -165,7 +165,7 @@
status = "disabled";
};

- i2c at 0,7000d100 {
+ i2c at 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 at 0,70006000 {
+ uarta: serial at 70006000 {
compatible = "nvidia,tegra210-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006000 0x0 0x40>;
reg-shift = <2>;
@@ -186,7 +186,7 @@
status = "disabled";
};

- uartb: serial at 0,70006040 {
+ uartb: serial at 70006040 {
compatible = "nvidia,tegra210-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006040 0x0 0x40>;
reg-shift = <2>;
@@ -197,7 +197,7 @@
status = "disabled";
};

- uartc: serial at 0,70006200 {
+ uartc: serial at 70006200 {
compatible = "nvidia,tegra210-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006200 0x0 0x40>;
reg-shift = <2>;
@@ -208,7 +208,7 @@
status = "disabled";
};

- uartd: serial at 0,70006300 {
+ uartd: serial at 70006300 {
compatible = "nvidia,tegra210-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006300 0x0 0x40>;
reg-shift = <2>;
@@ -219,7 +219,7 @@
status = "disabled";
};

- spi at 0,7000d400 {
+ spi at 7000d400 {
compatible = "nvidia,tegra210-spi", "nvidia,tegra114-spi";
reg = <0x0 0x7000d400 0x0 0x200>;
interrupts = <0 59 0x04>;
@@ -231,7 +231,7 @@
status = "disabled";
};

- spi at 0,7000d600 {
+ spi at 7000d600 {
compatible = "nvidia,tegra210-spi", "nvidia,tegra114-spi";
reg = <0x0 0x7000d600 0x0 0x200>;
interrupts = <0 82 0x04>;
@@ -243,7 +243,7 @@
status = "disabled";
};

- spi at 0,7000d800 {
+ spi at 7000d800 {
compatible = "nvidia,tegra210-spi", "nvidia,tegra114-spi";
reg = <0x0 0x7000d800 0x0 0x200>;
interrupts = <0 83 0x04>;
@@ -255,7 +255,7 @@
status = "disabled";
};

- spi at 0,7000da00 {
+ spi at 7000da00 {
compatible = "nvidia,tegra210-spi", "nvidia,tegra114-spi";
reg = <0x0 0x7000da00 0x0 0x200>;
interrupts = <0 93 0x04>;
@@ -267,7 +267,7 @@
status = "disabled";
};

- spi at 0,70410000 {
+ spi at 70410000 {
compatible = "nvidia,tegra210-qspi";
reg = <0x0 0x70410000 0x0 0x1000>;
interrupts = <0 10 0x04>;
@@ -277,7 +277,7 @@
status = "disabled";
};

- padctl: padctl at 0,7009f000 {
+ padctl: padctl at 7009f000 {
compatible = "nvidia,tegra210-xusb-padctl";
reg = <0x0 0x7009f000 0x0 0x1000>;
resets = <&tegra_car 142>;
@@ -285,7 +285,7 @@
#phy-cells = <1>;
};

- sdhci at 0,700b0000 {
+ sdhci at 700b0000 {
compatible = "nvidia,tegra210-sdhci";
reg = <0x0 0x700b0000 0x0 0x200>;
interrupts = <0 14 0x04>;
@@ -295,7 +295,7 @@
status = "disabled";
};

- sdhci at 0,700b0200 {
+ sdhci at 700b0200 {
compatible = "nvidia,tegra210-sdhci";
reg = <0x0 0x700b0200 0x0 0x200>;
interrupts = <0 15 0x04>;
@@ -305,7 +305,7 @@
status = "disabled";
};

- sdhci at 0,700b0400 {
+ sdhci at 700b0400 {
compatible = "nvidia,tegra210-sdhci";
reg = <0x0 0x700b0400 0x0 0x200>;
interrupts = <0 19 0x04>;
@@ -315,7 +315,7 @@
status = "disabled";
};

- sdhci at 0,700b0600 {
+ sdhci at 700b0600 {
compatible = "nvidia,tegra210-sdhci";
reg = <0x0 0x700b0600 0x0 0x200>;
interrupts = <0 31 0x04>;
@@ -325,7 +325,7 @@
status = "disabled";
};

- usb at 0,7d000000 {
+ usb at 7d000000 {
compatible = "nvidia,tegra210-ehci";
reg = <0x0 0x7d000000 0x0 0x4000>;
interrupts = <0 20 0x04>;
@@ -336,7 +336,7 @@
status = "disabled";
};

- usb at 0,7d004000 {
+ usb at 7d004000 {
compatible = "nvidia,tegra210-ehci";
reg = <0x0 0x7d004000 0x0 0x4000>;
interrupts = < 53 >;
--
2.8.1