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

Commit 3eb52a06 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

ARM: tegra: Devicetree changes for v4.4-rc1

Mostly a bunch of updates to the Toradex Apalis and Colibri platforms
along with a couple of cleanup patches.

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

: (25 commits)
  ARM: tegra: Use consistent indentation for SATA node
  ARM: tegra: colibri-eval: Fix power/wakeup key
  ARM: tegra: colibri-eval: Add comment concerning SD/MMC
  ARM: tegra: colibri-eval: Fix vendor string of M41T0M6 RTC
  ARM: tegra: colibri: Properly align pin names
  ARM: tegra: colibri: Replace eMMC label by comment
  ARM: tegra: colibri: Activate STMPE811 touch controller
  ARM: tegra: colibri: Add touch pen interrupt pin muxing
  ARM: tegra: colibri: Fix comment about 3v3 fixed supply
  ARM: tegra: colibri: Add pin muxing for on-module power I2C
  ARM: tegra: colibri: Improve comment about thermal alert pin
  ARM: tegra: colibri: Fix HDMI supplies
  ARM: tegra: colibri: Update hardware revisions compatibility
  ARM: tegra: apalis-eval: Fix power/wakeup key
  ARM: tegra: apalis-eval: Fix backlight PWM comment
  ARM: tegra: apalis-eval: Set OTG dr_mode
  ARM: tegra: apalis-eval: Enable HDA controller
  ARM: tegra: apalis: Properly align pin names
  ARM: tegra: apalis: Add digital audio pin muxing
  ARM: tegra: apalis: Add comment concerning eMMC
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 41adfe82 481b4f1a

arch/arm/boot/dts/tegra124-nyan.dtsi

