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

Commit 40169a7c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt 

* 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500:
  ARM: ux500: Fix SSP register address format
  ARM: ux500: Apply tc3589x's GPIO/IRQ properties to HREF's DT
  ARM: ux500: Remove redundant #gpio-cell properties from Snowball DT
  ARM: ux500: Add all encompassing sound node to the HREF Device Tree
  ARM: ux500: Add nodes for the MSP into the HREF Device Tree
  ARM: ux500: Add all known I2C sub-device nodes to the HREF DT
  ARM: ux500: Stop registering I2C sub-devices for HREF when DT is enabled
  ARM: ux500: Stop registering Audio devices for HREF when DT is enabled
  ARM: ux500: Add all encompassing sound node to the Snowball Device Tree
  ARM: ux500: Add nodes for the MSP into Device Tree
  ARM: ux500: Rename MSP board file to something more meaningful
  ARM: ux500: Remove platform registration of MSP devices
  ARM: ux500: Stop registering the MOP500 Audio driver from platform code
  ARM: ux500: Pass MSP DMA platform data though AUXDATA
  ARM: ux500: Fork MSP platform registration for step-by-step DT enablement
  ARM: ux500: Add AB8500 CODEC node to DB8500 Device Tree
  ARM: ux500: Clean-up MSP platform code
  ARM: ux500: Pass SDI DMA information though AUX_DATA to MMCI
  ARM: ux500: Add UART support to the HREF Device Tree
  ARM: ux500: Add skeleton Device Tree for the HREF reference board
  ...
  + sync to v3.6-rc6
parents 84bae6c3 c164fa62

Documentation/devicetree/bindings/mfd/ab8500.txt

+15 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Device IRQ Names Supply Names Description 
ab8500-bm                :                      :              : Battery Manager

ab8500-btemp             :                      :              : Battery Temperature

ab8500-charger           :                      :              : Battery Charger

ab8500-codec             :                      :              : Audio Codec

ab8500-fg                :                      :              : Fuel Gauge

ab8500-gpadc             : HW_CONV_END          : vddadc       : Analogue to Digital Converter

                           SW_CONV_END          :              :
@@ -52,6 +53,14 @@ Optional child device properties: 
                           supplied in the interrupts property

- <supply_name>-supply   : contains a phandle to the regulator supply node in Device Tree



Non-standard child device properties:

 - Audio CODEC:

   - stericsson,amic[1|2]-type-single-ended : Single-ended Analoge Mic (default: differential)

   - stericsson,amic1a-bias-vamic2          : Analoge Mic wishes to use a non-standard Vamic

   - stericsson,amic1b-bias-vamic2          : Analoge Mic wishes to use a non-standard Vamic

   - stericsson,amic2-bias-vamic1           : Analoge Mic wishes to use a non-standard Vamic

   - stericsson,earpeice-cmv                : Earpeice voltage (only: 950 | 1100 | 1270 | 1580)



ab8500@5 {

         compatible = "stericsson,ab8500";

         reg = <5>; /* mailbox 5 is i2c */
@@ -110,6 +119,12 @@ ab8500@5 { 
                compatible = "stericsson,ab8500-pwm";

        };



	codec: ab8500-codec {

		compatible = "stericsson,ab8500-codec";



		stericsson,earpeice-cmv = <950>; /* Units in mV. */

	};



        ab8500-regulators {

                compatible = "stericsson,ab8500-regulator";

Documentation/devicetree/bindings/sound/ux500-mop500.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
* MOP500 Audio Machine Driver



This node is responsible for linking together all ux500 Audio Driver components.



Required properties:

 - compatible              : "stericsson,snd-soc-mop500"



Non-standard properties:

 - stericsson,cpu-dai      : Phandle to the CPU-side DAI

 - stericsson,audio-codec  : Phandle to the Audio CODEC

 - stericsson,card-name    : Over-ride default card name



Example:



	sound {

		compatible = "stericsson,snd-soc-mop500";



		stericsson,cpu-dai = <&msp1 &msp3>;

		stericsson,audio-codec = <&codec>;

	};



	msp1: msp@80124000 {

		compatible = "stericsson,ux500-msp-i2s";

		reg = <0x80124000 0x1000>;

		interrupts = <0 62 0x4>;

		v-ape-supply = <&db8500_vape_reg>;

	};



	msp3: msp@80125000 {

		compatible = "stericsson,ux500-msp-i2s";

		reg = <0x80125000 0x1000>;

		interrupts = <0 62 0x4>;

		v-ape-supply = <&db8500_vape_reg>;

	};



	codec: ab8500-codec {

		compatible = "stericsson,ab8500-codec";

		stericsson,earpeice-cmv = <950>; /* Units in mV. */

	};

Documentation/devicetree/bindings/sound/ux500-msp.txt

0 → 100644
+43 −0
Original line number Diff line number Diff line 
* ux500 MSP (CPU-side Digital Audio Interface)



Required properties:

 - compatible       :"stericsson,ux500-msp-i2s"

 - reg              : Physical base address and length of the device's registers.



Optional properties:

 - interrupts       : The interrupt output from the device.

 - interrupt-parent : The parent interrupt controller.

 - <name>-supply    : Phandle to the regulator <name> supply



Example:



	sound {

		compatible = "stericsson,snd-soc-mop500";



		stericsson,platform-pcm-dma = <&pcm>;

		stericsson,cpu-dai = <&msp1 &msp3>;

		stericsson,audio-codec = <&codec>;

	};



	pcm: ux500-pcm {

		compatible = "stericsson,ux500-pcm";

	};



	msp1: msp@80124000 {

		compatible = "stericsson,ux500-msp-i2s";

		reg = <0x80124000 0x1000>;

		interrupts = <0 62 0x4>;

		v-ape-supply = <&db8500_vape_reg>;

	};



	msp3: msp@80125000 {

		compatible = "stericsson,ux500-msp-i2s";

		reg = <0x80125000 0x1000>;

		interrupts = <0 62 0x4>;

		v-ape-supply = <&db8500_vape_reg>;

	};



	codec: ab8500-codec {

		compatible = "stericsson,ab8500-codec";

		stericsson,earpeice-cmv = <950>; /* Units in mV. */

	};

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Supported adapters: 
  * Intel DH89xxCC (PCH)

  * Intel Panther Point (PCH)

  * Intel Lynx Point (PCH)

  * Intel Lynx Point-LP (PCH)

   Datasheets: Publicly available at the Intel website



On Intel Patsburg and later chipsets, both the normal host SMBus controller

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3388,7 +3388,7 @@ M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de> 
L:	linux-i2c@vger.kernel.org

W:	http://i2c.wiki.kernel.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/

T:	git git://git.fluff.org/bjdooks/linux.git

T:	git git://git.pengutronix.de/git/wsa/linux.git

S:	Maintained

F:	Documentation/i2c/

F:	drivers/i2c/