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

Commit 7a5551c7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.7-dt2' of... 

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

ARM: tegra: second round of device tree changes

This branch includes some late device tree changes for Tegra:

A property is added to Whistler's device tree to enable the PMIC to
act as the pm_power_off() implementation.

A number of new device tree are added for boards from Avionic Design.

* tag 'tegra-for-3.7-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support
  ARM: tegra: Add Avionic Design Medcom-Wide support
  ARM: tegra: Add Avionic Design Plutux support
  ARM: tegra: Add Avionic Design Tamonten support
  ARM: tegra: dts: Add pwm label
  ARM: dt: tegra: whistler: configure power off
parents fc0b60ae 175f16fa

arch/arm/boot/dts/tegra20-medcom-wide.dts

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "tegra20-tamonten.dtsi"



/ {

	model = "Avionic Design Medcom-Wide board";

	compatible = "ad,medcom-wide", "ad,tamonten", "nvidia,tegra20";



	i2c@7000c000 {

		wm8903: wm8903@1a {

			compatible = "wlf,wm8903";

			reg = <0x1a>;

			interrupt-parent = <&gpio>;

			interrupts = <187 0x04>;



			gpio-controller;

			#gpio-cells = <2>;



			micdet-cfg = <0>;

			micdet-delay = <100>;

			gpio-cfg = <0xffffffff

				    0xffffffff

				    0

				    0xffffffff

				    0xffffffff>;

		};

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 0 5000000>;



		brightness-levels = <0 4 8 16 32 64 128 255>;

		default-brightness-level = <6>;

	};



	sound {

		compatible = "ad,tegra-audio-wm8903-medcom-wide",

			     "nvidia,tegra-audio-wm8903";

		nvidia,model = "Avionic Design Medcom-Wide";



		nvidia,audio-routing =

			"Headphone Jack", "HPOUTR",

			"Headphone Jack", "HPOUTL",

			"Int Spk", "ROP",

			"Int Spk", "RON",

			"Int Spk", "LOP",

			"Int Spk", "LON",

			"Mic Jack", "MICBIAS",

			"IN1L", "Mic Jack";



		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&wm8903>;



		nvidia,spkr-en-gpios = <&wm8903 2 0>;

		nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */

	};

};

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

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "tegra20-tamonten.dtsi"



/ {

	model = "Avionic Design Plutux board";

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



	i2c@7000c000 {

		wm8903: wm8903@1a {

			compatible = "wlf,wm8903";

			reg = <0x1a>;

			interrupt-parent = <&gpio>;

			interrupts = <187 0x04>;



			gpio-controller;

			#gpio-cells = <2>;



			micdet-cfg = <0>;

			micdet-delay = <100>;

			gpio-cfg = <0xffffffff

				    0xffffffff

				    0

				    0xffffffff

				    0xffffffff>;

		};

	};



	sound {

		compatible = "ad,tegra-audio-plutux",

			     "nvidia,tegra-audio-wm8903";

		nvidia,model = "Avionic Design Plutux";



		nvidia,audio-routing =

			"Headphone Jack", "HPOUTR",

			"Headphone Jack", "HPOUTL",

			"Int Spk", "ROP",

			"Int Spk", "RON",

			"Int Spk", "LOP",

			"Int Spk", "LON",

			"Mic Jack", "MICBIAS",

			"IN1L", "Mic Jack";



		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&wm8903>;



		nvidia,spkr-en-gpios = <&wm8903 2 0>;

		nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */

	};

};

arch/arm/boot/dts/tegra20-tamonten.dtsi

0 → 100644
+449 −0
Original line number Diff line number Diff line 
/include/ "tegra20.dtsi"



