Commit fb31429f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.9-arm64-dt' of... 

Merge tag 'tegra-for-5.9-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

arm64: tegra: Device tree changes for v5.9-rc1

This contains a slew of fixes in preparation for validating device trees
against json-schema bindings. In addition, this enables the CPU complex
(for CPU frequency scaling) and GPU on Tegra194.

* tag 'tegra-for-5.9-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (56 commits)
  arm64: tegra: Add the GPU on Tegra194
  arm64: tegra: Add compatible string for Tegra194 CPU complex
  arm64: tegra: Add HDMI supplies on Norrin
  arm64: tegra: Add #{address,size}-cells for VI I2C on Tegra210
  arm64: tegra: Add missing clocks and power-domains to Tegra210 VI I2C
  arm64: tegra: Add clocks and resets for ISP on Tegra210
  arm64: tegra: Fix compatible string for DPAUX on Tegra210
  arm64: tegra: Add i2c-bus subnode for DPAUX controllers
  arm64: tegra: Sort aliases alphabetically
  arm64: tegra: Remove spurious tabs
  arm64: tegra: Populate VBUS for USB3 on Jetson TX2
  arm64: tegra: Enable DFLL support on Jetson Nano
  arm64: tegra: Add support for Jetson Xavier NX
  arm64: tegra: Re-order PCIe aperture mappings
  arm64: tegra: Enable Tegra VI CSI support for Jetson Nano
  arm64: tegra: jetson-tx1: Add camera supplies
  arm64: tegra: Fix order of XUSB controller clocks
  arm64: tegra: Rename cbb@0 to bus@0 on Tegra194
  arm64: tegra: Sort nodes by unit-address on Jetson Nano
  arm64: tegra: Various fixes for PMICs
  ...

Link: https://lore.kernel.org/r/20200717161300.1661002-7-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3502e079 0f134e39

arch/arm64/boot/dts/nvidia/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-smaug.dtb 
dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2894-0050-a08.dtb

dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb

dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p2972-0000.dtb

dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p3509-0000+p3668-0000.dtb

arch/arm64/boot/dts/nvidia/tegra132-norrin.dts

