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

Commit 4c908776 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/rt5645', 'asoc/topic/rt5670',...

Merge remote-tracking branches 'asoc/topic/rt5645', 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic/samsung' and 'asoc/topic/sgtl5000' into asoc-next
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
Audio Binding for Arndale boards

Required properties:
- compatible : Can be the following,
			"samsung,arndale-rt5631"

- samsung,audio-cpu: The phandle of the Samsung I2S controller
- samsung,audio-codec: The phandle of the audio codec

Optional:
- samsung,model: The name of the sound-card

Arndale Boards has many audio daughter cards, one of them is
rt5631/alc5631. Below example shows audio bindings for rt5631/
alc5631 based codec.

Example:

sound {
		compatible = "samsung,arndale-rt5631";

		samsung,audio-cpu = <&i2s0>
		samsung,audio-codec = <&rt5631>;
};
+17 −0
Original line number Diff line number Diff line
@@ -27,6 +27,21 @@ Optional properties:
  Boolean. Indicate MIC1/2 input and LOUT1/2/3 outputs are differential,
  rather than single-ended.

- realtek,gpio-config
  Array of six 8bit elements that configures GPIO.
    0 - floating (reset value)
    1 - pull down
    2 - pull up

- realtek,jd1-gpio
  Configures GPIO Mic Jack detection 1.
  Select 0 ~ 3 as OFF, GPIO1, GPIO2 and GPIO3 respectively.

- realtek,jd2-gpio
- realtek,jd3-gpio
  Configures GPIO Mic Jack detection 2 and 3.
  Select 0 ~ 3 as OFF, GPIO4, GPIO5 and GPIO6 respectively.

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

  * IN1P
@@ -56,4 +71,6 @@ rt5677 {
	realtek,pow-ldo2-gpio =
		<&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_HIGH>;
	realtek,in1-differential = "true";
	realtek,gpio-config = /bits/ 8  <0 0 0 0 0 2>;   /* pull up GPIO6 */
	realtek,jd2-gpio = <3>;  /* Enables Jack detection for GPIO6 */
};
+11 −4
Original line number Diff line number Diff line
@@ -6,10 +6,17 @@ Required SoC Specific Properties:
   - samsung,s3c6410-i2s: for 8/16/24bit stereo I2S.
   - samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with
     secondary fifo, s/w reset control and internal mux for root clk src.
   - samsung,exynos5420-i2s: for 8/16/24bit multichannel(7.1) I2S with
     secondary fifo, s/w reset control, internal mux for root clk src and
     TDM support. TDM (Time division multiplexing) is to allow transfer of
     multiple channel audio data on single data line.
   - samsung,exynos5420-i2s: for 8/16/24bit multichannel(5.1) I2S for
     playback, sterio channel capture, secondary fifo using internal
     or external dma, s/w reset control, internal mux for root clk src
     and 7.1 channel TDM support for playback. TDM (Time division multiplexing)
     is to allow transfer of multiple channel audio data on single data line.
   - samsung,exynos7-i2s: with all the available features of exynos5 i2s,
     exynos7 I2S has 7.1 channel TDM support for capture, secondary fifo
     with only external dma and more no.of root clk sampling frequencies.
   - samsung,exynos7-i2s1: I2S1 on previous samsung platforms supports
     stereo channels. exynos7 i2s1 upgraded to 5.1 multichannel with
     slightly modified bit offsets.

- reg: physical base address of the controller and length of memory mapped
  region.
+13 −0
Original line number Diff line number Diff line
@@ -7,6 +7,17 @@ Required properties:

- clocks : the clock provider of SYS_MCLK

- micbias-resistor-k-ohms : the bias resistor to be used in kOmhs
	The resistor can take values of 2k, 4k or 8k.
	If set to 0 it will be off.
	If this node is not mentioned or if the value is unknown, then
	micbias	resistor is set to 4K.

- micbias-voltage-m-volts : the bias voltage to be used in mVolts
	The voltage can take values from 1.25V to 3V by 250mV steps
	If this node is not mentionned or the value is unknown, then
	the value is set to 1.25V.

- VDDA-supply : the regulator provider of VDDA

- VDDIO-supply: the regulator provider of VDDIO
@@ -21,6 +32,8 @@ codec: sgtl5000@0a {
	compatible = "fsl,sgtl5000";
	reg = <0x0a>;
	clocks = <&clks 150>;
	micbias-resistor-k-ohms = <2>;
	micbias-voltage-m-volts = <2250>;
	VDDA-supply = <&reg_3p3v>;
	VDDIO-supply = <&reg_3p3v>;
};
+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ struct samsung_i2s {
#define QUIRK_NO_MUXPSR		(1 << 2)
#define QUIRK_NEED_RSTCLR	(1 << 3)
#define QUIRK_SUPPORTS_TDM	(1 << 4)
#define QUIRK_SUPPORTS_IDMA	(1 << 5)
	/* Quirks of the I2S controller */
	u32 quirks;
	dma_addr_t idma_addr;
Loading