Commit 1228c051 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

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

This contains a couple of fixes to existing device trees, enables CPU
frequency scaling on various Tegra210 boards, enables the TCU as debug
serial port on Jetson Xavier, adds various improvements for SDMMC on
Tegra210, Tegra186 and Tegra194 boards and finally adds initial support
for the NVIDIA Shield TV.

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

: (25 commits)
  arm64: tegra: Update compatible for Tegra186 I2C
  arm64: tegra: Update compatible for Tegra210 I2C
  arm64: tegra: Support 200 MHz for SDMMC on Tegra194
  arm64: tegra: Add CQE Support for SDMMC4
  arm64: tegra: Add SDMMC auto-calibration settings
  arm64: tegra: Mark TCU as primary serial port on Tegra194 P2888
  arm64: tegra: Add nodes for TCU on Tegra194
  arm64: tegra: Enable DFLL clock on Smaug
  arm64: tegra: Add CPU power rail regulator on Smaug
  arm64: tegra: Enable DFLL clock on Jetson TX1
  arm64: tegra: Add pinmux for PWM-based DFLL support on P2597
  arm64: tegra: Add CPU clocks on Tegra210
  arm64: tegra: Add DFLL clock on Tegra210
  arm64: tegra: p2771-0000: Use TEGRA186_ prefix for GPIO names
  arm64: tegra: p3310: Use TEGRA186_ prefix for GPIO names
  arm64: tegra: p2597: Sort nodes by unit-address
  arm64: tegra: p2972: Sort nodes properly
  arm64: tegra: Add regulators for Tegra210 Darcy
  arm64: tegra: Add pinmux for Darcy board
  arm64: tegra: Add gpio-keys nodes for Darcy
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6583d1fd 250a36c0

arch/arm64/boot/dts/nvidia/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ 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-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

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

+11 −7
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ 
			reg = <0x74>;



			interrupt-parent = <&gpio>;

			interrupts = <TEGRA_MAIN_GPIO(Y, 0) GPIO_ACTIVE_LOW>;

			interrupts = <TEGRA186_MAIN_GPIO(Y, 0)

				      GPIO_ACTIVE_LOW>;



			#gpio-cells = <2>;

			gpio-controller;
@@ -37,7 +38,8 @@ 
			reg = <0x77>;



			interrupt-parent = <&gpio>;

			interrupts = <TEGRA_MAIN_GPIO(Y, 6) GPIO_ACTIVE_LOW>;

			interrupts = <TEGRA186_MAIN_GPIO(Y, 6)

				      GPIO_ACTIVE_LOW>;



			#gpio-cells = <2>;

			gpio-controller;
@@ -108,7 +110,8 @@ 
			hdmi-supply = <&vdd_hdmi>;



			nvidia,ddc-i2c-bus = <&ddc>;

			nvidia,hpd-gpio = <&gpio TEGRA_MAIN_GPIO(P, 1) GPIO_ACTIVE_LOW>;

			nvidia,hpd-gpio = <&gpio TEGRA186_MAIN_GPIO(P, 1)

						 GPIO_ACTIVE_LOW>;

		};



		dpaux@155c0000 {
@@ -121,7 +124,7 @@ 


		power {

			label = "Power";

			gpios = <&gpio_aon TEGRA_AON_GPIO(FF, 0)

			gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 0)

					   GPIO_ACTIVE_LOW>;

			linux,input-type = <EV_KEY>;

			linux,code = <KEY_POWER>;
@@ -132,7 +135,7 @@ 


		volume-up {

			label = "Volume Up";

			gpios = <&gpio_aon TEGRA_AON_GPIO(FF, 1)

			gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 1)

					   GPIO_ACTIVE_LOW>;

			linux,input-type = <EV_KEY>;

			linux,code = <KEY_VOLUMEUP>;
@@ -141,7 +144,7 @@ 


		volume-down {

			label = "Volume Down";

			gpios = <&gpio_aon TEGRA_AON_GPIO(FF, 2)

			gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 2)

					   GPIO_ACTIVE_LOW>;

			linux,input-type = <EV_KEY>;

			linux,code = <KEY_VOLUMEDOWN>;
@@ -158,7 +161,8 @@ 
			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;



			gpio = <&gpio TEGRA_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>;

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

+6 −4
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 
	ethernet@2490000 {

		status = "okay";



		phy-reset-gpios = <&gpio TEGRA_MAIN_GPIO(M, 4) GPIO_ACTIVE_LOW>;

		phy-reset-gpios = <&gpio TEGRA186_MAIN_GPIO(M, 4)

					 GPIO_ACTIVE_LOW>;

		phy-handle = <&phy>;

		phy-mode = "rgmii";
@@ -46,7 +47,8 @@ 
				compatible = "ethernet-phy-ieee802.3-c22";

				reg = <0x0>;

				interrupt-parent = <&gpio>;

				interrupts = <TEGRA_MAIN_GPIO(M, 5) IRQ_TYPE_LEVEL_LOW>;

				interrupts = <TEGRA186_MAIN_GPIO(M, 5)

					      IRQ_TYPE_LEVEL_LOW>;

			};

		};

	};
