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

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

Merge branch 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt 

* 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6: (7 commits)
  ARM: dts: imx6q-sabrelite: add vmmc-supply for usdhc
  ARM: dts: imx6q-arm2: add vmmc-supply for usdhc
  ARM: dts: imx51-babbage: update mc13892 device
  ARM: dts: imx6q-sabrelite: add sgtl5000 audio codec
  ARM: dts: imx6q-sabrelite: add 2p5v and 3p3v regulators
  ARM i.MX5/6: Add dt support for generic boards
  ARM: imx5: generate dtbs for imx5 boards

(update to Linux 3.3-rc5)
parents fdc24d4b 6f6ea937

MAINTAINERS

+3 −6
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ S: Orphan 
F:	drivers/platform/x86/wmi.c



AD1889 ALSA SOUND DRIVER

M:	Kyle McMartin <kyle@mcmartin.ca>

M:	Thibaut Varene <T-Bone@parisc-linux.org>

W:	http://wiki.parisc-linux.org/AD1889

L:	linux-parisc@vger.kernel.org
@@ -3047,7 +3046,6 @@ F: drivers/hwspinlock/hwspinlock_* 
F:	include/linux/hwspinlock.h



HARMONY SOUND DRIVER

M:	Kyle McMartin <kyle@mcmartin.ca>

L:	linux-parisc@vger.kernel.org

S:	Maintained

F:	sound/parisc/harmony.*
@@ -5000,9 +4998,8 @@ F: Documentation/blockdev/paride.txt 
F:	drivers/block/paride/



PARISC ARCHITECTURE

M:	Kyle McMartin <kyle@mcmartin.ca>

M:	Helge Deller <deller@gmx.de>

M:	"James E.J. Bottomley" <jejb@parisc-linux.org>

M:	Helge Deller <deller@gmx.de>

L:	linux-parisc@vger.kernel.org

W:	http://www.parisc-linux.org/

Q:	http://patchwork.kernel.org/project/linux-parisc/list/
@@ -5861,7 +5858,7 @@ S: Maintained 
F:	drivers/mmc/host/sdhci-spear.c



SECURITY SUBSYSTEM

M:	James Morris <jmorris@namei.org>

M:	James Morris <james.l.morris@oracle.com>

L:	linux-security-module@vger.kernel.org (suggested Cc:)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git

W:	http://security.wiki.kernel.org/
@@ -5874,7 +5871,7 @@ S: Supported 


SELINUX SECURITY MODULE

M:	Stephen Smalley <sds@tycho.nsa.gov>

M:	James Morris <jmorris@namei.org>

M:	James Morris <james.l.morris@oracle.com>

M:	Eric Paris <eparis@parisplace.org>

L:	selinux@tycho.nsa.gov (subscribers-only, general discussion)

W:	http://selinuxproject.org

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/boot/dts/imx51-babbage.dts