/ {

	model = "Avionic Design Tamonten SOM";

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



	memory {

		reg = <0x00000000 0x20000000>;

	};



	pinmux {

		pinctrl-names = "default";

		pinctrl-0 = <&state_default>;



		state_default: pinmux {

			ata {

				nvidia,pins = "ata";

				nvidia,function = "ide";

			};

			atb {

				nvidia,pins = "atb", "gma", "gme";

				nvidia,function = "sdio4";

			};

			atc {

				nvidia,pins = "atc";

				nvidia,function = "nand";

			};

			atd {

				nvidia,pins = "atd", "ate", "gmb", "gmd", "gpu",

					"spia", "spib", "spic";

				nvidia,function = "gmi";

			};

			cdev1 {

				nvidia,pins = "cdev1";

				nvidia,function = "plla_out";

			};

			cdev2 {

				nvidia,pins = "cdev2";

				nvidia,function = "pllp_out4";

			};

			crtp {

				nvidia,pins = "crtp";

				nvidia,function = "crt";

			};

			csus {

				nvidia,pins = "csus";

				nvidia,function = "vi_sensor_clk";

			};

			dap1 {

				nvidia,pins = "dap1";

				nvidia,function = "dap1";

			};

			dap2 {

				nvidia,pins = "dap2";

				nvidia,function = "dap2";

			};

			dap3 {

				nvidia,pins = "dap3";

				nvidia,function = "dap3";

			};

			dap4 {

				nvidia,pins = "dap4";

				nvidia,function = "dap4";

			};

			ddc {

				nvidia,pins = "ddc";

				nvidia,function = "i2c2";

			};

			dta {

				nvidia,pins = "dta", "dtd";

				nvidia,function = "sdio2";

			};

			dtb {

				nvidia,pins = "dtb", "dtc", "dte";

				nvidia,function = "rsvd1";

			};

			dtf {

				nvidia,pins = "dtf";

				nvidia,function = "i2c3";

			};

			gmc {

				nvidia,pins = "gmc";

				nvidia,function = "uartd";

			};

			gpu7 {

				nvidia,pins = "gpu7";

				nvidia,function = "rtck";

			};

			gpv {

				nvidia,pins = "gpv", "slxa", "slxk";

				nvidia,function = "pcie";

			};

			hdint {

				nvidia,pins = "hdint", "pta";

				nvidia,function = "hdmi";

			};

			i2cp {

				nvidia,pins = "i2cp";

				nvidia,function = "i2cp";

			};

			irrx {

				nvidia,pins = "irrx", "irtx";

				nvidia,function = "uarta";

			};

			kbca {

				nvidia,pins = "kbca", "kbcb", "kbcc", "kbcd",

					"kbce", "kbcf";

				nvidia,function = "kbc";

			};

			lcsn {

				nvidia,pins = "lcsn", "ld0", "ld1", "ld2",

					"ld3", "ld4", "ld5", "ld6", "ld7",

					"ld8", "ld9", "ld10", "ld11", "ld12",

					"ld13", "ld14", "ld15", "ld16", "ld17",

					"ldc", "ldi", "lhp0", "lhp1", "lhp2",

					"lhs", "lm0", "lm1", "lpp", "lpw0",

					"lpw1", "lpw2", "lsc0", "lsc1", "lsck",

					"lsda", "lsdi", "lspi", "lvp0", "lvp1",

					"lvs";

				nvidia,function = "displaya";

			};

			owc {

				nvidia,pins = "owc", "spdi", "spdo", "uac";

				nvidia,function = "rsvd2";

			};

			pmc {

				nvidia,pins = "pmc";

				nvidia,function = "pwr_on";

			};

			rm {

				nvidia,pins = "rm";

				nvidia,function = "i2c1";

			};

			sdb {

				nvidia,pins = "sdb", "sdc", "sdd";

				nvidia,function = "pwm";

			};

			sdio1 {

				nvidia,pins = "sdio1";

				nvidia,function = "sdio1";

			};

			slxc {

				nvidia,pins = "slxc", "slxd";

				nvidia,function = "spdif";

			};

			spid {

				nvidia,pins = "spid", "spie", "spif";

				nvidia,function = "spi1";

			};

			spig {

				nvidia,pins = "spig", "spih";

				nvidia,function = "spi2_alt";

			};

			uaa {

				nvidia,pins = "uaa", "uab", "uda";

				nvidia,function = "ulpi";

			};

			uad {

				nvidia,pins = "uad";

				nvidia,function = "irda";

			};

			uca {

				nvidia,pins = "uca", "ucb";

				nvidia,function = "uartc";

			};

			conf_ata {

				nvidia,pins = "ata", "atb", "atc", "atd", "ate",

					"cdev1", "cdev2", "dap1", "dtb", "gma",

					"gmb", "gmc", "gmd", "gme", "gpu7",

					"gpv", "i2cp", "pta", "rm", "slxa",

					"slxk", "spia", "spib", "uac";

				nvidia,pull = <0>;

				nvidia,tristate = <0>;

			};

			conf_ck32 {

				nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",

					"pmcc", "pmcd", "pmce", "xm2c", "xm2d";

				nvidia,pull = <0>;

			};

			conf_csus {

				nvidia,pins = "csus", "spid", "spif";

				nvidia,pull = <1>;

				nvidia,tristate = <1>;

			};

			conf_crtp {

				nvidia,pins = "crtp", "dap2", "dap3", "dap4",

					"dtc", "dte", "dtf", "gpu", "sdio1",

					"slxc", "slxd", "spdi", "spdo", "spig",

					"uda";

				nvidia,pull = <0>;

				nvidia,tristate = <1>;

			};

			conf_ddc {

				nvidia,pins = "ddc", "dta", "dtd", "kbca",

					"kbcb", "kbcc", "kbcd", "kbce", "kbcf",

					"sdc";

				nvidia,pull = <2>;

				nvidia,tristate = <0>;

			};

			conf_hdint {

				nvidia,pins = "hdint", "lcsn", "ldc", "lm1",

					"lpw1", "lsc1", "lsck", "lsda", "lsdi",

					"lvp0", "owc", "sdb";

				nvidia,tristate = <1>;

			};

			conf_irrx {

				nvidia,pins = "irrx", "irtx", "sdd", "spic",

					"spie", "spih", "uaa", "uab", "uad",

					"uca", "ucb";

				nvidia,pull = <2>;

				nvidia,tristate = <1>;

			};

			conf_lc {

				nvidia,pins = "lc", "ls";

				nvidia,pull = <2>;

			};

			conf_ld0 {

				nvidia,pins = "ld0", "ld1", "ld2", "ld3", "ld4",

					"ld5", "ld6", "ld7", "ld8", "ld9",

					"ld10", "ld11", "ld12", "ld13", "ld14",

					"ld15", "ld16", "ld17", "ldi", "lhp0",

					"lhp1", "lhp2", "lhs", "lm0", "lpp",

					"lpw0", "lpw2", "lsc0", "lspi", "lvp1",

					"lvs", "pmc";

				nvidia,tristate = <0>;

			};

			conf_ld17_0 {

				nvidia,pins = "ld17_0", "ld19_18", "ld21_20",

					"ld23_22";

				nvidia,pull = <1>;

			};

		};

	};



	i2s@70002800 {

		status = "okay";

	};



	serial@70006300 {

		clock-frequency = <216000000>;

		status = "okay";

	};



	i2c@7000c000 {

		clock-frequency = <400000>;

		status = "okay";

	};



	i2c@7000d000 {

		clock-frequency = <400000>;

		status = "okay";



		pmic: tps6586x@34 {

			compatible = "ti,tps6586x";

			reg = <0x34>;

			interrupts = <0 86 0x4>;



			ti,system-power-controller;



			#gpio-cells = <2>;

			gpio-controller;



			sys-supply = <&vdd_5v0_reg>;

			vin-sm0-supply = <&sys_reg>;

			vin-sm1-supply = <&sys_reg>;

			vin-sm2-supply = <&sys_reg>;

			vinldo01-supply = <&sm2_reg>;

			vinldo23-supply = <&sm2_reg>;

			vinldo4-supply = <&sm2_reg>;

			vinldo678-supply = <&sm2_reg>;

			vinldo9-supply = <&sm2_reg>;



			regulators {

				#address-cells = <1>;

				#size-cells = <0>;



				sys_reg: regulator@0 {

					reg = <0>;

					regulator-compatible = "sys";

					regulator-name = "vdd_sys";

					regulator-always-on;

				};



				regulator@1 {

					reg = <1>;

					regulator-compatible = "sm0";

					regulator-name = "vdd_sys_sm0,vdd_core";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-always-on;

				};



				regulator@2 {

					reg = <2>;

					regulator-compatible = "sm1";

					regulator-name = "vdd_sys_sm1,vdd_cpu";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

				};



				sm2_reg: regulator@3 {

					reg = <3>;

					regulator-compatible = "sm2";

					regulator-name = "vdd_sys_sm2,vin_ldo*";

					regulator-min-microvolt = <3700000>;

					regulator-max-microvolt = <3700000>;

					regulator-always-on;

				};



				regulator@4 {

					reg = <4>;

					regulator-compatible = "ldo0";

					regulator-name = "vdd_ldo0,vddio_pex_clk";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@5 {

					reg = <5>;

					regulator-compatible = "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";

					regulator-name = "vdd_ldo2,vdd_rtc";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				regulator@7 {

					reg = <7>;

					regulator-compatible = "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";

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

					regulator-name = "vdd_ldo5,vcore_mmc";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

				};



				regulator@10 {

					reg = <10>;

					regulator-compatible = "ldo6";

					regulator-name = "vdd_ldo6,avdd_vdac";

					/*

					 * According to the Tegra 2 Automotive

					 * DataSheet, a typical value for this

					 * would be 2.8V, but the PMIC only

					 * supports 2.85V.

					 */

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

				};



				regulator@11 {

					reg = <11>;

					regulator-compatible = "ldo7";

					regulator-name = "vdd_ldo7,avdd_hdmi";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@12 {

					reg = <12>;

					regulator-compatible = "ldo8";

					regulator-name = "vdd_ldo8,avdd_hdmi_pll";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@13 {

					reg = <13>;

					regulator-compatible = "ldo9";

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

					/*

					 * According to the Tegra 2 Automotive

					 * DataSheet, a typical value for this

					 * would be 2.8V, but the PMIC only

					 * supports 2.85V.

					 */

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@14 {

					reg = <14>;

					regulator-compatible = "ldo_rtc";

					regulator-name = "vdd_rtc_out";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};

			};

		};

	};



	pmc {

		nvidia,invert-interrupt;

	};



	usb@c5008000 {

		status = "okay";

	};



	sdhci@c8000600 {

		cd-gpios = <&gpio 58 0>; /* gpio PH2 */

		wp-gpios = <&gpio 59 0>; /* gpio PH3 */

		bus-width = <4>;

		status = "okay";

	};



	regulators {

		compatible = "simple-bus";



		#address-cells = <1>;

		#size-cells = <0>;



		vdd_5v0_reg: regulator@0 {

			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "vdd_5v0";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			regulator-always-on;

		};

	};

};

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

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "tegra20-tamonten.dtsi"



/ {

	model = "Avionic Design Tamonten Evaluation Carrier";

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



	i2c@7000c000 {

		clock-frequency = <400000>;

		status = "okay";



		wm8903: wm8903@1a {

			compatible = "wlf,wm8903";

			reg = <0x1a>;

			interrupt-parent = <&gpio>;

			interrupts = <187 0x04>;



			gpio-controller;

			#gpio-cells = <2>;



			micdet-cfg = <0>;

			micdet-delay = <100>;

			gpio-cfg = <0xffffffff

				    0xffffffff

				    0

				    0xffffffff

				    0xffffffff>;

		};

	};



	sound {

		compatible = "ad,tegra-audio-wm8903-tec",

			     "nvidia,tegra-audio-wm8903";

		nvidia,model = "Avionic Design TEC";



		nvidia,audio-routing =

			"Headphone Jack", "HPOUTR",

			"Headphone Jack", "HPOUTL",

			"Int Spk", "ROP",

			"Int Spk", "RON",

			"Int Spk", "LOP",

			"Int Spk", "LON",

			"Mic Jack", "MICBIAS",

			"IN1L", "Mic Jack";



		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&wm8903>;



		nvidia,spkr-en-gpios = <&wm8903 2 0>;

		nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */

	};

};

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

+2 −0
Original line number Diff line number Diff line
@@ -267,6 +267,8 @@ 
			reg = <0x3c>;

			interrupts = <0 86 0x4>;



			maxim,system-power-controller;



			mbatt-supply = <&usb0_vbus_reg>;

			in-v1-supply = <&mbatt_reg>;

			in-v2-supply = <&mbatt_reg>;