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

Commit a258e3f8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Merge "ARM: tegra: Devicetree changes for v4.2-rc1" from Thierry Reding:

Contains a couple of fixes and additions to device tree files. The most
notable change is a fix for a misapplied patch that was only exposed by
a recent change in the regulator subsystem that caused USB to break on
Tegra124 recently.

Other than that there are a more or less random assortment of additions
to enable various features on a couple of boards.

* tag 'tegra-for-4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Fix hda2codec_2x clock and reset names
  ARM: tegra: Add Tegra30 HDA support
  ARM: tegra: Cardhu device-tree comment spelling fix
  ARM: tegra: venice2: Set min-/max-microvolt for VDD_LED supply
  ARM: tegra: venice2: Mark eMMC as non-removable
  ARM: tegra: jetson-tk1: Enable HDA support
  ARM: tegra: Add missing HDMI +5V regulator
  ARM: tegra: cardhu: Add power and volume keys
  ARM: tegra: Correct which USB controller has the UTMI pad registers
parents 2cac46a4 869bd180

arch/arm/boot/dts/tegra124-jetson-tk1.dts

+4 −0
Original line number Diff line number Diff line
@@ -1647,6 +1647,10 @@ 
		target-12v-supply = <&vdd_12v0_sata>;

	};



	hda@0,70030000 {

		status = "okay";

	};



	padctl@0,7009f000 {

		pinctrl-0 = <&padctl_default>;

		pinctrl-names = "default";

arch/arm/boot/dts/tegra124-venice2.dts

+3 −0
Original line number Diff line number Diff line
@@ -899,6 +899,7 @@ 
	sdhci@0,700b0600 {

		status = "okay";

		bus-width = <8>;

		non-removable;

	};



	ahub@0,70300000 {
@@ -1040,6 +1041,8 @@ 
			compatible = "regulator-fixed";

			reg = <5>;

			regulator-name = "+VDD_LED";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;

			enable-active-high;

			vin-supply = <&vdd_mux>;

arch/arm/boot/dts/tegra124.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -633,11 +633,11 @@ 
		clocks = <&tegra_car TEGRA124_CLK_HDA>,

		         <&tegra_car TEGRA124_CLK_HDA2HDMI>,

			 <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>;

		clock-names = "hda", "hda2hdmi", "hdacodec_2x";

		clock-names = "hda", "hda2hdmi", "hda2codec_2x";

		resets = <&tegra_car 125>, /* hda */

			 <&tegra_car 128>, /* hda2hdmi */

			 <&tegra_car 111>; /* hda2codec_2x */

		reset-names = "hda", "hda2hdmi", "hdacodec_2x";

		reset-names = "hda", "hda2hdmi", "hda2codec_2x";

		status = "disabled";

	};
@@ -826,7 +826,7 @@ 
			 <&tegra_car TEGRA124_CLK_PLL_U>,

			 <&tegra_car TEGRA124_CLK_USBD>;

		clock-names = "reg", "pll_u", "utmi-pads";

		resets = <&tegra_car 59>, <&tegra_car 22>;

		resets = <&tegra_car 22>, <&tegra_car 22>;

		reset-names = "usb", "utmi-pads";

		nvidia,hssync-start-delay = <0>;

		nvidia,idle-wait-delay = <17>;
@@ -838,6 +838,7 @@ 
		nvidia,hssquelch-level = <2>;

		nvidia,hsdiscon-level = <5>;

		nvidia,xcvr-hsslew = <12>;

		nvidia,has-utmi-pad-registers;

		status = "disabled";

	};
@@ -862,7 +863,7 @@ 
			 <&tegra_car TEGRA124_CLK_PLL_U>,

			 <&tegra_car TEGRA124_CLK_USBD>;

		clock-names = "reg", "pll_u", "utmi-pads";

		resets = <&tegra_car 22>, <&tegra_car 22>;

		resets = <&tegra_car 58>, <&tegra_car 22>;

		reset-names = "usb", "utmi-pads";

		nvidia,hssync-start-delay = <0>;

		nvidia,idle-wait-delay = <17>;
@@ -874,7 +875,6 @@ 
		nvidia,hssquelch-level = <2>;

		nvidia,hsdiscon-level = <5>;

		nvidia,xcvr-hsslew = <12>;

		nvidia,has-utmi-pad-registers;

		status = "disabled";

	};
@@ -899,7 +899,7 @@ 
			 <&tegra_car TEGRA124_CLK_PLL_U>,

			 <&tegra_car TEGRA124_CLK_USBD>;

		clock-names = "reg", "pll_u", "utmi-pads";

		resets = <&tegra_car 58>, <&tegra_car 22>;

		resets = <&tegra_car 59>, <&tegra_car 22>;

		reset-names = "usb", "utmi-pads";

		nvidia,hssync-start-delay = <0>;

		nvidia,idle-wait-delay = <17>;

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

+12 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


			vdd-supply = <&hdmi_vdd_reg>;

			pll-supply = <&hdmi_pll_reg>;

			hdmi-supply = <&vdd_hdmi>;



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

			nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7)
@@ -893,6 +894,17 @@ 
			gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};



		vdd_hdmi: regulator@6 {

			compatible = "regulator-fixed";

			reg = <6>;

			regulator-name = "VDDIO_HDMI";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>;

			enable-active-high;

			vin-supply = <&vdd_5v0_reg>;

		};

	};



	sound {

arch/arm/boot/dts/tegra30-cardhu.dtsi

+29 −1
Original line number Diff line number Diff line 
#include <dt-bindings/input/input.h>

#include "tegra30.dtsi"



/**
@@ -12,7 +13,7 @@ 
 * tegra30-cardhu-a04.dts.

 * The identification of board is done in two ways, by looking the sticker

 * on PCB and by reading board id eeprom.

 * The stciker will have number like 600-81291-1000-002 C.3. In this 4th

 * The sticker will have number like 600-81291-1000-002 C.3. In this 4th

 * number is the fab version like here it is 002 and hence fab version A02.

 * The (downstream internal) U-Boot of Cardhu display the board-id as

 * follows:
@@ -615,4 +616,31 @@ 
			 <&tegra_car TEGRA30_CLK_EXTERN1>;

		clock-names = "pll_a", "pll_a_out0", "mclk";

	};



	gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

			interrupt-parent = <&pmic>;

			interrupts = <2 0>;

			linux,code = <KEY_POWER>;

			debounce-interval = <100>;

			gpio-key,wakeup;

		};



		volume-down {

			label = "Volume Down";

			gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEDOWN>;

			debounce-interval = <10>;

		};



		volume-up {

			label = "Volume Up";

			gpios = <&gpio TEGRA_GPIO(R, 1) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEUP>;

			debounce-interval = <10>;

		};

	};

};