Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi

+3 −3
Original line number Diff line number Diff line 
/ {

	clock@0,60006000 {

	clock@60006000 {

		emc-timings-3 {

			nvidia,ram-code = <3>;
@@ -78,7 +78,7 @@ 
		};

	};



	emc@0,7001b000 {

	emc@7001b000 {

		emc-timings-3 {

			nvidia,ram-code = <3>;
@@ -2101,7 +2101,7 @@ 
		};

	};



	memory-controller@0,70019000 {

	memory-controller@70019000 {

		emc-timings-3 {

			nvidia,ram-code = <3>;

arch/arm/boot/dts/tegra124-jetson-tk1.dts

+35 −35
Original line number Diff line number Diff line
@@ -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 @@ 
		reg = <0x0 0x80000000 0x0 0x80000000>;

	};



	pcie-controller@0,01003000 {

	pcie-controller@01003000 {

		status = "okay";



		avddio-pex-supply = <&vdd_1v05_run>;
@@ -40,21 +40,21 @@ 


		/* 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 @@ 
		vdd-supply = <&vdd_gpu>;

	};



	pinmux: pinmux@0,70000868 {

	pinmux: pinmux@70000868 {

		pinctrl-names = "boot";

		pinctrl-0 = <&state_boot>;
@@ -1400,12 +1400,12 @@ 
	};



	/* 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 @@ 
	};



	/* 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 @@ 
	};



	/* 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 @@ 
		};

	};



	pmc@0,7000e400 {

	pmc@7000e400 {

		nvidia,invert-interrupt;

		nvidia,suspend-mode = <1>;

		nvidia,cpu-pwr-good-time = <500>;
@@ -1676,10 +1676,10 @@ 
	};



	/* 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 @@ 
		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 @@ 
		status = "okay";

	};



	padctl@0,7009f000 {

	padctl@7009f000 {

		status = "okay";



		pads {
@@ -1800,7 +1800,7 @@ 
	};



	/* 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 @@ 
	};



	/* 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

+3 −3
Original line number Diff line number Diff line 
/ {

	clock@0,60006000 {

	clock@60006000 {

		emc-timings-1 {

			nvidia,ram-code = <1>;
@@ -67,7 +67,7 @@ 
		};

	};



	emc@0,7001b000 {

	emc@7001b000 {

		emc-timings-1 {

			nvidia,ram-code = <1>;
@@ -1754,7 +1754,7 @@ 
		};

	};



	memory-controller@0,70019000 {

	memory-controller@70019000 {

		emc-timings-1 {

			nvidia,ram-code = <1>;

arch/arm/boot/dts/tegra124-nyan-big.dts

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,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>;

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

	};



	pinmux@0,70000868 {

	pinmux@70000868 {

		pinctrl-names = "default";

		pinctrl-0 = <&pinmux_default>;

arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi

+3 −3
Original line number Diff line number Diff line 
/ {

	clock@0,60006000 {

	clock@60006000 {

		emc-timings-1 {

			nvidia,ram-code = <1>;
@@ -67,7 +67,7 @@ 
		};

	};



	emc@0,7001b000 {

	emc@7001b000 {

		emc-timings-1 {

			nvidia,ram-code = <1>;
@@ -1754,7 +1754,7 @@ 
		};

	};



	memory-controller@0,70019000 {

	memory-controller@70019000 {

		emc-timings-1 {

			nvidia,ram-code = <1>;