Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90919bf2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.8-dt' of... 

Merge tag 'tegra-for-3.8-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt

From Stephen Warren:
ARM: tegra: device tree changes

A wide variety of device tree additions are made across many Tegra
boards:

* WiFi is supported on Seaboard, Ventana, and Cardhu.
* An I2C mux is added for Ventana, and Tamonten.
* SPI flash is added to Cardhu, and TrimSlice.
* Temperature sensors are added to Harmony, Tamonten, and Ventana.
* host1x (graphics/display controller) is added to the SoC include files.
* HDMI displays are enabled on Harmony, TrimSlice, Tamonten, Plutux, Tec,
  and Whistler.

This pull request is based on tegra-for-3.8-soc.

* tag 'tegra-for-3.8-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (47 commits)
  ARM: tegra: whistler: enable HDMI port
  ARM: tegra: tec: Enable HDMI output
  ARM: tegra: plutux: Enable HDMI output
  ARM: tegra: tamonten: Add host1x support
  ARM: tegra: trimslice: enable HDMI port
  ARM: tegra: harmony: enable HDMI port
  ARM: tegra: Add Tegra30 host1x support
  ARM: tegra: Add Tegra20 host1x support
  ARM: tegra: trimslice: enable SPI flash
  ARM: tegra: dts: add sflash controller dt entry
  ARM: tegra: ventana: Add NCT1008 temperature sensor
  ARM: tegra: tamonten: Add NCT1008 temperature sensor
  ARM: tegra: harmony: Add ADT7641 temperature sensor
  ARM: tegra: tec: Remove redundant DT properties
  ARM: tegra: tamonten: Add DDC/PTA pinmux
  ARM: tegra: dts: cardhu: enable SLINK4
  ARM: tegra: dts: add slink controller dt entry
  ARM: dt: tegra: ventana: define pinmux for ddc
  ARM: dt: t30 cardhu: set pinmux and power for wlan
  ARM: dt: t20 ventana: set pinmux and power for wlan
  ...
parents 6fe05f33 2658ef15

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -51,4 +51,5 @@ ti Texas Instruments 
via	VIA Technologies, Inc.

wlf	Wolfson Microelectronics

wm	Wondermedia Technologies, Inc.

winbond Winbond Electronics corp.

xlnx	Xilinx

arch/arm/boot/dts/tegra20-harmony.dts

