Skip to content

L
linux
Commit b5896f67 authored by Marcel Ziswiler's avatar Marcel Ziswiler Committed by Thierry Reding
1 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
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
......@@ -14,7 +14,7 @@ / {
#address-cells = <2>;
#size-cells = <2>;
pcie-controller@0,01003000 {
pcie-controller@01003000 {
compatible = "nvidia,tegra124-pcie";
device_type = "pci";
reg = <0x0 0x01003000 0x0 0x00000800 /* PADS registers */
......@@ -77,7 +77,7 @@ pci@2,0 {
};
};
host1x@0,50000000 {
host1x@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 @@ host1x@0,50000000 {
ranges = <0 0x54000000 0 0x54000000 0 0x01000000>;
dc@0,54200000 {
dc@54200000 {
compatible = "nvidia,tegra124-dc";
reg = <0x0 0x54200000 0x0 0x00040000>;
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
......@@ -106,7 +106,7 @@ dc@0,54200000 {
nvidia,head = <0>;
};
dc@0,54240000 {
dc@54240000 {
compatible = "nvidia,tegra124-dc";
reg = <0x0 0x54240000 0x0 0x00040000>;
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
......@@ -121,7 +121,7 @@ dc@0,54240000 {
nvidia,head = <1>;
};
hdmi@0,54280000 {
hdmi@54280000 {
compatible = "nvidia,tegra124-hdmi";
reg = <0x0 0x54280000 0x0 0x00040000>;
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
......@@ -133,7 +133,7 @@ hdmi@0,54280000 {
status = "disabled";
};
sor@0,54540000 {
sor@54540000 {
compatible = "nvidia,tegra124-sor";
reg = <0x0 0x54540000 0x0 0x00040000>;
interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
......@@ -147,7 +147,7 @@ sor@0,54540000 {
status = "disabled";
};
dpaux: dpaux@0,545c0000 {
dpaux: dpaux@545c0000 {
compatible = "nvidia,tegra124-dpaux";
reg = <0x0 0x545c0000 0x0 0x00040000>;
interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
......@@ -160,7 +160,7 @@ dpaux: dpaux@0,545c0000 {
};
};
gic: interrupt-controller@0,50041000 {
gic: interrupt-controller@50041000 {
compatible = "arm,cortex-a15-gic";
#interrupt-cells = <3>;
interrupt-controller;
......@@ -173,6 +173,11 @@ gic: interrupt-controller@0,50041000 {
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@0,57000000 {
compatible = "nvidia,gk20a";
reg = <0x0 0x57000000 0x0 0x01000000>,
......@@ -203,7 +208,7 @@ lic: interrupt-controller@60004000 {
interrupt-parent = <&gic>;
};
timer@0,60005000 {
timer@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 @@ timer@0,60005000 {
clocks = <&tegra_car TEGRA124_CLK_TIMER>;
};
tegra_car: clock@0,60006000 {
tegra_car: clock@60006000 {
compatible = "nvidia,tegra124-car";
reg = <0x0 0x60006000 0x0 0x1000>;
#clock-cells = <1>;
......@@ -223,12 +228,12 @@ tegra_car: clock@0,60006000 {
nvidia,external-memory-controller = <&emc>;
};
flow-controller@0,60007000 {
flow-controller@60007000 {
compatible = "nvidia,tegra124-flowctrl";
reg = <0x0 0x60007000 0x0 0x1000>;
};
actmon@0,6000c800 {
actmon@6000c800 {
compatible = "nvidia,tegra124-actmon";
reg = <0x0 0x6000c800 0x0 0x400>;
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
......@@ -239,7 +244,7 @@ actmon@0,6000c800 {
reset-names = "actmon";
};
gpio: gpio@0,6000d000 {
gpio: gpio@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 @@ gpio: gpio@0,6000d000 {
*/
};
apbdma: dma@0,60020000 {
apbdma: dma@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 @@ apbdma: dma@0,60020000 {
#dma-cells = <1>;
};
apbmisc@0,70000800 {
apbmisc@70000800 {
compatible = "nvidia,tegra124-apbmisc", "nvidia,tegra20-apbmisc";
reg = <0x0 0x70000800 0x0 0x64>, /* Chip revision */
<0x0 0x7000e864 0x0 0x04>; /* Strapping options */
};
pinmux: pinmux@0,70000868 {
pinmux: pinmux@70000868 {
compatible = "nvidia,tegra124-pinmux";
reg = <0x0 0x70000868 0x0 0x164>, /* Pad control registers */
<0x0 0x70003000 0x0 0x434>, /* Mux registers */
......@@ -321,7 +326,7 @@ pinmux: pinmux@0,70000868 {
* the APB DMA based serial driver, the compatible is
* "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart".
*/
uarta: serial@0,70006000 {
uarta: serial@70006000 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006000 0x0 0x40>;
reg-shift = <2>;
......@@ -334,7 +339,7 @@ uarta: serial@0,70006000 {
status = "disabled";
};
uartb: serial@0,70006040 {
uartb: serial@70006040 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006040 0x0 0x40>;
reg-shift = <2>;
......@@ -347,7 +352,7 @@ uartb: serial@0,70006040 {
status = "disabled";
};
uartc: serial@0,70006200 {
uartc: serial@70006200 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006200 0x0 0x40>;
reg-shift = <2>;
......@@ -360,7 +365,7 @@ uartc: serial@0,70006200 {
status = "disabled";
};
uartd: serial@0,70006300 {
uartd: serial@70006300 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006300 0x0 0x40>;
reg-shift = <2>;
......@@ -373,7 +378,7 @@ uartd: serial@0,70006300 {
status = "disabled";
};
pwm: pwm@0,7000a000 {
pwm: pwm@7000a000 {
compatible = "nvidia,tegra124-pwm", "nvidia,tegra20-pwm";
reg = <0x0 0x7000a000 0x0 0x100>;
#pwm-cells = <2>;
......@@ -383,7 +388,7 @@ pwm: pwm@0,7000a000 {
status = "disabled";
};
i2c@0,7000c000 {
i2c@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 @@ i2c@0,7000c000 {
status = "disabled";
};
i2c@0,7000c400 {
i2c@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 @@ i2c@0,7000c400 {
status = "disabled";
};
i2c@0,7000c500 {
i2c@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 @@ i2c@0,7000c500 {
status = "disabled";
};
i2c@0,7000c700 {
i2c@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 @@ i2c@0,7000c700 {
status = "disabled";
};
i2c@0,7000d000 {
i2c@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 @@ i2c@0,7000d000 {
status = "disabled";
};
i2c@0,7000d100 {
i2c@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 @@ i2c@0,7000d100 {
status = "disabled";
};
spi@0,7000d400 {
spi@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 @@ spi@0,7000d400 {
status = "disabled";
};
spi@0,7000d600 {
spi@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 @@ spi@0,7000d600 {
status = "disabled";
};
spi@0,7000d800 {
spi@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 @@ spi@0,7000d800 {
status = "disabled";
};
spi@0,7000da00 {
spi@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 @@ spi@0,7000da00 {
status = "disabled";
};
spi@0,7000dc00 {
spi@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 @@ spi@0,7000dc00 {
status = "disabled";
};
spi@0,7000de00 {
spi@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 @@ spi@0,7000de00 {
status = "disabled";
};
rtc@0,7000e000 {
rtc@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@0,7000e400 {
pmc@7000e400 {
compatible = "nvidia,tegra124-pmc";
reg = <0x0 0x7000e400 0x0 0x400>;
clocks = <&tegra_car TEGRA124_CLK_PCLK>, <&clk32k_in>;
clock-names = "pclk", "clk32k_in";
};
fuse@0,7000f800 {
fuse@7000f800 {
compatible = "nvidia,tegra124-efuse";
reg = <0x0 0x7000f800 0x0 0x400>;
clocks = <&tegra_car TEGRA124_CLK_FUSE>;
......@@ -586,7 +591,7 @@ fuse@0,7000f800 {
reset-names = "fuse";
};
mc: memory-controller@0,70019000 {
mc: memory-controller@70019000 {
compatible = "nvidia,tegra124-mc";
reg = <0x0 0x70019000 0x0 0x1000>;
clocks = <&tegra_car TEGRA124_CLK_MC>;
......@@ -597,14 +602,14 @@ mc: memory-controller@0,70019000 {
#iommu-cells = <1>;
};
emc: emc@0,7001b000 {
emc: emc@7001b000 {
compatible = "nvidia,tegra124-emc";
reg = <0x0 0x7001b000 0x0 0x1000>;
nvidia,memory-controller = <&mc>;
};
sata@0,70020000 {
sata@70020000 {
compatible = "nvidia,tegra124-ahci";
reg = <0x0 0x70027000 0x0 0x2000>, /* AHCI */
<0x0 0x70020000 0x0 0x7000>; /* SATA */
......@@ -621,7 +626,7 @@ sata@0,70020000 {
status = "disabled";
};
hda@0,70030000 {
hda@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 @@ hda@0,70030000 {
status = "disabled";
};
usb@0,70090000 {
usb@70090000 {
compatible = "nvidia,tegra124-xusb";
reg = <0x0 0x70090000 0x0 0x8000>,
<0x0 0x70098000 0x0 0x1000>,
......@@ -671,7 +676,7 @@ usb@0,70090000 {
status = "disabled";
};
padctl: padctl@0,7009f000 {
padctl: padctl@7009f000 {
compatible = "nvidia,tegra124-xusb-padctl";
reg = <0x0 0x7009f000 0x0 0x1000>;
resets = <&tegra_car 142>;
......@@ -804,7 +809,7 @@ usb3-1 {
};
};
sdhci@0,700b0000 {
sdhci@700b0000 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0000 0x0 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
......@@ -814,7 +819,7 @@ sdhci@0,700b0000 {
status = "disabled";
};
sdhci@0,700b0200 {
sdhci@700b0200 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0200 0x0 0x200>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
......@@ -824,7 +829,7 @@ sdhci@0,700b0200 {
status = "disabled";
};
sdhci@0,700b0400 {
sdhci@700b0400 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0400 0x0 0x200>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
......@@ -834,7 +839,7 @@ sdhci@0,700b0400 {
status = "disabled";
};
sdhci@0,700b0600 {
sdhci@700b0600 {
compatible = "nvidia,tegra124-sdhci";
reg = <0x0 0x700b0600 0x0 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
......@@ -844,7 +849,7 @@ sdhci@0,700b0600 {
status = "disabled";
};
soctherm: thermal-sensor@0,700e2000 {
soctherm: thermal-sensor@700e2000 {
compatible = "nvidia,tegra124-soctherm";
reg = <0x0 0x700e2000 0x0 0x1000>;
interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
......@@ -856,7 +861,7 @@ soctherm: thermal-sensor@0,700e2000 {
#thermal-sensor-cells = <1>;
};
dfll: clock@0,70110000 {
dfll: clock@70110000 {
compatible = "nvidia,tegra124-dfll";
reg = <0 0x70110000 0 0x100>, /* DFLL control */
<0 0x70110000 0 0x100>, /* I2C output control */
......@@ -880,7 +885,7 @@ dfll: clock@0,70110000 {
status = "disabled";
};
ahub@0,70300000 {
ahub@70300000 {
compatible = "nvidia,tegra124-ahub";
reg = <0x0 0x70300000 0x0 0x200>,
<0x0 0x70300800 0x0 0x800>,
......@@ -932,7 +937,7 @@ ahub@0,70300000 {
#address-cells = <2>;
#size-cells = <2>;
tegra_i2s0: i2s@0,70301000 {
tegra_i2s0: i2s@70301000 {
compatible = "nvidia,tegra124-i2s";
reg = <0x0 0x70301000 0x0 0x100>;
nvidia,ahub-cif-ids = <4 4>;
......@@ -942,7 +947,7 @@ tegra_i2s0: i2s@0,70301000 {
status = "disabled";
};
tegra_i2s1: i2s@0,70301100 {
tegra_i2s1: i2s@70301100 {
compatible = "nvidia,tegra124-i2s";
reg = <0x0 0x70301100 0x0 0x100>;
nvidia,ahub-cif-ids = <5 5>;
......@@ -952,7 +957,7 @@ tegra_i2s1: i2s@0,70301100 {
status = "disabled";
};
tegra_i2s2: i2s@0,70301200 {
tegra_i2s2: i2s@70301200 {
compatible = "nvidia,tegra124-i2s";
reg = <0x0 0x70301200 0x0 0x100>;
nvidia,ahub-cif-ids = <6 6>;
......@@ -962,7 +967,7 @@ tegra_i2s2: i2s@0,70301200 {
status = "disabled";
};
tegra_i2s3: i2s@0,70301300 {
tegra_i2s3: i2s@70301300 {
compatible = "nvidia,tegra124-i2s";
reg = <0x0 0x70301300 0x0 0x100>;
nvidia,ahub-cif-ids = <7 7>;
......@@ -972,7 +977,7 @@ tegra_i2s3: i2s@0,70301300 {
status = "disabled";
};
tegra_i2s4: i2s@0,70301400 {
tegra_i2s4: i2s@70301400 {
compatible = "nvidia,tegra124-i2s";
reg = <0x0 0x70301400 0x0 0x100>;
nvidia,ahub-cif-ids = <8 8>;
......@@ -983,7 +988,7 @@ tegra_i2s4: i2s@0,70301400 {
};
};
usb@0,7d000000 {
usb@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 @@ usb@0,7d000000 {
status = "disabled";
};
phy1: usb-phy@0,7d000000 {
phy1: usb-phy@7d000000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d000000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
......@@ -1020,7 +1025,7 @@ phy1: usb-phy@0,7d000000 {
status = "disabled";
};
usb@0,7d004000 {
usb@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 @@ usb@0,7d004000 {
status = "disabled";
};
phy2: usb-phy@0,7d004000 {
phy2: usb-phy@7d004000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d004000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
......@@ -1056,7 +1061,7 @@ phy2: usb-phy@0,7d004000 {
status = "disabled";
};
usb@0,7d008000 {
usb@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 @@ usb@0,7d008000 {
status = "disabled";
};
phy3: usb-phy@0,7d008000 {
phy3: usb-phy@7d008000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d008000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
......
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