Commit 6f821c64 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/nuc900', 'asoc/topic/omap',... 

Merge remote-tracking branches 'asoc/topic/nuc900', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/rt5640' and 'asoc/topic/rt5645' into asoc-next
parents 6630f30e 49e3c641 0596f700 b4528141 e6b0d896 57f174f4 8c325704

Documentation/devicetree/bindings/sound/nokia,rx51.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
* Nokia N900 audio setup



Required properties:

- compatible: Should contain "nokia,n900-audio"

- nokia,cpu-dai: phandle for the McBSP node

- nokia,audio-codec: phandles for the main TLV320AIC3X node and the

                     auxiliary TLV320AIC3X node (in this order)

- nokia,headphone-amplifier: phandle for the TPA6130A2 node

- tvout-selection-gpios: GPIO for tvout selection

- jack-detection-gpios: GPIO for jack detection

- eci-switch-gpios: GPIO for ECI (Enhancement Control Interface) switch

- speaker-amplifier-gpios: GPIO for speaker amplifier



Example:



sound {

	compatible = "nokia,n900-audio";



	nokia,cpu-dai = <&mcbsp2>;

	nokia,audio-codec = <&tlv320aic3x>, <&tlv320aic3x_aux>;

	nokia,headphone-amplifier = <&tpa6130a2>;



	tvout-selection-gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>; /* 40 */

	jack-detection-gpios = <&gpio6 17 GPIO_ACTIVE_HIGH>; /* 177 */

	eci-switch-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* 182 */

	speaker-amplifier-gpios = <&twl_gpio 7 GPIO_ACTIVE_HIGH>;

};

Documentation/devicetree/bindings/sound/rt5640.txt

+8 −5
Original line number Diff line number Diff line 
RT5640 audio CODEC

RT5640/RT5639 audio CODEC



This device supports I2C only.



Required properties:



- compatible : "realtek,rt5640".

- compatible : One of "realtek,rt5640" or "realtek,rt5639".



- reg : The I2C address of the device.
@@ -18,7 +18,7 @@ Optional properties: 


- realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin.



Pins on the device (for linking into audio routes):

Pins on the device (for linking into audio routes) for RT5639/RT5640:



  * DMIC1

  * DMIC2
@@ -31,13 +31,16 @@ Pins on the device (for linking into audio routes): 
  * HPOR

  * LOUTL

  * LOUTR

  * MONOP

  * MONON

  * SPOLP

  * SPOLN

  * SPORP

  * SPORN



Additional pins on the device for RT5640:



  * MONOP

  * MONON



Example:



rt5640 {

arch/arm/boot/dts/r8a7790.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ 
			renesas,clock-indices = <

				R8A7790_CLK_TMU1 R8A7790_CLK_TMU3 R8A7790_CLK_TMU2

				R8A7790_CLK_CMT0 R8A7790_CLK_TMU0 R8A7790_CLK_VSP1_DU1

				R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_RT R8A7790_CLK_VSP1_SY

				R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_R R8A7790_CLK_VSP1_S

			>;

			clock-output-names =

				"tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",

arch/arm/boot/dts/r8a7791.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ 
			renesas,clock-indices = <

				R8A7791_CLK_TMU1 R8A7791_CLK_TMU3 R8A7791_CLK_TMU2

				R8A7791_CLK_CMT0 R8A7791_CLK_TMU0 R8A7791_CLK_VSP1_DU1

				R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_SY

				R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_S

			>;

			clock-output-names =

				"tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",

arch/arm/mach-shmobile/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o 
obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s72100.o



# Clock objects

ifndef CONFIG_COMMON_CLK

obj-y				+= clock.o

ifndef CONFIG_COMMON_CLK

obj-$(CONFIG_ARCH_SH7372)	+= clock-sh7372.o

obj-$(CONFIG_ARCH_SH73A0)	+= clock-sh73a0.o

obj-$(CONFIG_ARCH_R8A73A4)	+= clock-r8a73a4.o