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

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

Merge branch 'for-3.5/dt2' of... 

Merge branch 'for-3.5/dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into for-next

Stephen Warren <swarren@wwwdotorg.org> writes:
  This branch is based on the merge of the following branches from the
  Tegra repo, which are all already pulled into arm-soc:

  for-3.5/tegra30-audio
  for-3.5/usb-ulpi
  for-3.5/dt
  ... which are all based on for-3.5/gpio-pinmux

* 'for-3.5/dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra

:
  ARM: dt: tegra: invert status=disable vs status=okay
  ARM: dt: tegra: consistent basic property ordering
  ARM: dt: tegra: sort nodes based on bus order
  ARM: dt: tegra: remove duplicate device_type property
  ARM: dt: tegra: consistenly use lower-case for hex constants
  ARM: dt: tegra: format regs properties consistently
  ARM: dt: tegra: gpio comment cleanup
  ARM: dt: tegra: remove unnecessary unit addresses
  ARM: dt: tegra: whitespace cleanup
  ARM: dt: tegra cardhu: fix typo in SDHCI node name
  ARM: dt: tegra: cardhu: register core regulator tps62361
  ARM: dt: tegra30.dtsi: Add SMMU node
  ARM: dt: tegra20.dtsi: Add GART node
  ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes
  ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes
  ARM: dt: tegra: Add device tree support for AHB

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 304ea747 2a5fdc9a

Documentation/devicetree/bindings/usb/tegra-usb.txt

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ Required properties : 
 - nvidia,vbus-gpio : If present, specifies a gpio that needs to be

   activated for the bus to be powered.



Required properties for phy_type == ulpi:

  - nvidia,phy-reset-gpio : The GPIO used to reset the PHY.



Optional properties:

  - dr_mode : dual role mode. Indicates the working mode for

   nvidia,tegra20-ehci compatible controllers.  Can be "host", "peripheral",

arch/arm/boot/dts/tegra-cardhu.dts

