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

Commit 8b1b57e8 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Merge "ARM: tegra: device tree changes for 3.16" from Stephen Warren:

The bulk of Tegra changes for 3.16 are to device trees. Highlights are:

- New board support for:
  - Jetson TK1.
  - SHIELD.
  - Tegra Note 7.
  - Colibri T30 module.
- HDMI support on Venice2.
- SD card write-protect GPIOs added to some boards.
- Numerous regulator cleanups.

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

:
  ARM: tegra: initial add of Colibri T30
  ARM: tegra: add device tree for SHIELD
  ARM: tegra: add SD wp-gpios to Venice2 DT
  ARM: tegra: add Tegra Note 7 device tree
  ARM: tegra: add SD wp-gpios to Dalmore DT
  ARM: tegra: add SD wp-gpios to Jetson TK1 DT
  ARM: tegra: use correct audio CODEC on Jetson TK1
  ARM: tegra: dalmore - Add DSI power supply
  ARM: tegra: dalmore - Add +5V HDMI supply
  ARM: tegra: beaver - Add +5V HDMI supply
  ARM: tegra: harmony - Add +5V HDMI supply
  ARM: tegra: jetson-tk1 - Enable HDMI support
  ARM: tegra: venice2 - Enable HDMI
  ARM: tegra: Add Tegra124 HDMI support
  ARM: tegra: fix Venice2 SD card VQMMC supply
  ARM: tegra: make Venice's +3.3V_RUN regulator always on
  ARM: tegra: fix Jetson TK1 SD card supply
  ARM: tegra: define Jetson TK1 regulators
  ARM: tegra: add Jetson TK1 device tree

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 072a4fd2 446e9c63

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -370,7 +370,11 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ 
	tegra30-beaver.dtb \

	tegra30-cardhu-a02.dtb \

	tegra30-cardhu-a04.dtb \

	tegra30-colibri-eval-v3.dtb \

	tegra114-dalmore.dtb \

	tegra114-roth.dtb \

	tegra114-tn7.dtb \

	tegra124-jetson-tk1.dtb \

	tegra124-venice2.dtb

dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb

dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \

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

+16 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
		hdmi@54280000 {

			status = "okay";



			hdmi-supply = <&vdd_5v0_hdmi>;

			vdd-supply = <&vdd_hdmi_reg>;

			pll-supply = <&palmas_smps3_reg>;
@@ -36,6 +37,8 @@ 
		dsi@54300000 {

			status = "okay";



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



			panel@0 {

				compatible = "panasonic,vvx10f004b00",

					     "simple-panel";
@@ -982,12 +985,10 @@ 
						regulator-max-microvolt = <2800000>;

					};



					ldo3 {

					avdd_1v2_reg: ldo3 {

						regulator-name = "avdd-dsi-csi";

						regulator-min-microvolt = <1200000>;

						regulator-max-microvolt = <1200000>;

						regulator-always-on;

						regulator-boot-on;

					};



					ldo4 {
@@ -1105,6 +1106,7 @@ 


	sdhci@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";

	};
@@ -1231,8 +1233,6 @@ 
			regulator-name = "vdd_hdmi_5v0";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;

			vin-supply = <&tps65090_dcdc1_reg>;

		};
@@ -1245,6 +1245,17 @@ 
			enable-active-high;

			gpio = <&palmas_gpio 6 0>;

		};



		vdd_5v0_hdmi: regulator@7 {

			compatible = "regulator-fixed";

			reg = <7>;

			regulator-name = "VDD_5V0_HDMI_CON";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;

			enable-active-high;

			vin-supply = <&tps65090_dcdc1_reg>;

		};

	};



	sound {