Commit 14d55a3d authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

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

This contains a bunch of changes all across the board. Perhaps the most
notable introduction here is support for the Jetson Nano Developer Kit.

* tag 'tegra-for-5.2-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  arm64: tegra: Remove regulator hacks on Jetson TX2
  arm64: tegra: Enable XUSB on P2771
  arm64: tegra: Add XUSB and pad controller on Tegra186
  arm64: tegra: Add NVIDIA Jetson Nano Developer Kit support
  arm64: tegra: smaug: Move PLL power supplies to XUSB pad controller
  arm64: tegra: jetson-tx1: Move PLL power supplies to XUSB pad controller
  arm64: tegra: Enable command queue for Tegra186 SDMMC4
  arm64: tegra: Fix default tap and trim values
  arm64: tegra: Add supply for temperature sensor on P2888
  arm64: tegra: Enable aconnect, ADMA and AGIC on Jetson TX1
  arm64: tegra: Add L2 cache topology to Tegra210
  arm64: tegra: Enable CPU idle support for Shield
  arm64: tegra: Enable CPU idle support for Smaug
  arm64: tegra: Enable CPU idle support for Jetson TX1
  arm64: tegra: Add CPU idle states properties for Tegra210
  arm64: tegra: Fix timer node for Tegra210

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c076dd72 2f03e39b

arch/arm64/boot/dts/nvidia/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ dtb-$(CONFIG_ARCH_TEGRA_132_SOC) += tegra132-norrin.dtb 
dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-0000.dtb

dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-2180.dtb

dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2571.dtb

dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p3450-0000.dtb

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

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

+115 −0
Original line number Diff line number Diff line
@@ -58,6 +58,93 @@ 
		status = "okay";

	};



	padctl@3520000 {

		status = "okay";



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



		pads {

			usb2 {

				status = "okay";



				lanes {

					usb2-0 {

						nvidia,function = "xusb";

						status = "okay";

					};



					usb2-1 {

						nvidia,function = "xusb";

						status = "okay";

					};



					usb2-2 {

						nvidia,function = "xusb";

						status = "okay";

					};

				};

			};



			usb3 {

				status = "okay";



				lanes {

					usb3-0 {

						nvidia,function = "xusb";

						status = "okay";

					};



					usb3-1 {

						nvidia,function = "xusb";

						status = "okay";

					};



					usb3-2 {

						nvidia,function = "xusb";

						status = "okay";

					};

				};

			};

		};



		ports {

			usb2-0 {

				status = "okay";

				mode = "otg";



				vbus-supply = <&vdd_usb0>;

			};



			usb2-1 {

				status = "okay";

				mode = "host";



				vbus-supply = <&vdd_usb1>;

			};



			usb3-0 {

				nvidia,usb2-companion = <1>;

				status = "okay";

			};

		};

	};



	usb@3530000 {

		status = "okay";



		phys = <&{/padctl@3520000/pads/usb2/lanes/usb2-0}>,

		       <&{/padctl@3520000/pads/usb2/lanes/usb2-1}>,

		       <&{/padctl@3520000/pads/usb3/lanes/usb3-0}>;

		phy-names = "usb2-0", "usb2-1", "usb3-0";

	};



	pcie@10003000 {

		status = "okay";
@@ -182,5 +269,33 @@ 


			vin-supply = <&vdd_5v0_sys>;

		};



		vdd_usb0: regulator@102 {

			compatible = "regulator-fixed";

			reg = <102>;



			regulator-name = "VDD_USB0";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;



			gpio = <&gpio TEGRA_MAIN_GPIO(L, 4) GPIO_ACTIVE_HIGH>;

			enable-active-high;



			vin-supply = <&vdd_5v0_sys>;

		};



		vdd_usb1: regulator@103 {

			compatible = "regulator-fixed";

			reg = <103>;



			regulator-name = "VDD_USB1";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;



			gpio = <&gpio TEGRA_MAIN_GPIO(L, 5) GPIO_ACTIVE_HIGH>;

			enable-active-high;



			vin-supply = <&vdd_5v0_sys>;

		};

	};

};

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

+15 −27
Original line number Diff line number Diff line
@@ -268,43 +268,30 @@ 
						regulator-name = "AVDD_DSI_CSI_1V2";

						regulator-min-microvolt = <1200000>;

						regulator-max-microvolt = <1200000>;

						/* XXX */

						regulator-always-on;

						regulator-boot-on;

					};



					vdd_1v8: sd2 {

						regulator-name = "VDD_1V8";

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

						/* XXX */

						regulator-always-on;

						regulator-boot-on;

					};



					vdd_3v3_sys: sd3 {

						regulator-name = "VDD_3V3_SYS";

						regulator-min-microvolt = <3300000>;

						regulator-max-microvolt = <3300000>;

						/* XXX */

						regulator-always-on;

						regulator-boot-on;

					};



					ldo0 {

					vdd_1v8_pll: ldo0 {

						regulator-name = "VDD_1V8_AP_PLL";

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <1800000>;

						/* XXX */

						regulator-always-on;

						regulator-boot-on;

					};



					ldo2 {

						regulator-name = "VDDIO_3V3_AOHV";

						regulator-min-microvolt = <3300000>;

						regulator-max-microvolt = <3300000>;

						/* XXX */

						regulator-always-on;

						regulator-boot-on;

					};
@@ -331,18 +318,12 @@ 
						regulator-name = "VDD_HDMI_1V05";

						regulator-min-microvolt = <1050000>;

						regulator-max-microvolt = <1050000>;

						/* XXX */

						regulator-always-on;

						regulator-boot-on;

					};



					vdd_pex: ldo8 {

						regulator-name = "VDD_PEX_1V05";

						regulator-min-microvolt = <1050000>;

						regulator-max-microvolt = <1050000>;

						/* XXX */

						regulator-always-on;

						regulator-boot-on;

					};

				};

			};