+14 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ 
				vin-ldo9-10-supply = <&vdd_5v0_sys>;

				vin-ldo11-supply = <&vdd_3v3_run>;



				sd0 {

				vdd_cpu: sd0 {

					regulator-name = "+VDD_CPU_AP";

					regulator-min-microvolt = <700000>;

					regulator-max-microvolt = <1350000>;
@@ -397,6 +397,13 @@ 
		non-removable;

	};



	/* CPU DFLL clock */

	clock@0,70110000 {

		status = "okay";

		vdd-cpu-supply = <&vdd_cpu>;

		nvidia,i2c-fs-rate = <400000>;

	};



	ahub@0,70300000 {

		i2s@0,70301100 {

			status = "okay";
@@ -487,6 +494,12 @@ 
		};

	};



	cpus {

		cpu@0 {

			vdd-cpu-supply = <&vdd_cpu>;

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

arch/arm/boot/dts/tegra124.dtsi

+7 −13
Original line number Diff line number Diff line
@@ -608,26 +608,20 @@ 


	sata@0,70020000 {

		compatible = "nvidia,tegra124-ahci";



		reg = <0x0 0x70027000 0x0 0x2000>, /* AHCI */

		      <0x0 0x70020000 0x0 0x7000>; /* SATA */



		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;



		clocks = <&tegra_car TEGRA124_CLK_SATA>,

			 <&tegra_car TEGRA124_CLK_SATA_OOB>,

			 <&tegra_car TEGRA124_CLK_CML1>,

			 <&tegra_car TEGRA124_CLK_PLL_E>;

		clock-names = "sata", "sata-oob", "cml1", "pll_e";



		resets = <&tegra_car 124>,

			 <&tegra_car 123>,

			 <&tegra_car 129>;

		reset-names = "sata", "sata-oob", "sata-cold";



		phys = <&padctl TEGRA_XUSB_PADCTL_SATA>;

		phy-names = "sata-phy";



		status = "disabled";

	};

arch/arm/boot/dts/tegra30-apalis-eval.dts

+9 −4
Original line number Diff line number Diff line
@@ -126,6 +126,10 @@ 
		};

	};



	hda@70030000 {

		status = "okay";

	};



	sd1: sdhci@78000000 {

		status = "okay";

		bus-width = <4>;
@@ -149,6 +153,7 @@ 


	usb-phy@7d000000 {

		status = "okay";

		dr_mode = "otg";

		vbus-supply = <&usbo1_vbus_reg>;

	};
@@ -175,7 +180,7 @@ 
	backlight: backlight {

		compatible = "pwm-backlight";



		/* PWM0 */

		/* PWM_BKL1 */

		pwms = <&pwm 0 5000000>;

		brightness-levels = <255 231 223 207 191 159 127 0>;

		default-brightness-level = <6>;
@@ -186,10 +191,10 @@ 
	gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

		wakeup {

			label = "WAKE1_MICO";

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

			linux,code = <KEY_POWER>;

			linux,code = <KEY_WAKEUP>;

			debounce-interval = <10>;

			gpio-key,wakeup;

		};

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

+131 −83
Original line number Diff line number Diff line 
#include "tegra30.dtsi"



/*

 * Toradex Apalis T30 Device Tree

 * Compatible for Revisions 1GB: V1.0A; 2GB: V1.0B, V1.0C

 * Toradex Apalis T30 Module Device Tree

 * Compatible for Revisions 1GB: V1.0A, V1.1A; 1GB IT: V1.1A;

 * 2GB: V1.0B, V1.0C, V1.0E, V1.1A

 */

/ {

	model = "Toradex Apalis T30";
@@ -33,8 +34,8 @@ 


	host1x@50000000 {

		hdmi@54280000 {

			vdd-supply = <&sys_3v3_reg>;

			pll-supply = <&vio_reg>;

			vdd-supply = <&avdd_hdmi_3v3_reg>;

			pll-supply = <&avdd_hdmi_pll_1v8_reg>;



			nvidia,hpd-gpio =

				<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
@@ -65,7 +66,7 @@ 
			/* BKL1_PWM_EN#, disable TPS65911 PMIC PWM backlight */

			uart3_cts_n_pa1 {

				nvidia,pins = "uart3_cts_n_pa1";

				nvidia,function = "rsvd1";

				nvidia,function = "rsvd2";

				nvidia,pull = <TEGRA_PIN_PULL_UP>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

			};
@@ -108,6 +109,30 @@ 
				nvidia,enable-input = <TEGRA_PIN_ENABLE>;

			};



			/* Apalis Digital Audio */

			clk1_req_pee2 {

				nvidia,pins = "clk1_req_pee2";

				nvidia,function = "hda";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

			};

			clk2_out_pw5 {

				nvidia,pins = "clk2_out_pw5";

				nvidia,function = "extperiph2";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

				nvidia,enable-input = <TEGRA_PIN_DISABLE>;

			};

			dap1_fs_pn0 {

				nvidia,pins = "dap1_fs_pn0",

					      "dap1_din_pn1",

					      "dap1_dout_pn2",

					      "dap1_sclk_pn3";

				nvidia,function = "hda";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

			};



			/* Apalis I2C3 */

			cam_i2c_scl_pbb1 {

				nvidia,pins = "cam_i2c_scl_pbb1",
@@ -151,32 +176,32 @@ 
			};



			/* Apalis PWM1 */

			gpio_pu6 {

				nvidia,pins =	"gpio_pu6";

			pu6 {

				nvidia,pins = "pu6";

				nvidia,function = "pwm3";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

			};



			/* Apalis PWM2 */

			gpio_pu5 {

				nvidia,pins =	"gpio_pu5";

			pu5 {

				nvidia,pins = "pu5";

				nvidia,function = "pwm2";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

			};



			/* Apalis PWM3 */

			gpio_pu4 {

				nvidia,pins =	"gpio_pu4";

			pu4 {

				nvidia,pins = "pu4";

				nvidia,function = "pwm1";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;

			};



			/* Apalis PWM4 */

			gpio_pu3 {

				nvidia,pins =	"gpio_pu3";

			pu3 {

				nvidia,pins = "pu3";

				nvidia,function = "pwm0";

				nvidia,pull = <TEGRA_PIN_PULL_NONE>;

				nvidia,tristate = <TEGRA_PIN_DISABLE>;
@@ -635,6 +660,7 @@ 
		nvidia,sys-clock-req-active-high;

	};



	/* eMMC */

	sdhci@78000600 {

		status = "okay";

		bus-width = <8>;
@@ -666,18 +692,40 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		sys_3v3_reg: regulator@100 {

		avdd_hdmi_pll_1v8_reg: regulator@100 {

			compatible = "regulator-fixed";

			reg = <100>;

			regulator-name = "+V1.8_AVDD_HDMI_PLL";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			enable-active-high;

			gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;

			vin-supply = <&vio_reg>;

		};



		sys_3v3_reg: regulator@101 {

			compatible = "regulator-fixed";

			reg = <101>;

			regulator-name = "3v3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

		};



		charge_pump_5v0_reg: regulator@101 {

		avdd_hdmi_3v3_reg: regulator@102 {

			compatible = "regulator-fixed";

			reg = <101>;

			reg = <102>;

			regulator-name = "+V3.3_AVDD_HDMI";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			enable-active-high;

			gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;

			vin-supply = <&sys_3v3_reg>;

		};



		charge_pump_5v0_reg: regulator@103 {

			compatible = "regulator-fixed";

			reg = <103>;

			regulator-name = "5v0";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

arch/arm/boot/dts/tegra30-colibri-eval-v3.dts

+5 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 


		/* M41T0M6 real time clock on carrier board */

		rtc@68 {

			compatible = "stm,m41t00";

			compatible = "st,m41t00";

			reg = <0x68>;

		};

	};
@@ -84,6 +84,7 @@ 
		};

	};



	/* SD/MMC */

	sdhci@78000200 {

		status = "okay";

		bus-width = <4>;
@@ -136,10 +137,10 @@ 
	gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

		wakeup {

			label = "SODIMM pin 45 wakeup";

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

			linux,code = <KEY_POWER>;

			linux,code = <KEY_WAKEUP>;

			debounce-interval = <10>;

			gpio-key,wakeup;

		};