Commit 1b9a7515 authored by Thierry Reding's avatar Thierry Reding
Browse files

arm64: tegra: Sort PCI nodes correctly on Orin 



Recent changes to several Orin boards didn't order some device tree
nodes correctly. Resort them.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 5862ae43

arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts

+51 −51
Original line number Diff line number Diff line
@@ -186,57 +186,6 @@ mgbe0_phy: phy@0 { 
			};

		};



		pcie@14100000 {

			status = "okay";



			vddio-pex-ctl-supply = <&vdd_1v8_ao>;



			phys = <&p2u_hsio_3>;

			phy-names = "p2u-0";

		};



		pcie@14160000 {

			status = "okay";



			vddio-pex-ctl-supply = <&vdd_1v8_ao>;



			phys = <&p2u_hsio_4>, <&p2u_hsio_5>, <&p2u_hsio_6>,

			       <&p2u_hsio_7>;

			phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3";

		};



		pcie@141a0000 {

			status = "okay";



			vddio-pex-ctl-supply = <&vdd_1v8_ls>;

			vpcie3v3-supply = <&vdd_3v3_pcie>;

			vpcie12v-supply = <&vdd_12v_pcie>;



			phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,

			       <&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,

			       <&p2u_nvhs_6>, <&p2u_nvhs_7>;

			phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",

				    "p2u-5", "p2u-6", "p2u-7";

		};



		pcie-ep@141a0000 {

			status = "disabled";



			vddio-pex-ctl-supply = <&vdd_1v8_ls>;



			reset-gpios = <&gpio TEGRA234_MAIN_GPIO(AF, 1) GPIO_ACTIVE_LOW>;



			nvidia,refclk-select-gpios = <&gpio_aon

						      TEGRA234_AON_GPIO(AA, 4)

						      GPIO_ACTIVE_HIGH>;



			phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,

			       <&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,

			       <&p2u_nvhs_6>, <&p2u_nvhs_7>;

			phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",

				    "p2u-5", "p2u-6", "p2u-7";

		};



		i2c@c240000 {

			status = "okay";
@@ -304,6 +253,57 @@ ss_ucsi_ccg_p1: endpoint { 
				};

			};

		};



		pcie@14100000 {

			status = "okay";



			vddio-pex-ctl-supply = <&vdd_1v8_ao>;



			phys = <&p2u_hsio_3>;

			phy-names = "p2u-0";

		};



		pcie@14160000 {

			status = "okay";



			vddio-pex-ctl-supply = <&vdd_1v8_ao>;



			phys = <&p2u_hsio_4>, <&p2u_hsio_5>, <&p2u_hsio_6>,

			       <&p2u_hsio_7>;

			phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3";

		};



		pcie@141a0000 {

			status = "okay";



			vddio-pex-ctl-supply = <&vdd_1v8_ls>;

			vpcie3v3-supply = <&vdd_3v3_pcie>;

			vpcie12v-supply = <&vdd_12v_pcie>;



			phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,

			       <&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,

			       <&p2u_nvhs_6>, <&p2u_nvhs_7>;

			phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",

				    "p2u-5", "p2u-6", "p2u-7";

		};



		pcie-ep@141a0000 {

			status = "disabled";



			vddio-pex-ctl-supply = <&vdd_1v8_ls>;



			reset-gpios = <&gpio TEGRA234_MAIN_GPIO(AF, 1) GPIO_ACTIVE_LOW>;



			nvidia,refclk-select-gpios = <&gpio_aon

						      TEGRA234_AON_GPIO(AA, 4)

						      GPIO_ACTIVE_HIGH>;



			phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,

			       <&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,

			       <&p2u_nvhs_6>, <&p2u_nvhs_7>;

			phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",

				    "p2u-5", "p2u-6", "p2u-7";

		};

	};



	gpio-keys {

arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts

+44 −44
Original line number Diff line number Diff line
@@ -20,100 +20,100 @@ chosen { 
	};



	bus@0 {

		host1x@13e00000 {

			nvdec@15480000 {

		serial@3100000 {

			compatible = "nvidia,tegra194-hsuart";

			status = "okay";

		};

		};



		pcie@140e0000 {

		i2c@3160000 {

			status = "okay";

			vddio-pex-ctl-supply = <&vdd_1v8_ls>;

			phys = <&p2u_gbe_4>, <&p2u_gbe_5>;

			phy-names = "p2u-0", "p2u-1";

		};



		pcie@14100000 {

		i2c@3180000 {

			status = "okay";

			vddio-pex-ctl-supply = <&vdd_1v8_ao>;

			phys = <&p2u_hsio_3>;

			phy-names = "p2u-0";

		};



		pcie@14160000 {

		i2c@3190000 {

			status = "okay";

			vddio-pex-ctl-supply = <&vdd_1v8_ao>;

			phys = <&p2u_hsio_7>, <&p2u_hsio_6>, <&p2u_hsio_5>,

			       <&p2u_hsio_4>;

			phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3";

		};



		pcie@141a0000 {

		i2c@31b0000 {

			status = "okay";

			vddio-pex-ctl-supply = <&vdd_1v8_ls>;

			phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,

				<&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,

				<&p2u_nvhs_6>, <&p2u_nvhs_7>;

			phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",

				    "p2u-5", "p2u-6", "p2u-7";

		};



		pcie@141e0000 {

		i2c@31c0000 {

			status = "okay";

			vddio-pex-ctl-supply = <&vdd_1v8_ls>;

			phys = <&p2u_gbe_0>, <&p2u_gbe_1>;

			phy-names = "p2u-0", "p2u-1";



		};



		serial@3100000 {

			compatible = "nvidia,tegra194-hsuart";

		i2c@31e0000 {

			status = "okay";

		};



		i2c@3160000 {

		spi@3270000 {

			status = "okay";

		};



		i2c@3180000 {

		hda@3510000 {

			nvidia,model = "NVIDIA IGX Orin HDA";

			status = "okay";

		};



		i2c@3190000 {

		fuse@3810000 {

			status = "okay";

		};



		i2c@31b0000 {

		i2c@c240000 {

			status = "okay";

		};



		i2c@31c0000 {

		i2c@c250000 {

			status = "okay";



		};



		i2c@31e0000 {

		host1x@13e00000 {

			nvdec@15480000 {

				status = "okay";

			};

		};



		spi@3270000 {

		pcie@140e0000 {

			status = "okay";

			vddio-pex-ctl-supply = <&vdd_1v8_ls>;

			phys = <&p2u_gbe_4>, <&p2u_gbe_5>;

			phy-names = "p2u-0", "p2u-1";

		};



		hda@3510000 {

			nvidia,model = "NVIDIA IGX Orin HDA";

		pcie@14100000 {

			status = "okay";

			vddio-pex-ctl-supply = <&vdd_1v8_ao>;

			phys = <&p2u_hsio_3>;

			phy-names = "p2u-0";

		};



		fuse@3810000 {

		pcie@14160000 {

			status = "okay";

			vddio-pex-ctl-supply = <&vdd_1v8_ao>;

			phys = <&p2u_hsio_7>, <&p2u_hsio_6>, <&p2u_hsio_5>,

			       <&p2u_hsio_4>;

			phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3";

		};



		i2c@c240000 {

		pcie@141a0000 {

			status = "okay";

			vddio-pex-ctl-supply = <&vdd_1v8_ls>;

			phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,

				<&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,

				<&p2u_nvhs_6>, <&p2u_nvhs_7>;

			phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",

				    "p2u-5", "p2u-6", "p2u-7";

		};



		i2c@c250000 {

		pcie@141e0000 {

			status = "okay";

			vddio-pex-ctl-supply = <&vdd_1v8_ls>;

			phys = <&p2u_gbe_0>, <&p2u_gbe_1>;

			phy-names = "p2u-0", "p2u-1";

		};

	};

arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi

+13 −13
Original line number Diff line number Diff line
@@ -134,6 +134,19 @@ usb@3610000 { 
				    "usb3-1";

		};



		/* C8 - Ethernet */

		pcie@140a0000 {

			status = "okay";



			num-lanes = <2>;



			phys = <&p2u_gbe_2>, <&p2u_gbe_3>;

			phy-names = "p2u-0", "p2u-1";



			vddio-pex-ctl-supply = <&vdd_1v8_ao>;

			vpcie3v3-supply = <&vdd_3v3_pcie>;

		};



		/* C1 - M.2 Key-E */

		pcie@14100000 {

			status = "okay";
@@ -155,19 +168,6 @@ pcie@14160000 { 
			phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3";

		};



		/* C8 - Ethernet */

		pcie@140a0000 {

			status = "okay";



			num-lanes = <2>;



			phys = <&p2u_gbe_2>, <&p2u_gbe_3>;

			phy-names = "p2u-0", "p2u-1";



			vddio-pex-ctl-supply = <&vdd_1v8_ao>;

			vpcie3v3-supply = <&vdd_3v3_pcie>;

		};



		/* C7 - M.2 Key-M */

		pcie@141e0000 {

			status = "okay";