+89 −2
Original line number Diff line number Diff line
@@ -56,8 +56,95 @@ 
						compatible = "fsl,mc13892";

						spi-max-frequency = <6000000>;

						reg = <0>;

						mc13xxx-irq-gpios = <&gpio1 8 0>;

						fsl,mc13xxx-uses-regulator;

						interrupt-parent = <&gpio1>;

						interrupts = <8>;



						regulators {

							sw1_reg: sw1 {

								regulator-min-microvolt = <600000>;

								regulator-max-microvolt = <1375000>;

								regulator-boot-on;

								regulator-always-on;

							};



							sw2_reg: sw2 {

								regulator-min-microvolt = <900000>;

								regulator-max-microvolt = <1850000>;

								regulator-boot-on;

								regulator-always-on;

							};



							sw3_reg: sw3 {

								regulator-min-microvolt = <1100000>;

								regulator-max-microvolt = <1850000>;

								regulator-boot-on;

								regulator-always-on;

							};



							sw4_reg: sw4 {

								regulator-min-microvolt = <1100000>;

								regulator-max-microvolt = <1850000>;

								regulator-boot-on;

								regulator-always-on;

							};



							vpll_reg: vpll {

								regulator-min-microvolt = <1050000>;

								regulator-max-microvolt = <1800000>;

								regulator-boot-on;

								regulator-always-on;

							};



							vdig_reg: vdig {

								regulator-min-microvolt = <1650000>;

								regulator-max-microvolt = <1650000>;

								regulator-boot-on;

							};



							vsd_reg: vsd {

								regulator-min-microvolt = <1800000>;

								regulator-max-microvolt = <3150000>;

							};



							vusb2_reg: vusb2 {

								regulator-min-microvolt = <2400000>;

								regulator-max-microvolt = <2775000>;

								regulator-boot-on;

								regulator-always-on;

							};



							vvideo_reg: vvideo {

								regulator-min-microvolt = <2775000>;

								regulator-max-microvolt = <2775000>;

							};



							vaudio_reg: vaudio {

								regulator-min-microvolt = <2300000>;

								regulator-max-microvolt = <3000000>;

							};



							vcam_reg: vcam {

								regulator-min-microvolt = <2500000>;

								regulator-max-microvolt = <3000000>;

							};



							vgen1_reg: vgen1 {

								regulator-min-microvolt = <1200000>;

								regulator-max-microvolt = <1200000>;

							};



							vgen2_reg: vgen2 {

								regulator-min-microvolt = <1200000>;

								regulator-max-microvolt = <3150000>;

								regulator-always-on;

							};



							vgen3_reg: vgen3 {

								regulator-min-microvolt = <1800000>;

								regulator-max-microvolt = <2900000>;

								regulator-always-on;

							};

						};

					};



					flash: at45db321d@1 {

arch/arm/boot/dts/imx6q-arm2.dts

+14 −0
Original line number Diff line number Diff line
@@ -36,11 +36,13 @@ 
			usdhc@02198000 { /* uSDHC3 */

				cd-gpios = <&gpio6 11 0>;

				wp-gpios = <&gpio6 14 0>;

				vmmc-supply = <&reg_3p3v>;

				status = "okay";

			};



			usdhc@0219c000 { /* uSDHC4 */

				fsl,card-wired;

				vmmc-supply = <&reg_3p3v>;

				status = "okay";

			};
@@ -50,6 +52,18 @@ 
		};

	};



	regulators {

		compatible = "simple-bus";



		reg_3p3v: 3p3v {

			compatible = "regulator-fixed";

			regulator-name = "3P3V";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

		};

	};



	leds {

		compatible = "gpio-leds";

arch/arm/boot/dts/imx6q-sabrelite.dts

+34 −0
Original line number Diff line number Diff line
@@ -32,18 +32,52 @@ 
			usdhc@02198000 { /* uSDHC3 */

				cd-gpios = <&gpio7 0 0>;

				wp-gpios = <&gpio7 1 0>;

				vmmc-supply = <&reg_3p3v>;

				status = "okay";

			};



			usdhc@0219c000 { /* uSDHC4 */

				cd-gpios = <&gpio2 6 0>;

				wp-gpios = <&gpio2 7 0>;

				vmmc-supply = <&reg_3p3v>;

				status = "okay";

			};



			uart2: uart@021e8000 {

				status = "okay";

			};



			i2c@021a0000 { /* I2C1 */

				status = "okay";

				clock-frequency = <100000>;



				codec: sgtl5000@0a {

					compatible = "fsl,sgtl5000";

					reg = <0x0a>;

					VDDA-supply = <&reg_2p5v>;

					VDDIO-supply = <&reg_3p3v>;

				};

			};

		};

	};



	regulators {

		compatible = "simple-bus";



		reg_2p5v: 2p5v {

			compatible = "regulator-fixed";

			regulator-name = "2P5V";

			regulator-min-microvolt = <2500000>;

			regulator-max-microvolt = <2500000>;

			regulator-always-on;

		};



		reg_3p3v: 3p3v {

			compatible = "regulator-fixed";

			regulator-name = "3P3V";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

		};

	};

};