Skip to content

L
linux
Commit b5896f67 authored by Marcel Ziswiler's avatar Marcel Ziswiler Committed by Thierry Reding
Browse files
Options

ARM: tegra: Remove commas from unit addresses on Tegra124 

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: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Tested-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent aee7a747
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 172 deletions
arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi
View file @ b5896f67
/ {
clock@0,60006000 {
clock@60006000 {
emc-timings-3 {
nvidia,ram-code = <3>;
......@@ -78,7 +78,7 @@ timing-924000000 {
};
};
emc@0,7001b000 {
emc@7001b000 {
emc-timings-3 {
nvidia,ram-code = <3>;
......@@ -2101,7 +2101,7 @@ timing-924000000 {
};
};
memory-controller@0,70019000 {
memory-controller@70019000 {
emc-timings-3 {
nvidia,ram-code = <3>;
......
arch/arm/boot/dts/tegra124-jetson-tk1.dts
View file @ b5896f67
......@@ -10,8 +10,8 @@ / {
compatible = "nvidia,jetson-tk1", "nvidia,tegra124";
aliases {
rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000";
rtc0 = "/i2c@7000d000/pmic@40";
rtc1 = "/rtc@7000e000";
/* This order keeps the mapping DB9 connector <-> ttyS0 */
serial0 = &uartd;
......@@ -27,7 +27,7 @@ memory {
reg = <0x0 0x80000000 0x0 0x80000000>;
};
pcie-controller@0,01003000 {
pcie-controller@01003000 {
status = "okay";
avddio-pex-supply = <&vdd_1v05_run>;
......@@ -40,21 +40,21 @@ pcie-controller@0,01003000 {
/* Mini PCIe */
pci@1,0 {
phys = <&{/padctl@0,7009f000/pads/pcie/lanes/pcie-4}>;
phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-4}>;
phy-names = "pcie-0";
status = "okay";
};
/* Gigabit Ethernet */
pci@2,0 {
phys = <&{/padctl@0,7009f000/pads/pcie/lanes/pcie-2}>;
phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-2}>;
phy-names = "pcie-0";
status = "okay";
};
};
host1x@0,50000000 {
hdmi@0,54280000 {
host1x@50000000 {
hdmi@54280000 {
status = "okay";
hdmi-supply = <&vdd_5v0_hdmi>;
......@@ -75,7 +75,7 @@ gpu@0,57000000 {
vdd-supply = <&vdd_gpu>;
};
pinmux: pinmux@0,70000868 {
pinmux: pinmux@70000868 {
pinctrl-names = "boot";
pinctrl-0 = <&state_boot>;
......@@ -1400,12 +1400,12 @@ serial@70006040 {
};
/* DB9 serial port */
serial@0,70006300 {
serial@70006300 {
status = "okay";
};
/* Expansion GEN1_I2C_*, mini-PCIe I2C, on-board components */
i2c@0,7000c000 {
i2c@7000c000 {
status = "okay";
clock-frequency = <100000>;
......@@ -1433,25 +1433,25 @@ eeprom@56 {
};
/* Expansion GEN2_I2C_* */
i2c@0,7000c400 {
i2c@7000c400 {
status = "okay";
clock-frequency = <100000>;
};
/* Expansion CAM_I2C_* */
i2c@0,7000c500 {
i2c@7000c500 {
status = "okay";
clock-frequency = <100000>;
};
/* HDMI DDC */
hdmi_ddc: i2c@0,7000c700 {
hdmi_ddc: i2c@7000c700 {
status = "okay";
clock-frequency = <100000>;
};
/* Expansion PWR_I2C_*, on-board components */
i2c@0,7000d000 {
i2c@7000d000 {
status = "okay";
clock-frequency = <400000>;
......@@ -1642,12 +1642,12 @@ ldo11 {
};
/* Expansion TS_SPI_* */
spi@0,7000d400 {
spi@7000d400 {
status = "okay";
};
/* Internal SPI */
spi@0,7000da00 {
spi@7000da00 {
status = "okay";
spi-max-frequency = <25000000>;
spi-flash@0 {
......@@ -1657,7 +1657,7 @@ spi-flash@0 {
};
};
pmc@0,7000e400 {
pmc@7000e400 {
nvidia,invert-interrupt;
nvidia,suspend-mode = <1>;
nvidia,cpu-pwr-good-time = <500>;
......@@ -1676,10 +1676,10 @@ i2c-thermtrip {
};
/* Serial ATA */
sata@0,70020000 {
sata@70020000 {
status = "okay";
phys = <&{/padctl@0,7009f000/pads/sata/lanes/sata-0}>;
phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
phy-names = "sata-0";
hvdd-supply = <&vdd_3v3_lp0>;
......@@ -1690,15 +1690,15 @@ sata@0,70020000 {
target-12v-supply = <&vdd_12v0_sata>;
};
hda@0,70030000 {
hda@70030000 {
status = "okay";
};
usb@0,70090000 {
phys = <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-0}>, /* Micro A/B */
<&{/padctl@0,7009f000/pads/usb2/lanes/usb2-1}>, /* Mini PCIe */
<&{/padctl@0,7009f000/pads/usb2/lanes/usb2-2}>, /* USB3 */
<&{/padctl@0,7009f000/pads/pcie/lanes/pcie-0}>; /* USB3 */
usb@70090000 {
phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>, /* Micro A/B */
<&{/padctl@7009f000/pads/usb2/lanes/usb2-1}>, /* Mini PCIe */
<&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>, /* USB3 */
<&{/padctl@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 @@ usb@0,70090000 {
status = "okay";
};
padctl@0,7009f000 {
padctl@7009f000 {
status = "okay";
pads {
......@@ -1800,7 +1800,7 @@ usb3-0 {
};
/* SD card */
sdhci@0,700b0400 {
sdhci@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 @@ sdhci@0,700b0400 {
};
/* eMMC */
sdhci@0,700b0600 {
sdhci@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
};
/* CPU DFLL clock */
clock@0,70110000 {
clock@70110000 {
status = "okay";
vdd-cpu-supply = <&vdd_cpu>;
nvidia,i2c-fs-rate = <400000>;
};
ahub@0,70300000 {
i2s@0,70301100 {
ahub@70300000 {
i2s@70301100 {
status = "okay";
};
};
/* mini-PCIe USB */
usb@0,7d004000 {
usb@7d004000 {
status = "okay";
};
usb-phy@0,7d004000 {
usb-phy@7d004000 {
status = "okay";
};
/* USB A connector */
usb@0,7d008000 {
usb@7d008000 {
status = "okay";
};
usb-phy@0,7d008000 {
usb-phy@7d008000 {
status = "okay";
vbus-supply = <&vdd_usb3_vbus>;
};
......
arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi
View file @ b5896f67
/ {
clock@0,60006000 {
clock@60006000 {
emc-timings-1 {
nvidia,ram-code = <1>;
......@@ -67,7 +67,7 @@ timing-792000000 {
};
};
emc@0,7001b000 {
emc@7001b000 {
emc-timings-1 {
nvidia,ram-code = <1>;
......@@ -1754,7 +1754,7 @@ timing-792000000 {
};
};
memory-controller@0,70019000 {
memory-controller@70019000 {
emc-timings-1 {
nvidia,ram-code = <1>;
......
arch/arm/boot/dts/tegra124-nyan-big.dts
View file @ b5896f67
......@@ -15,7 +15,7 @@ panel: panel {
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>;
};
......@@ -26,7 +26,7 @@ sound {
nvidia,model = "GoogleNyanBig";
};
pinmux@0,70000868 {
pinmux@70000868 {
pinctrl-names = "default";
pinctrl-0 = <&pinmux_default>;
......
arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
View file @ b5896f67
/ {
clock@0,60006000 {
clock@60006000 {
emc-timings-1 {
nvidia,ram-code = <1>;
......@@ -67,7 +67,7 @@ timing-792000000 {
};
};
emc@0,7001b000 {
emc@7001b000 {
emc-timings-1 {
nvidia,ram-code = <1>;
......@@ -1754,7 +1754,7 @@ timing-792000000 {
};
};
memory-controller@0,70019000 {
memory-controller@70019000 {
emc-timings-1 {
nvidia,ram-code = <1>;
......
arch/arm/boot/dts/tegra124-nyan-blaze.dts
View file @ b5896f67
......@@ -22,7 +22,7 @@ sound {
nvidia,model = "GoogleNyanBlaze";
};
pinmux@0,70000868 {
pinmux@70000868 {
pinctrl-names = "default";
pinctrl-0 = <&pinmux_default>;
......
arch/arm/boot/dts/tegra124-nyan.dtsi
View file @ b5896f67
......@@ -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;
};
......@@ -16,8 +16,8 @@ memory {
reg = <0x0 0x80000000 0x0 0x80000000>;
};
host1x@0,50000000 {
hdmi@0,54280000 {
host1x@50000000 {
hdmi@54280000 {
status = "okay";
vdd-supply = <&vdd_3v3_hdmi>;
......@@ -29,29 +29,29 @@ hdmi@0,54280000 {
<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
};
sor@0,54540000 {
sor@54540000 {
status = "okay";
nvidia,dpaux = <&dpaux>;
nvidia,panel = <&panel>;
};
dpaux@0,545c0000 {
dpaux@545c0000 {
vdd-supply = <&vdd_3v3_panel>;
status = "okay";
};
};
serial@0,70006000 {
serial@70006000 {
/* Debug connector on the bottom of the board near SD card. */
status = "okay";
};
pwm@0,7000a000 {
pwm@7000a000 {
status = "okay";
};
i2c@0,7000c000 {
i2c@7000c000 {
status = "okay";
clock-frequency = <100000>;
......@@ -72,7 +72,7 @@ temperature-sensor@4c {
};
};
i2c@0,7000c400 {
i2c@7000c400 {
status = "okay";
clock-frequency = <100000>;
......@@ -85,7 +85,7 @@ trackpad@15 {
};
};
i2c@0,7000c500 {
i2c@7000c500 {
status = "okay";
clock-frequency = <400000>;
......@@ -95,12 +95,12 @@ tpm@20 {
};
};
hdmi_ddc: i2c@0,7000c700 {
hdmi_ddc: i2c@7000c700 {
status = "okay";
clock-frequency = <100000>;
};
i2c@0,7000d000 {
i2c@7000d000 {
status = "okay";
clock-frequency = <400000>;
......@@ -301,7 +301,7 @@ ldo11 {
};
};
spi@0,7000d400 {
spi@7000d400 {
status = "okay";
cros_ec: cros-ec@0 {
......@@ -342,7 +342,7 @@ battery: sbs-battery@b {
};
};
spi@0,7000da00 {
spi@7000da00 {
status = "okay";
spi-max-frequency = <25000000>;
......@@ -353,7 +353,7 @@ flash@0 {
};
};
pmc@0,7000e400 {
pmc@7000e400 {
nvidia,invert-interrupt;
nvidia,suspend-mode = <0>;
nvidia,cpu-pwr-good-time = <500>;
......@@ -364,16 +364,16 @@ pmc@0,7000e400 {
nvidia,sys-clock-req-active-high;
};
hda@0,70030000 {
hda@70030000 {
status = "okay";
};
usb@0,70090000 {
phys = <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-0}>, /* 1st USB A */
<&{/padctl@0,7009f000/pads/usb2/lanes/usb2-1}>, /* Internal USB */
<&{/padctl@0,7009f000/pads/usb2/lanes/usb2-2}>, /* 2nd USB A */
<&{/padctl@0,7009f000/pads/pcie/lanes/pcie-0}>, /* 1st USB A */
<&{/padctl@0,7009f000/pads/pcie/lanes/pcie-1}>; /* 2nd USB A */
usb@70090000 {
phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>, /* 1st USB A */
<&{/padctl@7009f000/pads/usb2/lanes/usb2-1}>, /* Internal USB */
<&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>, /* 2nd USB A */
<&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>, /* 1st USB A */
<&{/padctl@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 @@ usb@0,70090000 {
status = "okay";
};
padctl@0,7009f000 {
padctl@7009f000 {
status = "okay";
pads {
......@@ -467,7 +467,7 @@ sdhci0_pwrseq: sdhci0_pwrseq {
reset-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
};
sdhci@0,700b0000 { /* WiFi/BT on this bus */
sdhci@700b0000 { /* WiFi/BT on this bus */
status = "okay";
bus-width = <4>;
no-1-8-v;
......@@ -478,7 +478,7 @@ sdhci@0,700b0000 { /* WiFi/BT on this bus */
keep-power-in-suspend;
};
sdhci@0,700b0400 { /* SD Card on this bus */
sdhci@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 @@ sdhci@0,700b0400 { /* SD Card on this bus */
vqmmc-supply = <&vddio_sdmmc3>;
};
sdhci@0,700b0600 { /* eMMC on this bus */
sdhci@700b0600 { /* eMMC on this bus */
status = "okay";
bus-width = <8>;
no-1-8-v;
......@@ -495,14 +495,14 @@ sdhci@0,700b0600 { /* eMMC on this bus */
};
/* CPU DFLL clock */
clock@0,70110000 {
clock@70110000 {
status = "disabled";
vdd-cpu-supply = <&vdd_cpu>;
nvidia,i2c-fs-rate = <400000>;
};
ahub@0,70300000 {
i2s@0,70301100 {
ahub@70300000 {
i2s@70301100 {
status = "okay";
};
};
......
arch/arm/boot/dts/tegra124-venice2.dts
View file @ b5896f67
......@@ -8,8 +8,8 @@ / {
compatible = "nvidia,venice2", "nvidia,tegra124";
aliases {
rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000";
rtc0 = "/i2c@7000d000/pmic@40";
rtc1 = "/rtc@7000e000";
serial0 = &uarta;
};
......@@ -21,8 +21,8 @@ memory {
reg = <0x0 0x80000000 0x0 0x80000000>;
};
host1x@0,50000000 {
hdmi@0,54280000 {
host1x@50000000 {
hdmi@54280000 {
status = "okay";
vdd-supply = <&vdd_3v3_hdmi>;
......@@ -34,14 +34,14 @@ hdmi@0,54280000 {
<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
};
sor@0,54540000 {
sor@54540000 {
status = "okay";
nvidia,dpaux = <&dpaux>;
nvidia,panel = <&panel>;
};
dpaux@0,545c0000 {
dpaux@545c0000 {
vdd-supply = <&vdd_3v3_panel>;
status = "okay";
};
......@@ -55,7 +55,7 @@ gpu@0,57000000 {
vdd-supply = <&vdd_gpu>;
};
pinmux: pinmux@0,70000868 {
pinmux: pinmux@70000868 {
pinctrl-names = "boot";
pinctrl-0 = <&pinmux_boot>;
......@@ -596,15 +596,15 @@ hp_det_l {
};
};
serial@0,70006000 {
serial@70006000 {
status = "okay";
};
pwm@0,7000a000 {
pwm@7000a000 {
status = "okay";
};
i2c@0,7000c000 {
i2c@7000c000 {
status = "okay";
clock-frequency = <100000>;
......@@ -616,7 +616,7 @@ acodec: audio-codec@10 {
};
};
i2c@0,7000c400 {
i2c@7000c400 {
status = "okay";
clock-frequency = <100000>;
......@@ -629,17 +629,17 @@ trackpad@4b {
};
};
i2c@0,7000c500 {
i2c@7000c500 {
status = "okay";
clock-frequency = <100000>;
};
hdmi_ddc: i2c@0,7000c700 {
hdmi_ddc: i2c@7000c700 {
status = "okay";
clock-frequency = <100000>;
};
i2c@0,7000d000 {
i2c@7000d000 {
status = "okay";
clock-frequency = <400000>;
......@@ -834,7 +834,7 @@ ldo11 {
};
};
spi@0,7000d400 {
spi@7000d400 {
status = "okay";
cros_ec: cros-ec@0 {
......@@ -874,7 +874,7 @@ battery: sbs-battery@b {
};
};
spi@0,7000da00 {
spi@7000da00 {
status = "okay";
spi-max-frequency = <25000000>;
spi-flash@0 {
......@@ -884,7 +884,7 @@ spi-flash@0 {
};
};
pmc@0,7000e400 {
pmc@7000e400 {
nvidia,invert-interrupt;
nvidia,suspend-mode = <1>;
nvidia,cpu-pwr-good-time = <500>;
......@@ -895,16 +895,16 @@ pmc@0,7000e400 {
nvidia,sys-clock-req-active-high;
};
hda@0,70030000 {
hda@70030000 {
status = "okay";
};
usb@0,70090000 {
phys = <&{/padctl@0,7009f000/pads/usb2/lanes/usb2-0}>, /* 1st USB A */
<&{/padctl@0,7009f000/pads/usb2/lanes/usb2-1}>, /* Internal USB */
<&{/padctl@0,7009f000/pads/usb2/lanes/usb2-2}>, /* 2nd USB A */
<&{/padctl@0,7009f000/pads/pcie/lanes/pcie-0}>, /* 1st USB A */
<&{/padctl@0,7009f000/pads/pcie/lanes/pcie-1}>; /* 2nd USB A */
usb@70090000 {
phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>, /* 1st USB A */
<&{/padctl@7009f000/pads/usb2/lanes/usb2-1}>, /* Internal USB */
<&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>, /* 2nd USB A */
<&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>, /* 1st USB A */
<&{/padctl@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 @@ usb@0,70090000 {
status = "okay";
};
padctl@0,7009f000 {
padctl@7009f000 {
pads {
usb2 {
status = "okay";
......@@ -998,7 +998,7 @@ usb3-1 {
};
};
sdhci@0,700b0400 {
sdhci@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 @@ sdhci@0,700b0400 {
vqmmc-supply = <&vddio_sdmmc3>;
};
sdhci@0,700b0600 {
sdhci@700b0600 {
status = "okay";
bus-width = <8>;
non-removable;
};
ahub@0,70300000 {
i2s@0,70301100 {
ahub@70300000 {
i2s@70301100 {
status = "okay";
};
};
usb@0,7d000000 {
usb@7d000000 {
status = "okay";
};
usb-phy@0,7d000000 {
usb-phy@7d000000 {
status = "okay";
vbus-supply = <&vdd_usb1_vbus>;
};
usb@0,7d004000 {
usb@7d004000 {
status = "okay";
};
usb-phy@0,7d004000 {
usb-phy@7d004000 {
status = "okay";
vbus-supply = <&vdd_run_cam>;
};
usb@0,7d008000 {
usb@7d008000 {
status = "okay";
};
usb-phy@0,7d008000 {
usb-phy@7d008000 {
status = "okay";
vbus-supply = <&vdd_usb3_vbus>;
};
......
arch/arm/boot/dts/tegra124.dtsi
View file @ b5896f67
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7