Commit 3502e079 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

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

This adds device trees for the ASUS Google Nexus 7 and Acer Iconia Tab
A500. In addition there are a slew of fixes to existing device trees in
preparation for validating the DTBs against json-schema.

* tag 'tegra-for-5.9-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (38 commits)
  ARM: tegra: Add device-tree for ASUS Google Nexus 7
  ARM: tegra: Add device-tree for Acer Iconia Tab A500
  ARM: tegra: Add HDMI supplies on Nyan boards
  ARM: tegra: Add missing DSI controller on Tegra30
  ARM: tegra: Add i2c-bus subnode for DPAUX controllers
  ARM: tegra: The Tegra30 SDHCI is not backwards-compatible
  ARM: tegra: The Tegra30 DC is not backwards-compatible
  ARM: tegra: Remove spurious comma from node name
  ARM: tegra: Add parent clock to DSI output
  ARM: tegra: Use standard names for SRAM nodes
  ARM: tegra: seaboard: Use standard battery bindings
  ARM: tegra: Use standard names for LED nodes
  ARM: tegra: Use numeric unit-addresses
  ARM: tegra: medcom-wide: Remove extra panel power supply
  ARM: tegra: Use proper unit-addresses for OPPs
  ARM: tegra: Add missing clock-names for SDHCI controllers
  ARM: tegra: Fix order of XUSB controller clocks
  ARM: tegra: Add #reset-cells to Tegra124 memory controller
  ARM: tegra: Add missing panel power supplies
  ARM: tegra: Add micro-USB A/B port on Jetson TK1
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 28ef26f6 2720008f

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -1198,6 +1198,7 @@ dtb-$(CONFIG_MACH_SUNIV) += \ 
dtb-$(CONFIG_ARCH_TANGO) += \

	tango4-vantage-1172.dtb

dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \

	tegra20-acer-a500-picasso.dtb \

	tegra20-harmony.dtb \

	tegra20-colibri-eval-v3.dtb \

	tegra20-colibri-iris.dtb \
@@ -1211,6 +1212,9 @@ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ 
dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \

	tegra30-apalis-eval.dtb \

	tegra30-apalis-v1.1-eval.dtb \

	tegra30-asus-nexus7-grouper-PM269.dtb \

	tegra30-asus-nexus7-grouper-E1565.dtb \

	tegra30-asus-nexus7-tilapia-E1565.dtb \

	tegra30-beaver.dtb \

	tegra30-cardhu-a02.dtb \

	tegra30-cardhu-a04.dtb \

arch/arm/boot/dts/tegra114-dalmore.dts