@@ -91,8 +93,8 @@ 


	/* SDMMC1 (SD/MMC) */

	sdhci@3400000 {

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

		wp-gpios = <&gpio TEGRA_MAIN_GPIO(P, 4) GPIO_ACTIVE_HIGH>;

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

		wp-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 4) GPIO_ACTIVE_HIGH>;



		vqmmc-supply = <&vddio_sdmmc1>;

	};

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

+12 −9
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ 
	};



	gen1_i2c: i2c@3160000 {

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra210-i2c";

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

		interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;
@@ -149,7 +149,7 @@ 
	};



	cam_i2c: i2c@3180000 {

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra210-i2c";

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

		interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;
@@ -163,7 +163,7 @@ 


	/* shares pads with dpaux1 */

	dp_aux_ch1_i2c: i2c@3190000 {

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra210-i2c";

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

		interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;
@@ -177,7 +177,7 @@ 


	/* controlled by BPMP, should not be enabled */

	pwr_i2c: i2c@31a0000 {

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra210-i2c";

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

		interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;
@@ -191,7 +191,7 @@ 


	/* shares pads with dpaux0 */

	dp_aux_ch0_i2c: i2c@31b0000 {

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra210-i2c";

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

		interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;
@@ -204,7 +204,7 @@ 
	};



	gen7_i2c: i2c@31c0000 {

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra210-i2c";

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

		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;
@@ -217,7 +217,7 @@ 
	};



	gen9_i2c: i2c@31e0000 {

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra210-i2c";

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

		interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;
@@ -315,10 +315,13 @@ 
		nvidia,pad-autocal-pull-down-offset-hs400 = <0x05>;

		nvidia,pad-autocal-pull-up-offset-1v8-timeout = <0x0a>;

		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,dqs-trim = <63>;

		mmc-hs400-1_8v;

		supports-cqe;

		status = "disabled";

	};
@@ -375,7 +378,7 @@ 
	};



	gen2_i2c: i2c@c240000 {

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra210-i2c";

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

		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;
@@ -388,7 +391,7 @@ 
	};



	gen8_i2c: i2c@c250000 {

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra114-i2c";

		compatible = "nvidia,tegra186-i2c", "nvidia,tegra210-i2c";

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

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
	aliases {

		sdhci0 = "/cbb/sdhci@3460000";

		sdhci1 = "/cbb/sdhci@3400000";

		serial0 = &uartb;

		serial0 = &tcu;

		i2c0 = "/bpmp/i2c";

		i2c1 = "/cbb/i2c@3160000";

		i2c2 = "/cbb/i2c@c240000";

CRA Git | Maintained and supported by SUSTech CRA and CCSE