@@ -360,10 +341,21 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		vdd_5v0_sys: regulator@0 {

		gnd: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;



			regulator-name = "GND";

			regulator-min-microvolt = <0>;

			regulator-max-microvolt = <0>;

			regulator-always-on;

			regulator-boot-on;

		};



		vdd_5v0_sys: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;



			regulator-name = "VDD_5V0_SYS";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;
@@ -371,18 +363,14 @@ 
			regulator-boot-on;

		};



		vdd_1v8_ap: regulator@1 {

		vdd_1v8_ap: regulator@2 {

			compatible = "regulator-fixed";

			reg = <1>;

			reg = <2>;



			regulator-name = "VDD_1V8_AP";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;



			/* XXX */

			regulator-always-on;

			regulator-boot-on;



			gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;

			enable-active-high;

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

+138 −2
Original line number Diff line number Diff line
@@ -317,10 +317,11 @@ 
		nvidia,pad-autocal-pull-down-offset-1v8-timeout = <0x0a>;

		nvidia,pad-autocal-pull-up-offset-3v3-timeout = <0x0a>;

		nvidia,pad-autocal-pull-down-offset-3v3-timeout = <0x0a>;

		nvidia,default-tap = <0x5>;

		nvidia,default-trim = <0x9>;

		nvidia,default-tap = <0x9>;

		nvidia,default-trim = <0x5>;

		nvidia,dqs-trim = <63>;

		mmc-hs400-1_8v;

		supports-cqe;

		status = "disabled";

	};
@@ -340,6 +341,141 @@ 
		status = "disabled";

	};



	padctl: padctl@3520000 {

		compatible = "nvidia,tegra186-xusb-padctl";

		reg = <0x0 0x03520000 0x0 0x1000>,

		      <0x0 0x03540000 0x0 0x1000>;

		reg-names = "padctl", "ao";



		resets = <&bpmp TEGRA186_RESET_XUSB_PADCTL>;

		reset-names = "padctl";



		status = "disabled";



		pads {

			usb2 {

				clocks = <&bpmp TEGRA186_CLK_USB2_TRK>;

				clock-names = "trk";

				status = "disabled";



				lanes {

					usb2-0 {

						status = "disabled";

						#phy-cells = <0>;

					};



					usb2-1 {

						status = "disabled";

						#phy-cells = <0>;

					};



					usb2-2 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};



			hsic {

				clocks = <&bpmp TEGRA186_CLK_HSIC_TRK>;

				clock-names = "trk";

				status = "disabled";



				lanes {

					hsic-0 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};



			usb3 {

				status = "disabled";



				lanes {

					usb3-0 {

						status = "disabled";

						#phy-cells = <0>;

					};



					usb3-1 {

						status = "disabled";

						#phy-cells = <0>;

					};



					usb3-2 {

						status = "disabled";

						#phy-cells = <0>;

					};

				};

			};

		};



		ports {

			usb2-0 {

				status = "disabled";

			};



			usb2-1 {

				status = "disabled";

			};



			usb2-2 {

				status = "disabled";

			};



			hsic-0 {

				status = "disabled";

			};



			usb3-0 {

				status = "disabled";

			};



			usb3-1 {

				status = "disabled";

			};



			usb3-2 {

				status = "disabled";

			};

		};

	};



	usb@3530000 {

		compatible = "nvidia,tegra186-xusb";

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

		      <0x0 0x03538000 0x0 0x1000>;

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



		interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;



		clocks = <&bpmp TEGRA186_CLK_XUSB_HOST>,

			 <&bpmp TEGRA186_CLK_XUSB_FALCON>,

			 <&bpmp TEGRA186_CLK_XUSB_SS>,

			 <&bpmp TEGRA186_CLK_XUSB_CORE_SS>,

			 <&bpmp TEGRA186_CLK_CLK_M>,

			 <&bpmp TEGRA186_CLK_XUSB_FS>,

			 <&bpmp TEGRA186_CLK_PLLU>,

			 <&bpmp TEGRA186_CLK_CLK_M>,

			 <&bpmp TEGRA186_CLK_PLLE>;

		clock-names = "xusb_host", "xusb_falcon_src", "xusb_ss",

			      "xusb_ss_src", "xusb_hs_src", "xusb_fs_src",

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



		power-domains = <&bpmp TEGRA186_POWER_DOMAIN_XUSBC>,

				<&bpmp TEGRA186_POWER_DOMAIN_XUSBA>;

		power-domain-names = "xusb_host", "xusb_ss";

		nvidia,xusb-padctl = <&padctl>;



		status = "disabled";



		#address-cells = <1>;

		#size-cells = <0>;

	};



	fuse@3820000 {

		compatible = "nvidia,tegra186-efuse";

		reg = <0x0 0x03820000 0x0 0x10000>;

arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ 
				interrupt-parent = <&gpio>;

				interrupts = <TEGRA194_MAIN_GPIO(H, 2)

					      IRQ_TYPE_LEVEL_LOW>;

				vcc-supply = <&vdd_1v8ls>;



				#thermal-sensor-cells = <1>;

			};

CRA Git | Maintained and supported by SUSTech CRA and CCSE