+64 −85
Original line number Diff line number Diff line
@@ -769,7 +769,6 @@ i2c@7000c000 { 
		battery: smart-battery@b {

			compatible = "ti,bq20z45", "sbs,sbs-battery";

			reg = <0xb>;

			battery-name = "battery";

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

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

			power-supplies = <&charger>;
@@ -1109,14 +1108,14 @@ i2s@70080400 { 
		};

	};



	sdhci@78000400 {

	mmc@78000400 {

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

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

		bus-width = <4>;

		status = "okay";

	};



	sdhci@78000600 {

	mmc@78000600 {

		bus-width = <8>;

		status = "okay";

		non-removable;
@@ -1152,17 +1151,10 @@ backlight: backlight { 
		default-brightness-level = <6>;

	};



	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 {
@@ -1194,14 +1186,8 @@ volume_up { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	vdd_ac_bat_reg: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "vdd_ac_bat";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1210,7 +1196,6 @@ vdd_ac_bat_reg: regulator@0 { 


	dvdd_ts_reg: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "dvdd_ts";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -1220,7 +1205,6 @@ dvdd_ts_reg: regulator@1 { 


	usb1_vbus_reg: regulator@3 {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "usb1_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1232,7 +1216,6 @@ usb1_vbus_reg: regulator@3 { 


	usb3_vbus_reg: regulator@4 {

		compatible = "regulator-fixed";

			reg = <4>;

		regulator-name = "usb2_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1244,7 +1227,6 @@ usb3_vbus_reg: regulator@4 { 


	vdd_hdmi_reg: regulator@5 {

		compatible = "regulator-fixed";

			reg = <5>;

		regulator-name = "vdd_hdmi_5v0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1253,7 +1235,6 @@ vdd_hdmi_reg: regulator@5 { 


	vdd_cam_1v8_reg: regulator@6 {

		compatible = "regulator-fixed";

			reg = <6>;

		regulator-name = "vdd_cam_1v8_reg";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -1263,7 +1244,6 @@ vdd_cam_1v8_reg: regulator@6 { 


	vdd_5v0_hdmi: regulator@7 {

		compatible = "regulator-fixed";

			reg = <7>;

		regulator-name = "VDD_5V0_HDMI_CON";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1271,7 +1251,6 @@ vdd_5v0_hdmi: regulator@7 { 
		enable-active-high;

		vin-supply = <&tps65090_dcdc1_reg>;

	};

	};



	sound {

		compatible = "nvidia,tegra-audio-rt5640-dalmore",

arch/arm/boot/dts/tegra114-roth.dts

+61 −80
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ host1x@50000000 { 
		dsi@54300000 {

			status = "okay";



			vdd-supply = <&vdd_1v2_ap>;

			avdd-dsi-csi-supply = <&vdd_1v2_ap>;



			panel@0 {

				compatible = "lg,lh500wx1-sd03";
@@ -962,7 +962,7 @@ pmc@7000e400 { 
	};



	/* SD card */

	sdhci@78000400 {

	mmc@78000400 {

		status = "okay";

		bus-width = <4>;

		vqmmc-supply = <&vddio_sdmmc3>;
@@ -971,7 +971,7 @@ sdhci@78000400 { 
	};



	/* eMMC */

	sdhci@78000600 {

	mmc@78000600 {

		status = "okay";

		bus-width = <8>;

		non-removable;
@@ -1016,17 +1016,10 @@ backlight: backlight { 
		enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;

	};



	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 {
@@ -1052,14 +1045,8 @@ power { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	lcd_bl_en: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "lcd_bl_en";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1068,7 +1055,6 @@ lcd_bl_en: regulator@0 { 


	vdd_lcd: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "vdd_lcd_1v8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -1080,7 +1066,6 @@ vdd_lcd: regulator@1 { 


	regulator@2 {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "vdd_1v8_ts";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -1090,7 +1075,6 @@ regulator@2 { 


	regulator@3 {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "vdd_3v3_ts";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1101,7 +1085,6 @@ regulator@3 { 


	regulator@4 {

		compatible = "regulator-fixed";

			reg = <4>;

		regulator-name = "vdd_1v8_com";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -1113,7 +1096,6 @@ regulator@4 { 


	regulator@5 {

		compatible = "regulator-fixed";

			reg = <5>;

		regulator-name = "vdd_3v3_com";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1124,4 +1106,3 @@ regulator@5 { 
		regulator-boot-on;

	};

};
 
};

arch/arm/boot/dts/tegra114-tn7.dts

+34 −50
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ host1x@50000000 { 
		dsi@54300000 {

			status = "okay";



			vdd-supply = <&vdd_1v2_ap>;

			avdd-dsi-csi-supply = <&vdd_1v2_ap>;



			panel@0 {

				compatible = "lg,ld070wx3-sl01";
@@ -242,7 +242,7 @@ pmc@7000e400 { 
	};



	/* eMMC */

	sdhci@78000600 {

	mmc@78000600 {

		status = "okay";

		bus-width = <8>;

		non-removable;
@@ -273,17 +273,10 @@ backlight: backlight { 
		power-supply = <&lcd_bl_en>;

	};



	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 {
@@ -309,15 +302,9 @@ volume_up { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	/* FIXME: output of BQ24192 */

	vs_sys: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "VS_SYS";

		regulator-min-microvolt = <4200000>;

		regulator-max-microvolt = <4200000>;
@@ -327,7 +314,6 @@ vs_sys: regulator@0 { 


	lcd_bl_en: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "VDD_LCD_BL";

		regulator-min-microvolt = <16500000>;

		regulator-max-microvolt = <16500000>;
@@ -339,7 +325,6 @@ lcd_bl_en: regulator@1 { 


	vdd_lcd: regulator@2 {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "VD_LCD_1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -349,4 +334,3 @@ vdd_lcd: regulator@2 { 
		regulator-boot-on;

	};

};
 
};

arch/arm/boot/dts/tegra114.dtsi

+29 −19
Original line number Diff line number Diff line
@@ -18,11 +18,13 @@ memory@80000000 { 
	};



	host1x@50000000 {

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

		compatible = "nvidia,tegra114-host1x";

		reg = <0x50000000 0x00028000>;

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

			     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; /* general */

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

		clocks = <&tegra_car TEGRA114_CLK_HOST1X>;

		clock-names = "host1x";

		resets = <&tegra_car 28>;

		reset-names = "host1x";

		iommus = <&mc TEGRA_SWGROUP_HC>;
@@ -33,7 +35,7 @@ host1x@50000000 { 
		ranges = <0x54000000 0x54000000 0x01000000>;



		gr2d@54140000 {

			compatible = "nvidia,tegra114-gr2d", "nvidia,tegra20-gr2d";

			compatible = "nvidia,tegra114-gr2d";

			reg = <0x54140000 0x00040000>;

			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&tegra_car TEGRA114_CLK_GR2D>;
@@ -44,7 +46,7 @@ gr2d@54140000 { 
		};



		gr3d@54180000 {

			compatible = "nvidia,tegra114-gr3d", "nvidia,tegra20-gr3d";

			compatible = "nvidia,tegra114-gr3d";

			reg = <0x54180000 0x00040000>;

			clocks = <&tegra_car TEGRA114_CLK_GR3D>;

			resets = <&tegra_car 24>;
@@ -54,7 +56,7 @@ gr3d@54180000 { 
		};



		dc@54200000 {

			compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc";

			compatible = "nvidia,tegra114-dc";

			reg = <0x54200000 0x00040000>;

			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&tegra_car TEGRA114_CLK_DISP1>,
@@ -73,7 +75,7 @@ rgb { 
		};



		dc@54240000 {

			compatible = "nvidia,tegra114-dc", "nvidia,tegra20-dc";

			compatible = "nvidia,tegra114-dc";

			reg = <0x54240000 0x00040000>;

			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&tegra_car TEGRA114_CLK_DISP2>,
@@ -253,14 +255,14 @@ gpio: gpio@6000d000 { 


	apbmisc@70000800 {

		compatible = "nvidia,tegra114-apbmisc", "nvidia,tegra20-apbmisc";

		reg = <0x70000800 0x64   /* Chip revision */

		       0x70000008 0x04>; /* Strapping options */

		reg = <0x70000800 0x64>, /* Chip revision */

		      <0x70000008 0x04>; /* Strapping options */

	};



	pinmux: pinmux@70000868 {

		compatible = "nvidia,tegra114-pinmux";

		reg = <0x70000868 0x148		/* Pad control registers */

		       0x70003000 0x40c>;	/* Mux registers */

		reg = <0x70000868 0x148>, /* Pad control registers */

		      <0x70003000 0x40c>; /* Mux registers */

	};



	/*
@@ -644,41 +646,45 @@ mipi: mipi@700e3000 { 
		#nvidia,mipi-calibrate-cells = <1>;

	};



	sdhci@78000000 {

		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";

	mmc@78000000 {

		compatible = "nvidia,tegra114-sdhci";

		reg = <0x78000000 0x200>;

		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&tegra_car TEGRA114_CLK_SDMMC1>;

		clock-names = "sdhci";

		resets = <&tegra_car 14>;

		reset-names = "sdhci";

		status = "disabled";

	};



	sdhci@78000200 {

		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";

	mmc@78000200 {

		compatible = "nvidia,tegra114-sdhci";

		reg = <0x78000200 0x200>;

		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&tegra_car TEGRA114_CLK_SDMMC2>;

		clock-names = "sdhci";

		resets = <&tegra_car 9>;

		reset-names = "sdhci";

		status = "disabled";

	};



	sdhci@78000400 {

		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";

	mmc@78000400 {

		compatible = "nvidia,tegra114-sdhci";

		reg = <0x78000400 0x200>;

		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&tegra_car TEGRA114_CLK_SDMMC3>;

		clock-names = "sdhci";

		resets = <&tegra_car 69>;

		reset-names = "sdhci";

		status = "disabled";

	};



	sdhci@78000600 {

		compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";

	mmc@78000600 {

		compatible = "nvidia,tegra114-sdhci";

		reg = <0x78000600 0x200>;

		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&tegra_car TEGRA114_CLK_SDMMC4>;

		clock-names = "sdhci";

		resets = <&tegra_car 15>;

		reset-names = "sdhci";

		status = "disabled";
@@ -698,7 +704,8 @@ usb@7d000000 { 


	phy1: usb-phy@7d000000 {

		compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";

		reg = <0x7d000000 0x4000 0x7d000000 0x4000>;

		reg = <0x7d000000 0x4000>,

		      <0x7d000000 0x4000>;

		phy_type = "utmi";

		clocks = <&tegra_car TEGRA114_CLK_USBD>,

			 <&tegra_car TEGRA114_CLK_PLL_U>,
@@ -706,6 +713,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>;
@@ -734,7 +742,8 @@ usb@7d008000 { 


	phy3: usb-phy@7d008000 {

		compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";

		reg = <0x7d008000 0x4000 0x7d000000 0x4000>;

		reg = <0x7d008000 0x4000>,

		      <0x7d000000 0x4000>;

		phy_type = "utmi";

		clocks = <&tegra_car TEGRA114_CLK_USB3>,

			 <&tegra_car TEGRA114_CLK_PLL_U>,
@@ -742,6 +751,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>;