[PATCH v3] arm: tegra124: remove commas from unit addresses
Marcel Ziswiler
marcel.ziswiler at toradex.com
Wed Jun 29 15:21:37 PDT 2016
Remove commas from unit addresses as suggested by Rob Herring upon me
posting initial Apalis TK1 support:
http://article.gmane.org/gmane.linux.ports.tegra/26608
Please keep the remaining 0, notation on the GPU node in place as a
former mainline U-Boot version was looking for that particular notation
in order to perform required fix-ups on it.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler at toradex.com>
Acked-by: Stephen Warren <swarren at nvidia.com>
---
Changes in v3:
- add a comment about why we do not change the GPU node
Changes in v2:
- leave gpu node untouched as fix-ups done by older U-Boot version
otherwise may fail as pointed out by Stephen Warren
arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 6 +-
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 70 +++++++-------
arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 6 +-
arch/arm/boot/dts/tegra124-nyan-big.dts | 4 +-
arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 6 +-
arch/arm/boot/dts/tegra124-nyan-blaze.dts | 2 +-
arch/arm/boot/dts/tegra124-nyan.dtsi | 60 ++++++------
arch/arm/boot/dts/tegra124-venice2.dts | 70 +++++++-------
arch/arm/boot/dts/tegra124.dtsi | 125 +++++++++++++------------
9 files changed, 177 insertions(+), 172 deletions(-)
diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi b/arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi
index 2c5cede..accb705 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi
@@ -1,5 +1,5 @@
/ {
- clock at 0,60006000 {
+ clock at 60006000 {
emc-timings-3 {
nvidia,ram-code = <3>;
@@ -78,7 +78,7 @@
};
};
- emc at 0,7001b000 {
+ emc at 7001b000 {
emc-timings-3 {
nvidia,ram-code = <3>;
@@ -2101,7 +2101,7 @@
};
};
- memory-controller at 0,70019000 {
+ memory-controller at 70019000 {
emc-timings-3 {
nvidia,ram-code = <3>;
diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 9ce385e..e52b824 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -10,8 +10,8 @@
compatible = "nvidia,jetson-tk1", "nvidia,tegra124";
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";
/* This order keeps the mapping DB9 connector <-> ttyS0 */
serial0 = &uartd;
@@ -27,7 +27,7 @@
reg = <0x0 0x80000000 0x0 0x80000000>;
};
- pcie-controller at 0,01003000 {
+ pcie-controller at 01003000 {
status = "okay";
avddio-pex-supply = <&vdd_1v05_run>;
@@ -40,21 +40,21 @@
/* Mini PCIe */
pci at 1,0 {
- phys = <&{/padctl at 0,7009f000/pads/pcie/lanes/pcie-4}>;
+ phys = <&{/padctl at 7009f000/pads/pcie/lanes/pcie-4}>;
phy-names = "pcie-0";
status = "okay";
};
/* Gigabit Ethernet */
pci at 2,0 {
- phys = <&{/padctl at 0,7009f000/pads/pcie/lanes/pcie-2}>;
+ phys = <&{/padctl at 7009f000/pads/pcie/lanes/pcie-2}>;
phy-names = "pcie-0";
status = "okay";
};
};
- host1x at 0,50000000 {
- hdmi at 0,54280000 {
+ host1x at 50000000 {
+ hdmi at 54280000 {
status = "okay";
hdmi-supply = <&vdd_5v0_hdmi>;
@@ -75,7 +75,7 @@
vdd-supply = <&vdd_gpu>;
};
- pinmux: pinmux at 0,70000868 {
+ pinmux: pinmux at 70000868 {
pinctrl-names = "boot";
pinctrl-0 = <&state_boot>;
@@ -1400,12 +1400,12 @@
};
/* DB9 serial port */
- serial at 0,70006300 {
+ serial at 70006300 {
status = "okay";
};
/* Expansion GEN1_I2C_*, mini-PCIe I2C, on-board components */
- i2c at 0,7000c000 {
+ i2c at 7000c000 {
status = "okay";
clock-frequency = <100000>;
@@ -1433,25 +1433,25 @@
};
/* Expansion GEN2_I2C_* */
- i2c at 0,7000c400 {
+ i2c at 7000c400 {
status = "okay";
clock-frequency = <100000>;
};
/* Expansion CAM_I2C_* */
- i2c at 0,7000c500 {
+ i2c at 7000c500 {
status = "okay";
clock-frequency = <100000>;
};
/* HDMI DDC */
- hdmi_ddc: i2c at 0,7000c700 {
+ hdmi_ddc: i2c at 7000c700 {
status = "okay";
clock-frequency = <100000>;
};
/* Expansion PWR_I2C_*, on-board components */
- i2c at 0,7000d000 {
+ i2c at 7000d000 {
status = "okay";
clock-frequency = <400000>;
@@ -1642,12 +1642,12 @@
};
/* Expansion TS_SPI_* */
- spi at 0,7000d400 {
+ spi at 7000d400 {
status = "okay";
};
/* Internal SPI */
- spi at 0,7000da00 {
+ spi at 7000da00 {
status = "okay";
spi-max-frequency = <25000000>;
spi-flash at 0 {
@@ -1657,7 +1657,7 @@
};
};
- pmc at 0,7000e400 {
+ pmc at 7000e400 {
nvidia,invert-interrupt;
nvidia,suspend-mode = <1>;
nvidia,cpu-pwr-good-time = <500>;
@@ -1676,10 +1676,10 @@
};
/* Serial ATA */
- sata at 0,70020000 {
+ sata at 70020000 {
status = "okay";
- phys = <&{/padctl at 0,7009f000/pads/sata/lanes/sata-0}>;
+ phys = <&{/padctl at 7009f000/pads/sata/lanes/sata-0}>;
phy-names = "sata-0";
hvdd-supply = <&vdd_3v3_lp0>;
@@ -1690,15 +1690,15 @@
target-12v-supply = <&vdd_12v0_sata>;
};
- hda at 0,70030000 {
+ hda at 70030000 {
status = "okay";
};
- usb at 0,70090000 {
- phys = <&{/padctl at 0,7009f000/pads/usb2/lanes/usb2-0}>, /* Micro A/B */
- <&{/padctl at 0,7009f000/pads/usb2/lanes/usb2-1}>, /* Mini PCIe */
- <&{/padctl at 0,7009f000/pads/usb2/lanes/usb2-2}>, /* USB3 */
- <&{/padctl at 0,7009f000/pads/pcie/lanes/pcie-0}>; /* USB3 */
+ usb at 70090000 {
+ phys = <&{/padctl at 7009f000/pads/usb2/lanes/usb2-0}>, /* Micro A/B */
+ <&{/padctl at 7009f000/pads/usb2/lanes/usb2-1}>, /* Mini PCIe */
+ <&{/padctl at 7009f000/pads/usb2/lanes/usb2-2}>, /* USB3 */
+ <&{/padctl at 7009f000/pads/pcie/lanes/pcie-0}>; /* USB3 */
phy-names = "usb2-0", "usb2-1", "usb2-2", "usb3-0";
avddio-pex-supply = <&vdd_1v05_run>;
@@ -1713,7 +1713,7 @@
status = "okay";
};
- padctl at 0,7009f000 {
+ padctl at 7009f000 {
status = "okay";
pads {
@@ -1800,7 +1800,7 @@
};
/* SD card */
- sdhci at 0,700b0400 {
+ sdhci at 700b0400 {
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
@@ -1810,40 +1810,40 @@
};
/* eMMC */
- sdhci at 0,700b0600 {
+ sdhci at 700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
};
/* CPU DFLL clock */
- clock at 0,70110000 {
+ clock at 70110000 {
status = "okay";
vdd-cpu-supply = <&vdd_cpu>;
nvidia,i2c-fs-rate = <400000>;
};
- ahub at 0,70300000 {
- i2s at 0,70301100 {
+ ahub at 70300000 {
+ i2s at 70301100 {
status = "okay";
};
};
/* mini-PCIe USB */
- usb at 0,7d004000 {
+ usb at 7d004000 {
status = "okay";
};
- usb-phy at 0,7d004000 {
+ usb-phy at 7d004000 {
status = "okay";
};
/* USB A connector */
- usb at 0,7d008000 {
+ usb at 7d008000 {
status = "okay";
};
- usb-phy at 0,7d008000 {
+ usb-phy at 7d008000 {
status = "okay";
vbus-supply = <&vdd_usb3_vbus>;
};
diff --git a/arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi b/arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi
index 1a5748d..4458e86 100644
--- a/arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi
@@ -1,5 +1,5 @@
/ {
- clock at 0,60006000 {
+ clock at 60006000 {
emc-timings-1 {
nvidia,ram-code = <1>;
@@ -67,7 +67,7 @@
};
};
- emc at 0,7001b000 {
+ emc at 7001b000 {
emc-timings-1 {
nvidia,ram-code = <1>;
@@ -1754,7 +1754,7 @@
};
};
- memory-controller at 0,70019000 {
+ memory-controller at 70019000 {
emc-timings-1 {
nvidia,ram-code = <1>;
diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts b/arch/arm/boot/dts/tegra124-nyan-big.dts
index 2d21253..67d7cfb 100644
--- a/arch/arm/boot/dts/tegra124-nyan-big.dts
+++ b/arch/arm/boot/dts/tegra124-nyan-big.dts
@@ -15,7 +15,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>;
};
@@ -26,7 +26,7 @@
nvidia,model = "GoogleNyanBig";
};
- pinmux at 0,70000868 {
+ pinmux at 70000868 {
pinctrl-names = "default";
pinctrl-0 = <&pinmux_default>;
diff --git a/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi b/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
index 9ecd108..4e7b59e 100644
--- a/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
@@ -1,5 +1,5 @@
/ {
- clock at 0,60006000 {
+ clock at 60006000 {
emc-timings-1 {
nvidia,ram-code = <1>;
@@ -67,7 +67,7 @@
};
};
- emc at 0,7001b000 {
+ emc at 7001b000 {
emc-timings-1 {
nvidia,ram-code = <1>;
@@ -1754,7 +1754,7 @@
};
};
- memory-controller at 0,70019000 {
+ memory-controller at 70019000 {
emc-timings-1 {
nvidia,ram-code = <1>;
diff --git a/arch/arm/boot/dts/tegra124-nyan-blaze.dts b/arch/arm/boot/dts/tegra124-nyan-blaze.dts
index 0d30c51..c9582361 100644
--- a/arch/arm/boot/dts/tegra124-nyan-blaze.dts
+++ b/arch/arm/boot/dts/tegra124-nyan-blaze.dts
@@ -22,7 +22,7 @@
nvidia,model = "GoogleNyanBlaze";
};
- pinmux at 0,70000868 {
+ pinmux at 70000868 {
pinctrl-names = "default";
pinctrl-0 = <&pinmux_default>;
diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index 0710a60..271505e 100644
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/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;
};
@@ -16,8 +16,8 @@
reg = <0x0 0x80000000 0x0 0x80000000>;
};
- host1x at 0,50000000 {
- hdmi at 0,54280000 {
+ host1x at 50000000 {
+ hdmi at 54280000 {
status = "okay";
vdd-supply = <&vdd_3v3_hdmi>;
@@ -29,29 +29,29 @@
<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
};
- sor at 0,54540000 {
+ sor at 54540000 {
status = "okay";
nvidia,dpaux = <&dpaux>;
nvidia,panel = <&panel>;
};
- dpaux at 0,545c0000 {
+ dpaux at 545c0000 {
vdd-supply = <&vdd_3v3_panel>;
status = "okay";
};
};
- serial at 0,70006000 {
+ serial at 70006000 {
/* Debug connector on the bottom of the board near SD card. */
status = "okay";
};
- pwm at 0,7000a000 {
+ pwm at 7000a000 {
status = "okay";
};
- i2c at 0,7000c000 {
+ i2c at 7000c000 {
status = "okay";
clock-frequency = <100000>;
@@ -72,7 +72,7 @@
};
};
- i2c at 0,7000c400 {
+ i2c at 7000c400 {
status = "okay";
clock-frequency = <100000>;
@@ -85,7 +85,7 @@
};
};
- i2c at 0,7000c500 {
+ i2c at 7000c500 {
status = "okay";
clock-frequency = <400000>;
@@ -95,12 +95,12 @@
};
};
- hdmi_ddc: i2c at 0,7000c700 {
+ hdmi_ddc: i2c at 7000c700 {
status = "okay";
clock-frequency = <100000>;
};
- i2c at 0,7000d000 {
+ i2c at 7000d000 {
status = "okay";
clock-frequency = <400000>;
@@ -301,7 +301,7 @@
};
};
- spi at 0,7000d400 {
+ spi at 7000d400 {
status = "okay";
cros_ec: cros-ec at 0 {
@@ -342,7 +342,7 @@
};
};
- spi at 0,7000da00 {
+ spi at 7000da00 {
status = "okay";
spi-max-frequency = <25000000>;
@@ -353,7 +353,7 @@
};
};
- pmc at 0,7000e400 {
+ pmc at 7000e400 {
nvidia,invert-interrupt;
nvidia,suspend-mode = <0>;
nvidia,cpu-pwr-good-time = <500>;
@@ -364,16 +364,16 @@
nvidia,sys-clock-req-active-high;
};
- hda at 0,70030000 {
+ hda at 70030000 {
status = "okay";
};
- usb at 0,70090000 {
- phys = <&{/padctl at 0,7009f000/pads/usb2/lanes/usb2-0}>, /* 1st USB A */
- <&{/padctl at 0,7009f000/pads/usb2/lanes/usb2-1}>, /* Internal USB */
- <&{/padctl at 0,7009f000/pads/usb2/lanes/usb2-2}>, /* 2nd USB A */
- <&{/padctl at 0,7009f000/pads/pcie/lanes/pcie-0}>, /* 1st USB A */
- <&{/padctl at 0,7009f000/pads/pcie/lanes/pcie-1}>; /* 2nd USB A */
+ usb at 70090000 {
+ phys = <&{/padctl at 7009f000/pads/usb2/lanes/usb2-0}>, /* 1st USB A */
+ <&{/padctl at 7009f000/pads/usb2/lanes/usb2-1}>, /* Internal USB */
+ <&{/padctl at 7009f000/pads/usb2/lanes/usb2-2}>, /* 2nd USB A */
+ <&{/padctl at 7009f000/pads/pcie/lanes/pcie-0}>, /* 1st USB A */
+ <&{/padctl at 7009f000/pads/pcie/lanes/pcie-1}>; /* 2nd USB A */
phy-names = "usb2-0", "usb2-1", "usb2-2", "usb3-0", "usb3-1";
avddio-pex-supply = <&vdd_1v05_run>;
@@ -388,7 +388,7 @@
status = "okay";
};
- padctl at 0,7009f000 {
+ padctl at 7009f000 {
status = "okay";
pads {
@@ -467,7 +467,7 @@
reset-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
};
- sdhci at 0,700b0000 { /* WiFi/BT on this bus */
+ sdhci at 700b0000 { /* WiFi/BT on this bus */
status = "okay";
bus-width = <4>;
no-1-8-v;
@@ -478,7 +478,7 @@
keep-power-in-suspend;
};
- sdhci at 0,700b0400 { /* SD Card on this bus */
+ sdhci at 700b0400 { /* SD Card on this bus */
status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
@@ -487,7 +487,7 @@
vqmmc-supply = <&vddio_sdmmc3>;
};
- sdhci at 0,700b0600 { /* eMMC on this bus */
+ sdhci at 700b0600 { /* eMMC on this bus */
status = "okay";
bus-width = <8>;
no-1-8-v;
@@ -495,14 +495,14 @@
};
/* CPU DFLL clock */
- clock at 0,70110000 {
+ clock at 70110000 {
status = "disabled";
vdd-cpu-supply = <&vdd_cpu>;
nvidia,i2c-fs-rate = <400000>;
};
- ahub at 0,70300000 {
- i2s at 0,70301100 {
+ ahub at 70300000 {
+ i2s at 70301100 {
status = "okay";
};
};
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 973446d..6e59cec 100644
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -8,8 +8,8 @@
compatible = "nvidia,venice2", "nvidia,tegra124";
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;
};
@@ -21,8 +21,8 @@
reg = <0x0 0x80000000 0x0 0x80000000>;
};
- host1x at 0,50000000 {
- hdmi at 0,54280000 {
+ host1x at 50000000 {
+ hdmi at 54280000 {
status = "okay";
vdd-supply = <&vdd_3v3_hdmi>;
@@ -34,14 +34,14 @@
<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
};
- sor at 0,54540000 {
+ sor at 54540000 {
status = "okay";
nvidia,dpaux = <&dpaux>;
nvidia,panel = <&panel>;
};
- dpaux at 0,545c0000 {
+ dpaux at 545c0000 {
vdd-supply = <&vdd_3v3_panel>;
status = "okay";
};
@@ -55,7 +55,7 @@
vdd-supply = <&vdd_gpu>;
};
- pinmux: pinmux at 0,70000868 {
+ pinmux: pinmux at 70000868 {
pinctrl-names = "boot";
pinctrl-0 = <&pinmux_boot>;
@@ -596,15 +596,15 @@
};
};
- serial at 0,70006000 {
+ serial at 70006000 {
status = "okay";
};
- pwm at 0,7000a000 {
+ pwm at 7000a000 {
status = "okay";
};
- i2c at 0,7000c000 {
+ i2c at 7000c000 {
status = "okay";
clock-frequency = <100000>;
@@ -616,7 +616,7 @@
};
};
- i2c at 0,7000c400 {
+ i2c at 7000c400 {
status = "okay";
clock-frequency = <100000>;
@@ -629,17 +629,17 @@
};
};
- i2c at 0,7000c500 {
+ i2c at 7000c500 {
status = "okay";
clock-frequency = <100000>;
};
- hdmi_ddc: i2c at 0,7000c700 {
+ hdmi_ddc: i2c at 7000c700 {
status = "okay";
clock-frequency = <100000>;
};
- i2c at 0,7000d000 {
+ i2c at 7000d000 {
status = "okay";
clock-frequency = <400000>;
@@ -834,7 +834,7 @@
};
};
- spi at 0,7000d400 {
+ spi at 7000d400 {
status = "okay";
cros_ec: cros-ec at 0 {
@@ -874,7 +874,7 @@
};
};
- spi at 0,7000da00 {
+ spi at 7000da00 {
status = "okay";
spi-max-frequency = <25000000>;
spi-flash at 0 {
@@ -884,7 +884,7 @@
};
};
- pmc at 0,7000e400 {
+ pmc at 7000e400 {
nvidia,invert-interrupt;
nvidia,suspend-mode = <1>;
nvidia,cpu-pwr-good-time = <500>;
@@ -895,16 +895,16 @@
nvidia,sys-clock-req-active-high;
};
- hda at 0,70030000 {
+ hda at 70030000 {
status = "okay";
};
- usb at 0,70090000 {
- phys = <&{/padctl at 0,7009f000/pads/usb2/lanes/usb2-0}>, /* 1st USB A */
- <&{/padctl at 0,7009f000/pads/usb2/lanes/usb2-1}>, /* Internal USB */
- <&{/padctl at 0,7009f000/pads/usb2/lanes/usb2-2}>, /* 2nd USB A */
- <&{/padctl at 0,7009f000/pads/pcie/lanes/pcie-0}>, /* 1st USB A */
- <&{/padctl at 0,7009f000/pads/pcie/lanes/pcie-1}>; /* 2nd USB A */
+ usb at 70090000 {
+ phys = <&{/padctl at 7009f000/pads/usb2/lanes/usb2-0}>, /* 1st USB A */
+ <&{/padctl at 7009f000/pads/usb2/lanes/usb2-1}>, /* Internal USB */
+ <&{/padctl at 7009f000/pads/usb2/lanes/usb2-2}>, /* 2nd USB A */
+ <&{/padctl at 7009f000/pads/pcie/lanes/pcie-0}>, /* 1st USB A */
+ <&{/padctl at 7009f000/pads/pcie/lanes/pcie-1}>; /* 2nd USB A */
phy-names = "usb2-0", "usb2-1", "usb2-2", "usb3-0", "usb3-1";
avddio-pex-supply = <&vdd_1v05_run>;
@@ -919,7 +919,7 @@
status = "okay";
};
- padctl at 0,7009f000 {
+ padctl at 7009f000 {
pads {
usb2 {
status = "okay";
@@ -998,7 +998,7 @@
};
};
- sdhci at 0,700b0400 {
+ sdhci at 700b0400 {
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
@@ -1007,41 +1007,41 @@
vqmmc-supply = <&vddio_sdmmc3>;
};
- sdhci at 0,700b0600 {
+ sdhci at 700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
};
- ahub at 0,70300000 {
- i2s at 0,70301100 {
+ ahub at 70300000 {
+ i2s at 70301100 {
status = "okay";
};
};
- usb at 0,7d000000 {
+ usb at 7d000000 {
status = "okay";
};
- usb-phy at 0,7d000000 {
+ usb-phy at 7d000000 {
status = "okay";
vbus-supply = <&vdd_usb1_vbus>;
};
- usb at 0,7d004000 {
+ usb at 7d004000 {
status = "okay";
};
- usb-phy at 0,7d004000 {
+ usb-phy at 7d004000 {
status = "okay";
vbus-supply = <&vdd_run_cam>;
};
- usb at 0,7d008000 {
+ usb at 7d008000 {
status = "okay";
};
- usb-phy at 0,7d008000 {
+ usb-phy at 7d008000 {
status = "okay";
vbus-supply = <&vdd_usb3_vbus>;
};
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index ea48118..ea340f9 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -14,7 +14,7 @@
#address-cells = <2>;
#size-cells = <2>;
- pcie-controller at 0,01003000 {
+ pcie-controller at 01003000 {
compatible = "nvidia,tegra124-pcie";
device_type = "pci";
reg = <0x0 0x01003000 0x0 0x00000800 /* PADS registers */
@@ -77,7 +77,7 @@
};
};
- host1x at 0,50000000 {
+ host1x at 50000000 {
compatible = "nvidia,tegra124-host1x", "simple-bus";
reg = <0x0 0x50000000 0x0 0x00034000>;
interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */
@@ -91,7 +91,7 @@
ranges = <0 0x54000000 0 0x54000000 0 0x01000000>;
- dc at 0,54200000 {
+ dc at 54200000 {
compatible = "nvidia,tegra124-dc";
reg = <0x0 0x54200000 0x0 0x00040000>;
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
@@ -106,7 +106,7 @@
nvidia,head = <0>;
};
- dc at 0,54240000 {
+ dc at 54240000 {
compatible = "nvidia,tegra124-dc";
reg = <0x0 0x54240000 0x0 0x00040000>;
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
@@ -121,7 +121,7 @@
nvidia,head = <1>;
};
- hdmi at 0,54280000 {
+ hdmi at 54280000 {
compatible = "nvidia,tegra124-hdmi";
reg = <0x0 0x54280000 0x0 0x00040000>;
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
@@ -133,7 +133,7 @@
status = "disabled";
};
- sor at 0,54540000 {
+ sor at 54540000 {
compatible = "nvidia,tegra124-sor";
reg = <0x0 0x54540000 0x0 0x00040000>;
interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
@@ -147,7 +147,7 @@
status = "disabled";
};
- dpaux: dpaux at 0,545c0000 {
+ dpaux: dpaux at 545c0000 {
compatible = "nvidia,tegra124-dpaux";
reg = <0x0 0x545c0000 0x0 0x00040000>;
interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
@@ -160,7 +160,7 @@
};
};
- gic: interrupt-controller at 0,50041000 {
+ gic: interrupt-controller at 50041000 {
compatible = "arm,cortex-a15-gic";
#interrupt-cells = <3>;
interrupt-controller;
@@ -173,6 +173,11 @@
interrupt-parent = <&gic>;
};
+ /*
+ * Please keep the following 0, notation in place as a former mainline
+ * U-Boot version was looking for that particular notation in order to
+ * perform required fix-ups on that GPU node.
+ */
gpu at 0,57000000 {
compatible = "nvidia,gk20a";
reg = <0x0 0x57000000 0x0 0x01000000>,
@@ -203,7 +208,7 @@
interrupt-parent = <&gic>;
};
- timer at 0,60005000 {
+ timer at 60005000 {
compatible = "nvidia,tegra124-timer", "nvidia,tegra30-timer", "nvidia,tegra20-timer";
reg = <0x0 0x60005000 0x0 0x400>;
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
@@ -215,7 +220,7 @@
clocks = <&tegra_car TEGRA124_CLK_TIMER>;
};
- tegra_car: clock at 0,60006000 {
+ tegra_car: clock at 60006000 {
compatible = "nvidia,tegra124-car";
reg = <0x0 0x60006000 0x0 0x1000>;
#clock-cells = <1>;
@@ -223,12 +228,12 @@
nvidia,external-memory-controller = <&emc>;
};
- flow-controller at 0,60007000 {
+ flow-controller at 60007000 {
compatible = "nvidia,tegra124-flowctrl";
reg = <0x0 0x60007000 0x0 0x1000>;
};
- actmon at 0,6000c800 {
+ actmon at 6000c800 {
compatible = "nvidia,tegra124-actmon";
reg = <0x0 0x6000c800 0x0 0x400>;
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
@@ -239,7 +244,7 @@
reset-names = "actmon";
};
- gpio: gpio at 0,6000d000 {
+ gpio: gpio at 6000d000 {
compatible = "nvidia,tegra124-gpio", "nvidia,tegra30-gpio";
reg = <0x0 0x6000d000 0x0 0x1000>;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,
@@ -259,7 +264,7 @@
*/
};
- apbdma: dma at 0,60020000 {
+ apbdma: dma at 60020000 {
compatible = "nvidia,tegra124-apbdma", "nvidia,tegra148-apbdma";
reg = <0x0 0x60020000 0x0 0x1400>;
interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
@@ -300,13 +305,13 @@
#dma-cells = <1>;
};
- apbmisc at 0,70000800 {
+ apbmisc at 70000800 {
compatible = "nvidia,tegra124-apbmisc", "nvidia,tegra20-apbmisc";
reg = <0x0 0x70000800 0x0 0x64>, /* Chip revision */
<0x0 0x7000e864 0x0 0x04>; /* Strapping options */
};
- pinmux: pinmux at 0,70000868 {
+ pinmux: pinmux at 70000868 {
compatible = "nvidia,tegra124-pinmux";
reg = <0x0 0x70000868 0x0 0x164>, /* Pad control registers */
<0x0 0x70003000 0x0 0x434>, /* Mux registers */
@@ -321,7 +326,7 @@
* the APB DMA based serial driver, the compatible is
* "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart".
*/
- uarta: serial at 0,70006000 {
+ uarta: serial at 70006000 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006000 0x0 0x40>;
reg-shift = <2>;
@@ -334,7 +339,7 @@
status = "disabled";
};
- uartb: serial at 0,70006040 {
+ uartb: serial at 70006040 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006040 0x0 0x40>;
reg-shift = <2>;
@@ -347,7 +352,7 @@
status = "disabled";
};
- uartc: serial at 0,70006200 {
+ uartc: serial at 70006200 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006200 0x0 0x40>;
reg-shift = <2>;
@@ -360,7 +365,7 @@
status = "disabled";
};
- uartd: serial at 0,70006300 {
+ uartd: serial at 70006300 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006300 0x0 0x40>;
reg-shift = <2>;
@@ -373,7 +378,7 @@
status = "disabled";
};
- pwm: pwm at 0,7000a000 {
+ pwm: pwm at 7000a000 {
compatible = "nvidia,tegra124-pwm", "nvidia,tegra20-pwm";
reg = <0x0 0x7000a000 0x0 0x100>;
#pwm-cells = <2>;
@@ -383,7 +388,7 @@
status = "disabled";
};
- i2c at 0,7000c000 {
+ i2c at 7000c000 {
compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";
reg = <0x0 0x7000c000 0x0 0x100>;
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
@@ -398,7 +403,7 @@
status = "disabled";
};
- i2c at 0,7000c400 {
+ i2c at 7000c400 {
compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";
reg = <0x0 0x7000c400 0x0 0x100>;
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
@@ -413,7 +418,7 @@
status = "disabled";
};
- i2c at 0,7000c500 {
+ i2c at 7000c500 {
compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";
reg = <0x0 0x7000c500 0x0 0x100>;
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
@@ -428,7 +433,7 @@
status = "disabled";
};
- i2c at 0,7000c700 {
+ i2c at 7000c700 {
compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";
reg = <0x0 0x7000c700 0x0 0x100>;
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
@@ -443,7 +448,7 @@
status = "disabled";
};
- i2c at 0,7000d000 {
+ i2c at 7000d000 {
compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";
reg = <0x0 0x7000d000 0x0 0x100>;
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
@@ -458,7 +463,7 @@
status = "disabled";
};
- i2c at 0,7000d100 {
+ i2c at 7000d100 {
compatible = "nvidia,tegra124-i2c", "nvidia,tegra114-i2c";
reg = <0x0 0x7000d100 0x0 0x100>;
interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
@@ -473,7 +478,7 @@
status = "disabled";
};
- spi at 0,7000d400 {
+ spi at 7000d400 {
compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
reg = <0x0 0x7000d400 0x0 0x200>;
interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
@@ -488,7 +493,7 @@
status = "disabled";
};
- spi at 0,7000d600 {
+ spi at 7000d600 {
compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
reg = <0x0 0x7000d600 0x0 0x200>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
@@ -503,7 +508,7 @@
status = "disabled";
};
- spi at 0,7000d800 {
+ spi at 7000d800 {
compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
reg = <0x0 0x7000d800 0x0 0x200>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
@@ -518,7 +523,7 @@
status = "disabled";
};
- spi at 0,7000da00 {
+ spi at 7000da00 {
compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
reg = <0x0 0x7000da00 0x0 0x200>;
interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
@@ -533,7 +538,7 @@
status = "disabled";
};
- spi at 0,7000dc00 {
+ spi at 7000dc00 {
compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
reg = <0x0 0x7000dc00 0x0 0x200>;
interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
@@ -548,7 +553,7 @@
status = "disabled";
};
- spi at 0,7000de00 {
+ spi at 7000de00 {
compatible = "nvidia,tegra124-spi", "nvidia,tegra114-spi";
reg = <0x0 0x7000de00 0x0 0x200>;
interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
@@ -563,21 +568,21 @@
status = "disabled";
};
- rtc at 0,7000e000 {
+ rtc at 7000e000 {
compatible = "nvidia,tegra124-rtc", "nvidia,tegra20-rtc";
reg = <0x0 0x7000e000 0x0 0x100>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA124_CLK_RTC>;
};
- pmc at 0,7000e400 {
+ pmc at 7000e400 {
compatible = "nvidia,tegra124-pmc";
reg = <0x0 0x7000e400 0x0 0x400>;
clocks = <&tegra_car TEGRA124_CLK_PCLK>, <&clk32k_in>;
clock-names = "pclk", "clk32k_in";
};
- fuse at 0,7000f800 {
+ fuse at 7000f800 {
compatible = "nvidia,tegra124-efuse";
reg = <0x0 0x7000f800 0x0 0x400>;
clocks = <&tegra_car TEGRA124_CLK_FUSE>;
@@ -586,7 +591,7 @@
reset-names = "fuse";
};
- mc: memory-controller at 0,70019000 {
+ mc: memory-controller at 70019000 {
compatible = "nvidia,tegra124-mc";
reg = <0x0 0x70019000 0x0 0x1000>;
clocks = <&tegra_car TEGRA124_CLK_MC>;
@@ -597,14 +602,14 @@
#iommu-cells = <1>;
};
- emc: emc at 0,7001b000 {
+ emc: emc at 7001b000 {
compatible = "nvidia,tegra124-emc";
reg = <0x0 0x7001b000 0x0 0x1000>;
nvidia,memory-controller = <&mc>;
};
- sata at 0,70020000 {
+ sata at 70020000 {
compatible = "nvidia,tegra124-ahci";
reg = <0x0 0x70027000 0x0 0x2000>, /* AHCI */
<0x0 0x70020000 0x0 0x7000>; /* SATA */
@@ -621,7 +626,7 @@
status = "disabled";
};
- hda at 0,70030000 {
+ hda at 70030000 {
compatible = "nvidia,tegra124-hda", "nvidia,tegra30-hda";
reg = <0x0 0x70030000 0x0 0x10000>;
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
@@ -636,7 +641,7 @@
status = "disabled";
};
- usb at 0,70090000 {
+ usb at 70090000 {
compatible = "nvidia,tegra124-xusb";
reg = <0x0 0x70090000 0x0 0x8000>,
<0x0 0x70098000 0x0 0x1000>,
@@ -671,7 +676,7 @@
status = "disabled";
};
- padctl: padctl at 0,7009f000 {
+ padctl: padctl at 7009f000 {
compatible = "nvidia,tegra124-xusb-padctl";
reg = <0x0 0x7009f000 0x0 0x1000>;
resets = <&tegra_car 142>;
@@ -804,7 +809,7 @@
};
};
- sdhci at 0,700b0000 {
+ sdhci at 700b0000 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0000 0x0 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -814,7 +819,7 @@
status = "disabled";
};
- sdhci at 0,700b0200 {
+ sdhci at 700b0200 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0200 0x0 0x200>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -824,7 +829,7 @@
status = "disabled";
};
- sdhci at 0,700b0400 {
+ sdhci at 700b0400 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0400 0x0 0x200>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -834,7 +839,7 @@
status = "disabled";
};
- sdhci at 0,700b0600 {
+ sdhci at 700b0600 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0600 0x0 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
@@ -844,7 +849,7 @@
status = "disabled";
};
- soctherm: thermal-sensor at 0,700e2000 {
+ soctherm: thermal-sensor at 700e2000 {
compatible = "nvidia,tegra124-soctherm";
reg = <0x0 0x700e2000 0x0 0x1000>;
interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
@@ -856,7 +861,7 @@
#thermal-sensor-cells = <1>;
};
- dfll: clock at 0,70110000 {
+ dfll: clock at 70110000 {
compatible = "nvidia,tegra124-dfll";
reg = <0 0x70110000 0 0x100>, /* DFLL control */
<0 0x70110000 0 0x100>, /* I2C output control */
@@ -880,7 +885,7 @@
status = "disabled";
};
- ahub at 0,70300000 {
+ ahub at 70300000 {
compatible = "nvidia,tegra124-ahub";
reg = <0x0 0x70300000 0x0 0x200>,
<0x0 0x70300800 0x0 0x800>,
@@ -932,7 +937,7 @@
#address-cells = <2>;
#size-cells = <2>;
- tegra_i2s0: i2s at 0,70301000 {
+ tegra_i2s0: i2s at 70301000 {
compatible = "nvidia,tegra124-i2s";
reg = <0x0 0x70301000 0x0 0x100>;
nvidia,ahub-cif-ids = <4 4>;
@@ -942,7 +947,7 @@
status = "disabled";
};
- tegra_i2s1: i2s at 0,70301100 {
+ tegra_i2s1: i2s at 70301100 {
compatible = "nvidia,tegra124-i2s";
reg = <0x0 0x70301100 0x0 0x100>;
nvidia,ahub-cif-ids = <5 5>;
@@ -952,7 +957,7 @@
status = "disabled";
};
- tegra_i2s2: i2s at 0,70301200 {
+ tegra_i2s2: i2s at 70301200 {
compatible = "nvidia,tegra124-i2s";
reg = <0x0 0x70301200 0x0 0x100>;
nvidia,ahub-cif-ids = <6 6>;
@@ -962,7 +967,7 @@
status = "disabled";
};
- tegra_i2s3: i2s at 0,70301300 {
+ tegra_i2s3: i2s at 70301300 {
compatible = "nvidia,tegra124-i2s";
reg = <0x0 0x70301300 0x0 0x100>;
nvidia,ahub-cif-ids = <7 7>;
@@ -972,7 +977,7 @@
status = "disabled";
};
- tegra_i2s4: i2s at 0,70301400 {
+ tegra_i2s4: i2s at 70301400 {
compatible = "nvidia,tegra124-i2s";
reg = <0x0 0x70301400 0x0 0x100>;
nvidia,ahub-cif-ids = <8 8>;
@@ -983,7 +988,7 @@
};
};
- usb at 0,7d000000 {
+ usb at 7d000000 {
compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x0 0x7d000000 0x0 0x4000>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
@@ -995,7 +1000,7 @@
status = "disabled";
};
- phy1: usb-phy at 0,7d000000 {
+ phy1: usb-phy at 7d000000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d000000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
@@ -1020,7 +1025,7 @@
status = "disabled";
};
- usb at 0,7d004000 {
+ usb at 7d004000 {
compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x0 0x7d004000 0x0 0x4000>;
interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
@@ -1032,7 +1037,7 @@
status = "disabled";
};
- phy2: usb-phy at 0,7d004000 {
+ phy2: usb-phy at 7d004000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d004000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
@@ -1056,7 +1061,7 @@
status = "disabled";
};
- usb at 0,7d008000 {
+ usb at 7d008000 {
compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x0 0x7d008000 0x0 0x4000>;
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
@@ -1068,7 +1073,7 @@
status = "disabled";
};
- phy3: usb-phy at 0,7d008000 {
+ phy3: usb-phy at 7d008000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d008000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
--
2.5.5
More information about the linux-arm-kernel
mailing list