+34 −50
Original line number Diff line number Diff line
@@ -10,6 +10,18 @@ 
		reg = <0x00000000 0x40000000>;

	};



	host1x {

		hdmi {

			status = "okay";



			vdd-supply = <&hdmi_vdd_reg>;

			pll-supply = <&hdmi_pll_reg>;



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

			nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */

		};

	};



	pinmux {

		pinctrl-names = "default";

		pinctrl-0 = <&state_default>;
@@ -262,9 +274,9 @@ 
		};

	};



	i2c@7000c400 {

	hdmi_ddc: i2c@7000c400 {

		status = "okay";

		clock-frequency = <400000>;

		clock-frequency = <100000>;

	};



	i2c@7000c500 {
@@ -297,131 +309,98 @@ 
			vinldo9-supply = <&sm2_reg>;



			regulators {

				#address-cells = <1>;

				#size-cells = <0>;



				sys_reg: regulator@0 {

					reg = <0>;

					regulator-compatible = "sys";

				sys_reg: sys {

					regulator-name = "vdd_sys";

					regulator-always-on;

				};



				regulator@1 {

					reg = <1>;

					regulator-compatible = "sm0";

				sm0 {

					regulator-name = "vdd_sm0,vdd_core";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-always-on;

				};



				regulator@2 {

					reg = <2>;

					regulator-compatible = "sm1";

				sm1 {

					regulator-name = "vdd_sm1,vdd_cpu";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

				};



				sm2_reg: regulator@3 {

					reg = <3>;

					regulator-compatible = "sm2";

				sm2_reg: sm2 {

					regulator-name = "vdd_sm2,vin_ldo*";

					regulator-min-microvolt = <3700000>;

					regulator-max-microvolt = <3700000>;

					regulator-always-on;

				};



				regulator@4 {

					reg = <4>;

					regulator-compatible = "ldo0";

				ldo0 {

					regulator-name = "vdd_ldo0,vddio_pex_clk";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@5 {

					reg = <5>;

					regulator-compatible = "ldo1";

				ldo1 {

					regulator-name = "vdd_ldo1,avdd_pll*";

					regulator-min-microvolt = <1100000>;

					regulator-max-microvolt = <1100000>;

					regulator-always-on;

				};



				regulator@6 {

					reg = <6>;

					regulator-compatible = "ldo2";

				ldo2 {

					regulator-name = "vdd_ldo2,vdd_rtc";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				regulator@7 {

					reg = <7>;

					regulator-compatible = "ldo3";

				ldo3 {

					regulator-name = "vdd_ldo3,avdd_usb*";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};



				regulator@8 {

					reg = <8>;

					regulator-compatible = "ldo4";

				ldo4 {

					regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				regulator@9 {

					reg = <9>;

					regulator-compatible = "ldo5";

				ldo5 {

					regulator-name = "vdd_ldo5,vcore_mmc";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@10 {

					reg = <10>;

					regulator-compatible = "ldo6";

				ldo6 {

					regulator-name = "vdd_ldo6,avdd_vdac";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@11 {

					reg = <11>;

					regulator-compatible = "ldo7";

				hdmi_vdd_reg: ldo7 {

					regulator-name = "vdd_ldo7,avdd_hdmi";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@12 {

					reg = <12>;

					regulator-compatible = "ldo8";

				hdmi_pll_reg: ldo8 {

					regulator-name = "vdd_ldo8,avdd_hdmi_pll";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@13 {

					reg = <13>;

					regulator-compatible = "ldo9";

				ldo9 {

					regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@14 {

					reg = <14>;

					regulator-compatible = "ldo_rtc";

				ldo_rtc {

					regulator-name = "vdd_rtc_out,vdd_cell";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;
@@ -429,6 +408,11 @@ 
				};

			};

		};



		temperature-sensor@4c {

			compatible = "adi,adt7461";

			reg = <0x4c>;

		};

	};



	pmc {

arch/arm/boot/dts/tegra20-paz00.dts

+14 −45
Original line number Diff line number Diff line
@@ -291,37 +291,26 @@ 
			vinldo9-supply = <&sm2_reg>;



			regulators {

				#address-cells = <1>;

				#size-cells = <0>;



				sys_reg: regulator@0 {

					reg = <0>;

					regulator-compatible = "sys";

				sys_reg: sys {

					regulator-name = "vdd_sys";

					regulator-always-on;

				};



				regulator@1 {

					reg = <1>;

					regulator-compatible = "sm0";

				sm0 {

					regulator-name = "+1.2vs_sm0,vdd_core";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-always-on;

				};



				regulator@2 {

					reg = <2>;

					regulator-compatible = "sm1";

				sm1 {

					regulator-name = "+1.0vs_sm1,vdd_cpu";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

				};



				sm2_reg: regulator@3 {

					reg = <3>;

					regulator-compatible = "sm2";

				sm2_reg: sm2 {

					regulator-name = "+3.7vs_sm2,vin_ldo*";

					regulator-min-microvolt = <3700000>;

					regulator-max-microvolt = <3700000>;
@@ -330,53 +319,41 @@ 


				/* LDO0 is not connected to anything */



				regulator@5 {

					reg = <5>;

					regulator-compatible = "ldo1";

				ldo1 {

					regulator-name = "+1.1vs_ldo1,avdd_pll*";

					regulator-min-microvolt = <1100000>;

					regulator-max-microvolt = <1100000>;

					regulator-always-on;

				};



				regulator@6 {

					reg = <6>;

					regulator-compatible = "ldo2";

				ldo2 {

					regulator-name = "+1.2vs_ldo2,vdd_rtc";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				regulator@7 {

					reg = <7>;

					regulator-compatible = "ldo3";

				ldo3 {

					regulator-name = "+3.3vs_ldo3,avdd_usb*";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};



				regulator@8 {

					reg = <8>;

					regulator-compatible = "ldo4";

				ldo4 {

					regulator-name = "+1.8vs_ldo4,avdd_osc,vddio_sys";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				regulator@9 {

					reg = <9>;

					regulator-compatible = "ldo5";

				ldo5 {

					regulator-name = "+2.85vs_ldo5,vcore_mmc";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@10 {

					reg = <10>;

					regulator-compatible = "ldo6";

				ldo6 {

					/*

					 * Research indicates this should be

					 * 1.8v; other boards that use this
@@ -390,34 +367,26 @@ 
					regulator-max-microvolt = <1800000>;

				};



				regulator@11 {

					reg = <11>;

					regulator-compatible = "ldo7";

				ldo7 {

					regulator-name = "+3.3vs_ldo7,avdd_hdmi";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@12 {

					reg = <12>;

					regulator-compatible = "ldo8";

				ldo8 {

					regulator-name = "+1.8vs_ldo8,avdd_hdmi_pll";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@13 {

					reg = <13>;

					regulator-compatible = "ldo9";

				ldo9 {

					regulator-name = "+2.85vs_ldo9,vdd_ddr_rx";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@14 {

					reg = <14>;

					regulator-compatible = "ldo_rtc";

				ldo_rtc {

					regulator-name = "+3.3vs_rtc";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

arch/arm/boot/dts/tegra20-plutux.dts

+6 −0
Original line number Diff line number Diff line
@@ -6,6 +6,12 @@ 
	model = "Avionic Design Plutux board";

	compatible = "ad,plutux", "ad,tamonten", "nvidia,tegra20";



	host1x {

		hdmi {

			status = "okay";

		};

	};



	i2c@7000c000 {

		wm8903: wm8903@1a {

			compatible = "wlf,wm8903";

arch/arm/boot/dts/tegra20-seaboard.dts

+20 −45
Original line number Diff line number Diff line
@@ -395,37 +395,26 @@ 
			vinldo9-supply = <&sm2_reg>;



			regulators {

				#address-cells = <1>;

				#size-cells = <0>;



				sys_reg: regulator@0 {

					reg = <0>;

					regulator-compatible = "sys";

				sys_reg: sys {

					regulator-name = "vdd_sys";

					regulator-always-on;

				};



				regulator@1 {

					reg = <1>;

					regulator-compatible = "sm0";

				sm0 {

					regulator-name = "vdd_sm0,vdd_core";

					regulator-min-microvolt = <1300000>;

					regulator-max-microvolt = <1300000>;

					regulator-always-on;

				};



				regulator@2 {

					reg = <2>;

					regulator-compatible = "sm1";

				sm1 {

					regulator-name = "vdd_sm1,vdd_cpu";

					regulator-min-microvolt = <1125000>;

					regulator-max-microvolt = <1125000>;

					regulator-always-on;

				};



				sm2_reg: regulator@3 {

					reg = <3>;

					regulator-compatible = "sm2";

				sm2_reg: sm2 {

					regulator-name = "vdd_sm2,vin_ldo*";

					regulator-min-microvolt = <3700000>;

					regulator-max-microvolt = <3700000>;
@@ -434,86 +423,66 @@ 


				/* LDO0 is not connected to anything */



				regulator@5 {

					reg = <5>;

					regulator-compatible = "ldo1";

				ldo1 {

					regulator-name = "vdd_ldo1,avdd_pll*";

					regulator-min-microvolt = <1100000>;

					regulator-max-microvolt = <1100000>;

					regulator-always-on;

				};



				regulator@6 {

					reg = <6>;

					regulator-compatible = "ldo2";

				ldo2 {

					regulator-name = "vdd_ldo2,vdd_rtc";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				regulator@7 {

					reg = <7>;

					regulator-compatible = "ldo3";

				ldo3 {

					regulator-name = "vdd_ldo3,avdd_usb*";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};



				regulator@8 {

					reg = <8>;

					regulator-compatible = "ldo4";

				ldo4 {

					regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				regulator@9 {

					reg = <9>;

					regulator-compatible = "ldo5";

				ldo5 {

					regulator-name = "vdd_ldo5,vcore_mmc";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@10 {

					reg = <10>;

					regulator-compatible = "ldo6";

				ldo6 {

					regulator-name = "vdd_ldo6,avdd_vdac,vddio_vi,vddio_cam";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@11 {

					reg = <11>;

					regulator-compatible = "ldo7";

				ldo7 {

					regulator-name = "vdd_ldo7,avdd_hdmi,vdd_fuse";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@12 {

					reg = <12>;

					regulator-compatible = "ldo8";

				ldo8 {

					regulator-name = "vdd_ldo8,avdd_hdmi_pll";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@13 {

					reg = <13>;

					regulator-compatible = "ldo9";

				ldo9 {

					regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@14 {

					reg = <14>;

					regulator-compatible = "ldo_rtc";

				ldo_rtc {

					regulator-name = "vdd_rtc_out,vdd_cell";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;
@@ -592,6 +561,12 @@ 
		status = "okay";

	};



	sdhci@c8000000 {

		status = "okay";

		power-gpios = <&gpio 86 0>; /* gpio PK6 */

		bus-width = <4>;

	};



	sdhci@c8000400 {

		status = "okay";

		cd-gpios = <&gpio 69 0>; /* gpio PI5 */