+74 −26
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
		reg = <0x80000000 0x40000000>;

	};



	pinmux@70000000 {

	pinmux {

		pinctrl-names = "default";

		pinctrl-0 = <&state_default>;
@@ -51,38 +51,35 @@ 
				nvidia,pull = <2>;

				nvidia,tristate = <0>;

			};

			dap2_fs_pa2 {

				nvidia,pins =	"dap2_fs_pa2",

						"dap2_sclk_pa3",

						"dap2_din_pa4",

						"dap2_dout_pa5";

				nvidia,function = "i2s1";

				nvidia,pull = <0>;

				nvidia,tristate = <0>;

			};

		};

	};



	serial@70006000 {

		status = "okay";

		clock-frequency = <408000000>;

	};



	serial@70006040 {

		status = "disable";

	};



	serial@70006200 {

		status = "disable";

	};



	serial@70006300 {

		status = "disable";

	};



	serial@70006400 {

		status = "disable";

	};



	i2c@7000c000 {

		status = "okay";

		clock-frequency = <100000>;

	};



	i2c@7000c400 {

		status = "okay";

		clock-frequency = <100000>;

	};



	i2c@7000c500 {

		status = "okay";

		clock-frequency = <100000>;



		/* ALS and Proximity sensor */
@@ -95,28 +92,79 @@ 
	};



	i2c@7000c700 {

		status = "okay";

		clock-frequency = <100000>;

	};



	i2c@7000d000 {

		status = "okay";

		clock-frequency = <100000>;



		wm8903: wm8903@1a {

			compatible = "wlf,wm8903";

			reg = <0x1a>;

			interrupt-parent = <&gpio>;

			interrupts = <179 0x04>; /* gpio PW3 */



			gpio-controller;

			#gpio-cells = <2>;



			micdet-cfg = <0>;

			micdet-delay = <100>;

			gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;

		};



		tps62361 {

			compatible = "ti,tps62361";

			reg = <0x60>;



			regulator-name = "tps62361-vout";

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1500000>;

			regulator-boot-on;

			regulator-always-on;

			ti,vsel0-state-high;

			ti,vsel1-state-high;

		};

	};



	ahub {

		i2s@70080400 {

			status = "okay";

		};

	};



	sdhci@78000000 {

		status = "okay";

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

		wp-gpios = <&gpio 155 0>; /* gpio PT3 */

		power-gpios = <&gpio 31 0>; /* gpio PD7 */

	};



	sdhci@78000200 {

		status = "disable";

	sdhci@78000600 {

		status = "okay";

		support-8bit;

	};



	sdhci@78000400 {

		status = "disable";

	};

	sound {

		compatible = "nvidia,tegra-audio-wm8903-cardhu",

			     "nvidia,tegra-audio-wm8903";

		nvidia,model = "NVIDIA Tegra Cardhu";



	sdhci@78000400 {

		support-8bit;

		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/tegra-harmony.dts

+56 −60
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
	model = "NVIDIA Tegra2 Harmony evaluation board";

	compatible = "nvidia,harmony", "nvidia,tegra20";



	memory@0 {

	memory {

		reg = <0x00000000 0x40000000>;

	};



	pinmux@70000000 {

	pinmux {

		pinctrl-names = "default";

		pinctrl-0 = <&state_default>;
@@ -167,28 +167,28 @@ 
			};

			conf_ata {

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

					"cdev1", "dap1", "dtb", "gma", "gmb",

					"gmc", "gmd", "gme", "gpu7", "gpv",

					"i2cp", "pta", "rm", "slxa", "slxk",

					"spia", "spib";

					"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_cdev2 {

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

				nvidia,pull = <1>;

				nvidia,tristate = <1>;

			};

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

					"uac", "uda";

					"uda";

				nvidia,pull = <0>;

				nvidia,tristate = <1>;

			};
@@ -234,11 +234,17 @@ 
		};

	};



	pmc@7000f400 {

		nvidia,invert-interrupt;

	i2s@70002800 {

		status = "okay";

	};



	serial@70006300 {

		status = "okay";

		clock-frequency = <216000000>;

	};



	i2c@7000c000 {

		status = "okay";

		clock-frequency = <400000>;



		wm8903: wm8903@1a {
@@ -257,19 +263,50 @@ 
	};



	i2c@7000c400 {

		status = "okay";

		clock-frequency = <400000>;

	};



	i2c@7000c500 {

		status = "okay";

		clock-frequency = <400000>;

	};



	i2c@7000d000 {

		status = "okay";

		clock-frequency = <400000>;

	};



	i2s@70002a00 {

		status = "disable";

	pmc {

		nvidia,invert-interrupt;

	};



	usb@c5000000 {

		status = "okay";

	};



	usb@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */

	};



	usb@c5008000 {

		status = "okay";

	};



	sdhci@c8000200 {

		status = "okay";

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

		wp-gpios = <&gpio 57 0>; /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

	};



	sdhci@c8000600 {

		status = "okay";

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

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

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

		support-8bit;

	};



	sound {
@@ -295,45 +332,4 @@ 
		nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */

		nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */

	};



	serial@70006000 {

		status = "disable";

	};



	serial@70006040 {

		status = "disable";

	};



	serial@70006200 {

		status = "disable";

	};



	serial@70006300 {

		clock-frequency = < 216000000 >;

	};



	serial@70006400 {

		status = "disable";

	};



	sdhci@c8000000 {

		status = "disable";

	};



	sdhci@c8000200 {

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

		wp-gpios = <&gpio 57 0>; /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

	};



	sdhci@c8000400 {

		status = "disable";

	};



	sdhci@c8000600 {

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

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

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

		support-8bit;

	};

};

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

+59 −67
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
	model = "Toshiba AC100 / Dynabook AZ";

	compatible = "compal,paz00", "nvidia,tegra20";



	memory@0 {

	memory {

		reg = <0x00000000 0x20000000>;

	};



	pinmux@70000000 {

	pinmux {

		pinctrl-names = "default";

		pinctrl-0 = <&state_default>;
@@ -159,18 +159,14 @@ 
			};

			conf_ata {

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

					"cdev1", "dap1", "dap2", "dtf", "gma",

					"gmb", "gmc", "gmd", "gme", "gpu",

					"gpu7", "gpv", "i2cp", "pta", "rm",

					"sdio1", "slxk", "spdo", "uac", "uda";

					"cdev1", "cdev2", "dap1", "dap2", "dtf",

					"gma", "gmb", "gmc", "gmd", "gme",

					"gpu", "gpu7", "gpv", "i2cp", "pta",

					"rm", "sdio1", "slxk", "spdo", "uac",

					"uda";

				nvidia,pull = <0>;

				nvidia,tristate = <0>;

			};

			conf_cdev2 {

				nvidia,pins = "cdev2";

				nvidia,pull = <1>;

				nvidia,tristate = <0>;

			};

			conf_ck32 {

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

					"pmcc", "pmcd", "pmce", "xm2c", "xm2d";
@@ -230,7 +226,22 @@ 
		};

	};



	i2s@70002800 {

		status = "okay";

	};



	serial@70006000 {

		status = "okay";

		clock-frequency = <216000000>;

	};



	serial@70006200 {

		status = "okay";

		clock-frequency = <216000000>;

	};



	i2c@7000c000 {

		status = "okay";

		clock-frequency = <400000>;



		alc5632: alc5632@1e {
@@ -242,25 +253,23 @@ 
	};



	i2c@7000c400 {

		status = "okay";

		clock-frequency = <400000>;

	};



	i2c@7000c500 {

		status = "disable";

	};



	nvec@7000c500 {

		#address-cells = <1>;

		#size-cells = <0>;

	nvec {

		compatible = "nvidia,nvec";

		reg = <0x7000C500 0x100>;

		reg = <0x7000c500 0x100>;

		interrupts = <0 92 0x04>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-frequency = <80000>;

		request-gpios = <&gpio 170 0>;

		request-gpios = <&gpio 170 0>; /* gpio PV2 */

		slave-addr = <138>;

	};



	i2c@7000d000 {

		status = "okay";

		clock-frequency = <400000>;



		adt7461@4c {
@@ -269,65 +278,28 @@ 
		};

	};



	i2s@70002a00 {

		status = "disable";

	};



	sound {

		compatible = "nvidia,tegra-audio-alc5632-paz00",

			"nvidia,tegra-audio-alc5632";



		nvidia,model = "Compal PAZ00";



		nvidia,audio-routing =

			"Int Spk", "SPKOUT",

			"Int Spk", "SPKOUTN",

			"Headset Mic", "MICBIAS1",

			"MIC1", "Headset Mic",

			"Headset Stereophone", "HPR",

			"Headset Stereophone", "HPL",

			"DMICDAT", "Digital Mic";



		nvidia,audio-codec = <&alc5632>;

		nvidia,i2s-controller = <&tegra_i2s1>;

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

	};



	serial@70006000 {

		clock-frequency = <216000000>;

	};



	serial@70006040 {

		status = "disable";

	usb@c5000000 {

		status = "okay";

	};



	serial@70006200 {

		clock-frequency = <216000000>;

	};



	serial@70006300 {

		status = "disable";

	usb@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */

	};



	serial@70006400 {

		status = "disable";

	usb@c5008000 {

		status = "okay";

	};



	sdhci@c8000000 {

		status = "okay";

		cd-gpios = <&gpio 173 0>; /* gpio PV5 */

		wp-gpios = <&gpio 57 0>;  /* gpio PH1 */

		power-gpios = <&gpio 169 0>; /* gpio PV1 */

	};



	sdhci@c8000200 {

		status = "disable";

	};



	sdhci@c8000400 {

		status = "disable";

	};



	sdhci@c8000600 {

		status = "okay";

		support-8bit;

	};
@@ -347,8 +319,28 @@ 


		wifi {

			label = "wifi-led";

			gpios = <&gpio 24 0>;

			gpios = <&gpio 24 0>; /* gpio PD0 */

			linux,default-trigger = "rfkill0";

		};

	};



	sound {

		compatible = "nvidia,tegra-audio-alc5632-paz00",

			"nvidia,tegra-audio-alc5632";



		nvidia,model = "Compal PAZ00";



		nvidia,audio-routing =

			"Int Spk", "SPKOUT",

			"Int Spk", "SPKOUTN",

			"Headset Mic", "MICBIAS1",

			"MIC1", "Headset Mic",

			"Headset Stereophone", "HPR",

			"Headset Stereophone", "HPL",

			"DMICDAT", "Digital Mic";



		nvidia,audio-codec = <&alc5632>;

		nvidia,i2s-controller = <&tegra_i2s1>;

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

	};

};

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

+83 −91
Original line number Diff line number Diff line
@@ -7,11 +7,10 @@ 
	compatible = "nvidia,seaboard", "nvidia,tegra20";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x40000000>;

	};



	pinmux@70000000 {

	pinmux {

		pinctrl-names = "default";

		pinctrl-0 = <&state_default>;
@@ -258,7 +257,17 @@ 
		};

	};



	i2s@70002800 {

		status = "okay";

	};



	serial@70006300 {

		status = "okay";

		clock-frequency = <216000000>;

	};



	i2c@7000c000 {

		status = "okay";

		clock-frequency = <400000>;



		wm8903: wm8903@1a {
@@ -292,6 +301,7 @@ 
	};



	i2c@7000c400 {

		status = "okay";

		clock-frequency = <100000>;



		smart-battery@b {
@@ -303,10 +313,12 @@ 
	};



	i2c@7000c500 {

		status = "okay";

		clock-frequency = <400000>;

	};



	i2c@7000d000 {

		status = "okay";

		clock-frequency = <400000>;



		temperature-sensor@4c {
@@ -322,75 +334,71 @@ 
		};

	};



	i2s@70002a00 {

		status = "disable";

	};



	sound {

		compatible = "nvidia,tegra-audio-wm8903-seaboard",

			     "nvidia,tegra-audio-wm8903";

		nvidia,model = "NVIDIA Tegra Seaboard";



		nvidia,audio-routing =

			"Headphone Jack", "HPOUTR",

			"Headphone Jack", "HPOUTL",

			"Int Spk", "ROP",

			"Int Spk", "RON",

			"Int Spk", "LOP",

			"Int Spk", "LON",

			"Mic Jack", "MICBIAS",

			"IN1R", "Mic Jack";



		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&wm8903>;



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

		nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */

	};



	serial@70006000 {

		status = "disable";

	};



	serial@70006040 {

		status = "disable";

	emc {

		emc-table@190000 {

			reg = <190000>;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = <190000>;

			nvidia,emc-registers = <0x0000000c 0x00000026

				0x00000009 0x00000003 0x00000004 0x00000004

				0x00000002 0x0000000c 0x00000003 0x00000003

				0x00000002 0x00000001 0x00000004 0x00000005

				0x00000004 0x00000009 0x0000000d 0x0000059f

				0x00000000 0x00000003 0x00000003 0x00000003

				0x00000003 0x00000001 0x0000000b 0x000000c8

				0x00000003 0x00000007 0x00000004 0x0000000f

				0x00000002 0x00000000 0x00000000 0x00000002

				0x00000000 0x00000000 0x00000083 0xa06204ae

				0x007dc010 0x00000000 0x00000000 0x00000000

				0x00000000 0x00000000 0x00000000 0x00000000>;

		};



	serial@70006200 {

		status = "disable";

		emc-table@380000 {

			reg = <380000>;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = <380000>;

			nvidia,emc-registers = <0x00000017 0x0000004b

				0x00000012 0x00000006 0x00000004 0x00000005

				0x00000003 0x0000000c 0x00000006 0x00000006

				0x00000003 0x00000001 0x00000004 0x00000005

				0x00000004 0x00000009 0x0000000d 0x00000b5f

				0x00000000 0x00000003 0x00000003 0x00000006

				0x00000006 0x00000001 0x00000011 0x000000c8

				0x00000003 0x0000000e 0x00000007 0x0000000f

				0x00000002 0x00000000 0x00000000 0x00000002

				0x00000000 0x00000000 0x00000083 0xe044048b

				0x007d8010 0x00000000 0x00000000 0x00000000

				0x00000000 0x00000000 0x00000000 0x00000000>;

		};



	serial@70006300 {

		clock-frequency = < 216000000 >;

	};



	serial@70006400 {

		status = "disable";

	usb@c5000000 {

		status = "okay";

		nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */

		dr_mode = "otg";

	};



	sdhci@c8000000 {

		status = "disable";

	usb@c5004000 {

		status = "okay";

		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */

	};



	sdhci@c8000200 {

		status = "disable";

	usb@c5008000 {

		status = "okay";

	};



	sdhci@c8000400 {

		status = "okay";

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

		wp-gpios = <&gpio 57 0>; /* gpio PH1 */

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

	};



	sdhci@c8000600 {

		status = "okay";

		support-8bit;

	};



	usb@c5000000 {

		nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */

		dr_mode = "otg";

	};



	gpio-keys {

		compatible = "gpio-keys";
@@ -411,41 +419,25 @@ 
		};

	};



	emc@7000f400 {

		emc-table@190000 {

			reg = < 190000 >;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = < 190000 >;

			nvidia,emc-registers = < 0x0000000c 0x00000026

				0x00000009 0x00000003 0x00000004 0x00000004

				0x00000002 0x0000000c 0x00000003 0x00000003

				0x00000002 0x00000001 0x00000004 0x00000005

				0x00000004 0x00000009 0x0000000d 0x0000059f

				0x00000000 0x00000003 0x00000003 0x00000003

				0x00000003 0x00000001 0x0000000b 0x000000c8

				0x00000003 0x00000007 0x00000004 0x0000000f

				0x00000002 0x00000000 0x00000000 0x00000002

				0x00000000 0x00000000 0x00000083 0xa06204ae

				0x007dc010 0x00000000 0x00000000 0x00000000

				0x00000000 0x00000000 0x00000000 0x00000000 >;

		};

	sound {

		compatible = "nvidia,tegra-audio-wm8903-seaboard",

			     "nvidia,tegra-audio-wm8903";

		nvidia,model = "NVIDIA Tegra Seaboard";



		emc-table@380000 {

			reg = < 380000 >;

			compatible = "nvidia,tegra20-emc-table";

			clock-frequency = < 380000 >;

			nvidia,emc-registers = < 0x00000017 0x0000004b

				0x00000012 0x00000006 0x00000004 0x00000005

				0x00000003 0x0000000c 0x00000006 0x00000006

				0x00000003 0x00000001 0x00000004 0x00000005

				0x00000004 0x00000009 0x0000000d 0x00000b5f

				0x00000000 0x00000003 0x00000003 0x00000006

				0x00000006 0x00000001 0x00000011 0x000000c8

				0x00000003 0x0000000e 0x00000007 0x0000000f

				0x00000002 0x00000000 0x00000000 0x00000002

				0x00000000 0x00000000 0x00000083 0xe044048b

				0x007d8010 0x00000000 0x00000000 0x00000000

				0x00000000 0x00000000 0x00000000 0x00000000 >;

		};

		nvidia,audio-routing =

			"Headphone Jack", "HPOUTR",

			"Headphone Jack", "HPOUTL",

			"Int Spk", "ROP",

			"Int Spk", "RON",

			"Int Spk", "LOP",

			"Int Spk", "LON",

			"Mic Jack", "MICBIAS",

			"IN1R", "Mic Jack";



		nvidia,i2s-controller = <&tegra_i2s1>;

		nvidia,audio-codec = <&wm8903>;



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

		nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */

	};

};