+230 −169
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ chosen { 
		stdout-path = "serial0:115200n8";

	};



	memory {

	memory@80000000 {

		device_type = "memory";

		reg = <0x0 0x80000000 0x0 0x80000000>;

	};
@@ -39,6 +39,9 @@ hdmi@54280000 { 
		sor@54540000 {

			status = "okay";



			avdd-io-hdmi-dp-supply = <&vdd_3v3_hdmi>;

			vdd-hdmi-dp-pll-supply = <&vdd_hdmi_pll>;



			nvidia,dpaux = <&dpaux>;

			nvidia,panel = <&panel>;

		};
@@ -671,7 +674,7 @@ vdd_gpu: sd6 { 
					regulator-boot-on;

				};



				ldo0 {

				avdd_1v05_run: ldo0 {

					regulator-name = "+1.05_RUN_AVDD";

					regulator-min-microvolt = <1050000>;

					regulator-max-microvolt = <1050000>;
@@ -781,7 +784,6 @@ TEGRA_GPIO(J, 0) 
				battery: smart-battery {

					compatible = "sbs,sbs-battery";

					reg = <0xb>;

					battery-name = "battery";

					sbs,i2c-retry-count = <2>;

					sbs,poll-retry-count = <10>;

				/*	power-supplies = <&charger>; */
@@ -893,55 +895,123 @@ pmc@7000e400 { 
		nvidia,reset-gpio = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;

	};



	/* WIFI/BT module */

	sdhci@700b0000 {

		status = "disabled";

	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>;

		dvddio-pex-supply = <&vdd_1v05_run>;

		avdd-usb-supply = <&vdd_3v3_lp0>;

		hvdd-usb-ss-supply = <&vdd_3v3_lp0>;



		status = "okay";

	};



	/* external SD/MMC */

	sdhci@700b0400 {

		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;

		wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;

	padctl@7009f000 {

		avdd-pll-utmip-supply = <&vddio_1v8>;

		avdd-pll-erefe-supply = <&avdd_1v05_run>;

		avdd-pex-pll-supply = <&vdd_1v05_run>;

		hvdd-pex-pll-e-supply = <&vdd_3v3_lp0>;



		pads {

			usb2 {

				status = "okay";



				lanes {

					usb2-0 {

						nvidia,function = "xusb";

						status = "okay";

		bus-width = <4>;

		vqmmc-supply = <&vddio_sdmmc3>;

					};



	/* EMMC 4.51 */

	sdhci@700b0600 {

					usb2-1 {

						nvidia,function = "xusb";

						status = "okay";

		bus-width = <8>;

		non-removable;

					};



	usb@7d000000 {

					usb2-2 {

						nvidia,function = "xusb";

						status = "okay";

					};

				};

			};



	usb-phy@7d000000 {

			pcie {

				status = "okay";



				lanes {

					pcie-0 {

						nvidia,function = "usb3-ss";

						status = "okay";

		vbus-supply = <&vdd_usb1_vbus>;

					};



	usb@7d004000 {

					pcie-1 {

						nvidia,function = "usb3-ss";

						status = "okay";

					};

				};

			};

		};



	usb-phy@7d004000 {

		ports {

			usb2-0 {

				status = "okay";

		vbus-supply = <&vdd_run_cam>;

				mode = "otg";



				vbus-supply = <&vdd_usb1_vbus>;

			};



	usb@7d008000 {

			usb2-1 {

				status = "okay";

				mode = "host";



				vbus-supply = <&vdd_run_cam>;

			};



	usb-phy@7d008000 {

			usb2-2 {

				status = "okay";

				mode = "host";



				vbus-supply = <&vdd_usb3_vbus>;

			};



			usb3-0 {

				nvidia,usb2-companion = <0>;

				status = "okay";

			};



			usb3-1 {

				nvidia,usb2-companion = <2>;

				status = "okay";

			};

		};

	};



	/* WIFI/BT module */

	mmc@700b0000 {

		status = "disabled";

	};



	/* external SD/MMC */

	mmc@700b0400 {

		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

		power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;

		wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;

		status = "okay";

		bus-width = <4>;

		vqmmc-supply = <&vddio_sdmmc3>;

	};



	/* EMMC 4.51 */

	mmc@700b0600 {

		status = "okay";

		bus-width = <8>;

		non-removable;

	};



	backlight: backlight {

		compatible = "pwm-backlight";
@@ -955,17 +1025,10 @@ backlight: backlight { 
		backlight-boot-off;

	};



	clocks {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	clk32k_in: clock@0 {

		compatible = "fixed-clock";

			reg=<0>;

			#clock-cells = <0>;

		clock-frequency = <32768>;

		};

		#clock-cells = <0>;

	};



	gpio-keys {
@@ -991,18 +1054,13 @@ power { 


	panel: panel {

		compatible = "innolux,n116bge";

		power-supply = <&vdd_3v3_panel>;

		backlight = <&backlight>;

		ddc-i2c-bus = <&dpaux>;

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	vdd_mux: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "+VDD_MUX";

		regulator-min-microvolt = <19000000>;

		regulator-max-microvolt = <19000000>;
@@ -1012,7 +1070,6 @@ vdd_mux: regulator@0 { 


	vdd_5v0_sys: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "+5V_SYS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1023,7 +1080,6 @@ vdd_5v0_sys: regulator@1 { 


	vdd_3v3_sys: regulator@2 {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "+3.3V_SYS";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1034,7 +1090,6 @@ vdd_3v3_sys: regulator@2 { 


	vdd_3v3_run: regulator@3 {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "+3.3V_RUN";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1047,7 +1102,6 @@ vdd_3v3_run: regulator@3 { 


	vdd_3v3_hdmi: regulator@4 {

		compatible = "regulator-fixed";

			reg = <4>;

		regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1056,7 +1110,6 @@ vdd_3v3_hdmi: regulator@4 { 


	vdd_led: regulator@5 {

		compatible = "regulator-fixed";

			reg = <5>;

		regulator-name = "+VDD_LED";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1067,7 +1120,6 @@ vdd_led: regulator@5 { 


	vdd_usb1_vbus: regulator@6 {

		compatible = "regulator-fixed";

			reg = <6>;

		regulator-name = "+5V_USB_HS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1079,7 +1131,6 @@ vdd_usb1_vbus: regulator@6 { 


	vdd_usb3_vbus: regulator@7 {

		compatible = "regulator-fixed";

			reg = <7>;

		regulator-name = "+5V_USB_SS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1091,7 +1142,6 @@ vdd_usb3_vbus: regulator@7 { 


	vdd_3v3_panel: regulator@8 {

		compatible = "regulator-fixed";

			reg = <8>;

		regulator-name = "+3.3V_PANEL";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1102,7 +1152,6 @@ vdd_3v3_panel: regulator@8 { 


	vdd_hdmi_pll: regulator@9 {

		compatible = "regulator-fixed";

			reg = <9>;

		regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL_AP_GATE";

		regulator-min-microvolt = <1050000>;

		regulator-max-microvolt = <1050000>;
@@ -1112,7 +1161,6 @@ vdd_hdmi_pll: regulator@9 { 


	vdd_5v0_hdmi: regulator@10 {

		compatible = "regulator-fixed";

			reg = <10>;

		regulator-name = "+5V_HDMI_CON";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1123,7 +1171,6 @@ vdd_5v0_hdmi: regulator@10 { 


	vdd_5v0_ts: regulator@11 {

		compatible = "regulator-fixed";

			reg = <11>;

		regulator-name = "+5V_VDD_TS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1132,5 +1179,19 @@ vdd_5v0_ts: regulator@11 { 
		gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	vdd_3v3_lp0: regulator@12 {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_LP0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		/*

		 * TODO: find a way to wire this up with the USB EHCI

		 * controllers so that it can be enabled on demand.

		 */

		regulator-always-on;

		gpio = <&as3722 2 GPIO_ACTIVE_HIGH>;

		enable-active-high;

		vin-supply = <&vdd_3v3_sys>;

	};

};

arch/arm64/boot/dts/nvidia/tegra132.dtsi

+167 −38
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ / { 
	pcie@1003000 {

		compatible = "nvidia,tegra124-pcie";

		device_type = "pci";

		reg = <0x0 0x01003000 0x0 0x00000800   /* PADS registers */

		       0x0 0x01003800 0x0 0x00000800   /* AFI registers */

		       0x0 0x02000000 0x0 0x10000000>; /* configuration space */

		reg = <0x0 0x01003000 0x0 0x00000800>, /* PADS registers */

		      <0x0 0x01003800 0x0 0x00000800>, /* AFI registers */

		      <0x0 0x02000000 0x0 0x10000000>; /* configuration space */

		reg-names = "pads", "afi", "cs";

		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>, /* controller interrupt */

			     <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
@@ -33,11 +33,11 @@ pcie@1003000 { 
		#address-cells = <3>;

		#size-cells = <2>;



		ranges = <0x82000000 0 0x01000000 0x0 0x01000000 0 0x00001000   /* port 0 configuration space */

			  0x82000000 0 0x01001000 0x0 0x01001000 0 0x00001000   /* port 1 configuration space */

			  0x81000000 0 0x0        0x0 0x12000000 0 0x00010000   /* downstream I/O (64 KiB) */

			  0x82000000 0 0x13000000 0x0 0x13000000 0 0x0d000000   /* non-prefetchable memory (208 MiB) */

			  0xc2000000 0 0x20000000 0x0 0x20000000 0 0x20000000>; /* prefetchable memory (512 MiB) */

		ranges = <0x02000000 0 0x01000000 0x0 0x01000000 0 0x00001000>, /* port 0 configuration space */

			 <0x02000000 0 0x01001000 0x0 0x01001000 0 0x00001000>, /* port 1 configuration space */

			 <0x01000000 0 0x0        0x0 0x12000000 0 0x00010000>, /* downstream I/O (64 KiB) */

			 <0x02000000 0 0x13000000 0x0 0x13000000 0 0x0d000000>, /* non-prefetchable memory (208 MiB) */

			 <0x42000000 0 0x20000000 0x0 0x20000000 0 0x20000000>; /* prefetchable memory (512 MiB) */



		clocks = <&tegra_car TEGRA124_CLK_PCIE>,

			 <&tegra_car TEGRA124_CLK_AFI>,
@@ -50,9 +50,6 @@ pcie@1003000 { 
		reset-names = "pex", "afi", "pcie_x";

		status = "disabled";



		phys = <&padctl TEGRA_XUSB_PADCTL_PCIE>;

		phy-names = "pcie";



		pci@1,0 {

			device_type = "pci";

			assigned-addresses = <0x82000800 0 0x01000000 0 0x1000>;
@@ -83,10 +80,12 @@ pci@2,0 { 
	};



	host1x@50000000 {

		compatible = "nvidia,tegra124-host1x", "simple-bus";

		compatible = "nvidia,tegra132-host1x",

			     "nvidia,tegra124-host1x";

		reg = <0x0 0x50000000 0x0 0x00034000>;

		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */

			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */

		interrupt-names = "syncpt", "host1x";

		clocks = <&tegra_car TEGRA124_CLK_HOST1X>;

		clock-names = "host1x";

		resets = <&tegra_car 28>;
@@ -101,9 +100,8 @@ dc@54200000 { 
			compatible = "nvidia,tegra124-dc";

			reg = <0x0 0x54200000 0x0 0x00040000>;

			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&tegra_car TEGRA124_CLK_DISP1>,

				 <&tegra_car TEGRA124_CLK_PLL_P>;

			clock-names = "dc", "parent";

			clocks = <&tegra_car TEGRA124_CLK_DISP1>;

			clock-names = "dc";

			resets = <&tegra_car 27>;

			reset-names = "dc";
@@ -116,9 +114,8 @@ dc@54240000 { 
			compatible = "nvidia,tegra124-dc";

			reg = <0x0 0x54240000 0x0 0x00040000>;

			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&tegra_car TEGRA124_CLK_DISP2>,

				 <&tegra_car TEGRA124_CLK_PLL_P>;

			clock-names = "dc", "parent";

			clocks = <&tegra_car TEGRA124_CLK_DISP2>;

			clock-names = "dc";

			resets = <&tegra_car 26>;

			reset-names = "dc";
@@ -144,10 +141,11 @@ sor@54540000 { 
			reg = <0x0 0x54540000 0x0 0x00040000>;

			interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&tegra_car TEGRA124_CLK_SOR0>,

				 <&tegra_car TEGRA124_CLK_SOR0_OUT>,

				 <&tegra_car TEGRA124_CLK_PLL_D_OUT0>,

				 <&tegra_car TEGRA124_CLK_PLL_DP>,

				 <&tegra_car TEGRA124_CLK_CLK_M>;

			clock-names = "sor", "parent", "dp", "safe";

			clock-names = "sor", "out", "parent", "dp", "safe";

			resets = <&tegra_car 182>;

			reset-names = "sor";

			status = "disabled";
@@ -163,6 +161,11 @@ dpaux: dpaux@545c0000 { 
			resets = <&tegra_car 181>;

			reset-names = "dpaux";

			status = "disabled";



			i2c-bus {

				#address-cells = <1>;

				#size-cells = <0>;

			};

		};

	};
@@ -607,7 +610,7 @@ mc: memory-controller@70019000 { 
	};



	emc: external-memory-controller@7001b000 {

		compatible = "nvidia,tegra132-emc", "nvidia,tegra124-emc";

		compatible = "nvidia,tegra132-emc";

		reg = <0x0 0x7001b000 0x0 0x1000>;

		clocks = <&tegra_car TEGRA124_CLK_EMC>;

		clock-names = "emc";
@@ -629,8 +632,6 @@ sata@70020000 { 
			 <&tegra_car 123>,

			 <&tegra_car 129>;

		reset-names = "sata", "sata-oob", "sata-cold";

		phys = <&padctl TEGRA_XUSB_PADCTL_SATA>;

		phy-names = "sata-phy";

		status = "disabled";

	};
@@ -650,6 +651,41 @@ hda@70030000 { 
		status = "disabled";

	};



	usb@70090000 {

		compatible = "nvidia,tegra132-xusb", "nvidia,tegra124-xusb";

		reg = <0x0 0x70090000 0x0 0x8000>,

		      <0x0 0x70098000 0x0 0x1000>,

		      <0x0 0x70099000 0x0 0x1000>;

		reg-names = "hcd", "fpci", "ipfs";



		interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;



		clocks = <&tegra_car TEGRA124_CLK_XUSB_HOST>,

			 <&tegra_car TEGRA124_CLK_XUSB_HOST_SRC>,

			 <&tegra_car TEGRA124_CLK_XUSB_FALCON_SRC>,

			 <&tegra_car TEGRA124_CLK_XUSB_SS>,

			 <&tegra_car TEGRA124_CLK_XUSB_SS_SRC>,

			 <&tegra_car TEGRA124_CLK_XUSB_SS_DIV2>,

			 <&tegra_car TEGRA124_CLK_XUSB_HS_SRC>,

			 <&tegra_car TEGRA124_CLK_XUSB_FS_SRC>,

			 <&tegra_car TEGRA124_CLK_PLL_U_480M>,

			 <&tegra_car TEGRA124_CLK_CLK_M>,

			 <&tegra_car TEGRA124_CLK_PLL_E>;

		clock-names = "xusb_host", "xusb_host_src",

			      "xusb_falcon_src", "xusb_ss",

			      "xusb_ss_src", "xusb_ss_div2",

			      "xusb_hs_src", "xusb_fs_src",

			      "pll_u_480m", "clk_m", "pll_e";

		resets = <&tegra_car 89>, <&tegra_car 156>,

			 <&tegra_car 143>;

		reset-names = "xusb_host", "xusb_ss", "xusb_src";



		nvidia,xusb-padctl = <&padctl>;



		status = "disabled";

	};



	padctl: padctl@7009f000 {

		compatible = "nvidia,tegra132-xusb-padctl",

			     "nvidia,tegra124-xusb-padctl";
@@ -657,40 +693,130 @@ padctl: padctl@7009f000 { 
		resets = <&tegra_car 142>;

		reset-names = "padctl";



		#phy-cells = <1>;

		pads {

			usb2 {

				status = "disabled";



				lanes {

					usb2-0 {

						status = "disabled";

						#phy-cells = <0>;

					};



					usb2-1 {

						status = "disabled";

						#phy-cells = <0>;

					};



					usb2-2 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};



			ulpi {

				status = "disabled";



				lanes {

					ulpi-0 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};



			hsic {

				status = "disabled";



		phys {

				lanes {

					hsic-0 {

						status = "disabled";

						#phy-cells = <0>;

					};



					hsic-1 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};



			pcie {

				status = "disabled";



				lanes {

					pcie-0 {

						status = "disabled";

						#phy-cells = <0>;

					};



					pcie-1 {

						status = "disabled";

						#phy-cells = <0>;

					};



					pcie-2 {

						status = "disabled";

						#phy-cells = <0>;

					};



					pcie-3 {

						status = "disabled";

						#phy-cells = <0>;

					};



					pcie-4 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};



			sata {

				status = "disabled";



				lanes {

					sata-0 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};

		};



			usb3-0 {

		ports {

			usb2-0 {

				status = "disabled";

			};



			usb3-1 {

			usb2-1 {

				status = "disabled";

			};



			utmi-0 {

			usb2-2 {

				status = "disabled";

			};



			utmi-1 {

			hsic-0 {

				status = "disabled";

			};



			utmi-2 {

			hsic-1 {

				status = "disabled";

			};



			usb3-0 {

				status = "disabled";

			};



			usb3-1 {

				status = "disabled";

			};

		};

	};



	sdhci@700b0000 {

	mmc@700b0000 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0000 0x0 0x200>;

		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -701,7 +827,7 @@ sdhci@700b0000 { 
		status = "disabled";

	};



	sdhci@700b0200 {

	mmc@700b0200 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0200 0x0 0x200>;

		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -712,7 +838,7 @@ sdhci@700b0200 { 
		status = "disabled";

	};



	sdhci@700b0400 {

	mmc@700b0400 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0400 0x0 0x200>;

		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -723,7 +849,7 @@ sdhci@700b0400 { 
		status = "disabled";

	};



	sdhci@700b0600 {

	mmc@700b0600 {

		compatible = "nvidia,tegra124-sdhci";

		reg = <0x0 0x700b0600 0x0 0x200>;

		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
@@ -736,8 +862,8 @@ sdhci@700b0600 { 


	soctherm: thermal-sensor@700e2000 {

		compatible = "nvidia,tegra132-soctherm";

		reg = <0x0 0x700e2000 0x0 0x600 /* 0: SOC_THERM reg_base */

			0x0 0x70040000 0x0 0x200>; /* 2: CCROC reg_base */

		reg = <0x0 0x700e2000 0x0 0x600>, /* 0: SOC_THERM reg_base */

		      <0x0 0x70040000 0x0 0x200>; /* 2: CCROC reg_base */

		reg-names = "soctherm-reg", "ccroc-reg";

		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&tegra_car TEGRA124_CLK_TSENSOR>,
@@ -992,6 +1118,7 @@ phy1: usb-phy@7d000000 { 
		clock-names = "reg", "pll_u", "utmi-pads";

		resets = <&tegra_car 22>, <&tegra_car 22>;

		reset-names = "usb", "utmi-pads";

		#phy-cells = <0>;

		nvidia,hssync-start-delay = <0>;

		nvidia,idle-wait-delay = <17>;

		nvidia,elastic-limit = <16>;
@@ -1030,6 +1157,7 @@ phy2: usb-phy@7d004000 { 
		clock-names = "reg", "pll_u", "utmi-pads";

		resets = <&tegra_car 58>, <&tegra_car 22>;

		reset-names = "usb", "utmi-pads";

		#phy-cells = <0>;

		nvidia,hssync-start-delay = <0>;

		nvidia,idle-wait-delay = <17>;

		nvidia,elastic-limit = <16>;
@@ -1067,6 +1195,7 @@ phy3: usb-phy@7d008000 { 
		clock-names = "reg", "pll_u", "utmi-pads";

		resets = <&tegra_car 59>, <&tegra_car 22>;

		reset-names = "usb", "utmi-pads";

		#phy-cells = <0>;

		nvidia,hssync-start-delay = <0>;

		nvidia,idle-wait-delay = <17>;

		nvidia,elastic-limit = <16>;

arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts

+48 −63
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ exp2: gpio@77 { 
	};



	/* SDMMC1 (SD/MMC) */

	sdhci@3400000 {

	mmc@3400000 {

		status = "okay";



		vmmc-supply = <&vdd_sd>;
@@ -119,10 +119,6 @@ padctl@3520000 { 


		avdd-pll-erefeut-supply = <&vdd_1v8_pll>;

		avdd-usb-supply = <&vdd_3v3_sys>;

		dvdd-pex-supply = <&vdd_pex>;

		dvdd-pex-pll-supply = <&vdd_pex>;

		hvdd-pex-supply = <&vdd_1v8>;

		hvdd-pex-pll-supply = <&vdd_1v8>;

		vclamp-usb-supply = <&vdd_1v8>;

		vddio-hsic-supply = <&gnd>;
@@ -175,19 +171,18 @@ usb2-0 { 
				status = "okay";

				mode = "otg";

				vbus-supply = <&vdd_usb0>;



				usb-role-switch;



				connector {

					compatible = "usb-b-connector",

						     "gpio-usb-b-connector";

					compatible = "gpio-usb-b-connector",

						     "usb-b-connector";

					label = "micro-USB";

					type = "micro";

					vbus-gpio = <&gpio

					vbus-gpios = <&gpio

						      TEGRA186_MAIN_GPIO(X, 7)

						      GPIO_ACTIVE_LOW>;

					id-gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;

					id-gpios = <&pmic 0 GPIO_ACTIVE_HIGH>;

				};



			};



			usb2-1 {
@@ -199,6 +194,7 @@ usb2-1 { 


			usb3-0 {

				nvidia,usb2-companion = <1>;

				vbus-supply = <&vdd_usb1>;

				status = "okay";

			};

		};
@@ -227,8 +223,8 @@ eeprom@57 { 
			reg = <0x57>;



			vcc-supply = <&vdd_1v8>;

			address-bits = <8>;

			page-size = <8>;

			address-width = <8>;

			pagesize = <8>;

			size = <256>;

			read-only;

		};
@@ -286,8 +282,8 @@ sor@15540000 { 
		sor@15580000 {

			status = "okay";



			avdd-io-supply = <&vdd_hdmi_1v05>;

			vdd-pll-supply = <&vdd_1v8_ap>;

			avdd-io-hdmi-dp-supply = <&vdd_hdmi_1v05>;

			vdd-hdmi-dp-pll-supply = <&vdd_1v8_ap>;

			hdmi-supply = <&vdd_hdmi>;



			nvidia,ddc-i2c-bus = <&ddc>;
@@ -333,17 +329,13 @@ volume-down { 
		};

	};



	regulators {

	vdd_sd: regulator@100 {

		compatible = "regulator-fixed";

			reg = <100>;



		regulator-name = "SD_CARD_SW_PWR";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;



			gpio = <&gpio TEGRA186_MAIN_GPIO(P, 6)

				      GPIO_ACTIVE_HIGH>;

		gpio = <&gpio TEGRA186_MAIN_GPIO(P, 6) GPIO_ACTIVE_HIGH>;

		enable-active-high;



		vin-supply = <&vdd_3v3_sys>;
@@ -351,8 +343,6 @@ vdd_sd: regulator@100 { 


	vdd_hdmi: regulator@101 {

		compatible = "regulator-fixed";

			reg = <101>;



		regulator-name = "VDD_HDMI_5V0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -365,8 +355,6 @@ vdd_hdmi: regulator@101 { 


	vdd_usb0: regulator@102 {

		compatible = "regulator-fixed";

			reg = <102>;



		regulator-name = "VDD_USB0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -379,8 +367,6 @@ vdd_usb0: regulator@102 { 


	vdd_usb1: regulator@103 {

		compatible = "regulator-fixed";

			reg = <103>;



		regulator-name = "VDD_USB1";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -391,4 +377,3 @@ vdd_usb1: regulator@103 { 
		vin-supply = <&vdd_5v0_sys>;

	};

};
 
};

arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi

+35 −45
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ / { 


	aliases {

		ethernet0 = "/ethernet@2490000";

		sdhci0 = "/sdhci@3460000";

		sdhci1 = "/sdhci@3400000";

		serial0 = &uarta;

		i2c0 = "/bpmp/i2c";

		i2c1 = "/i2c@3160000";

		i2c2 = "/i2c@c240000";
@@ -20,6 +17,9 @@ aliases { 
		i2c5 = "/i2c@31c0000";

		i2c6 = "/i2c@c250000";

		i2c7 = "/i2c@31e0000";

		mmc0 = "/mmc@3460000";

		mmc1 = "/mmc@3400000";

		serial0 = &uarta;

	};



	chosen {
@@ -27,7 +27,7 @@ chosen { 
		stdout-path = "serial0:115200n8";

	};



	memory {

	memory@80000000 {

		device_type = "memory";

		reg = <0x0 0x80000000 0x2 0x00000000>;

	};
@@ -50,6 +50,8 @@ phy: phy@0 { 
				interrupt-parent = <&gpio>;

				interrupts = <TEGRA186_MAIN_GPIO(M, 5)

					      IRQ_TYPE_LEVEL_LOW>;



				#phy-cells = <0>;

			};

		};

	};
@@ -133,7 +135,7 @@ i2c@31e0000 { 
	};



	/* SDMMC1 (SD/MMC) */

	sdhci@3400000 {

	mmc@3400000 {

		cd-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 5) GPIO_ACTIVE_LOW>;

		wp-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 4) GPIO_ACTIVE_HIGH>;
@@ -141,12 +143,12 @@ sdhci@3400000 { 
	};



	/* SDMMC3 (SDIO) */

	sdhci@3440000 {

	mmc@3440000 {

		status = "okay";

	};



	/* SDMMC4 (eMMC) */

	sdhci@3460000 {

	mmc@3460000 {

		status = "okay";

		bus-width = <8>;

		non-removable;
@@ -172,8 +174,8 @@ eeprom@50 { 
			reg = <0x50>;



			vcc-supply = <&vdd_1v8>;

			address-bits = <8>;

			page-size = <8>;

			address-width = <8>;

			pagesize = <8>;

			size = <256>;

			read-only;

		};
@@ -390,15 +392,8 @@ psci { 
		method = "smc";

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	gnd: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;



		regulator-name = "GND";

		regulator-min-microvolt = <0>;

		regulator-max-microvolt = <0>;
@@ -408,8 +403,6 @@ gnd: regulator@0 { 


	vdd_5v0_sys: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;



		regulator-name = "VDD_5V0_SYS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -419,8 +412,6 @@ vdd_5v0_sys: regulator@1 { 


	vdd_1v8_ap: regulator@2 {

		compatible = "regulator-fixed";

			reg = <2>;



		regulator-name = "VDD_1V8_AP";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -431,4 +422,3 @@ vdd_1v8_ap: regulator@2 { 
		vin-supply = <&vdd_1v8>;

	};

};
 
};