Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1695834 > unrolled thread

[PATCHv3 0/6] Motorola Droid 4 Audio Support

Back to article view | Back to linux.kernel

Contents

  [PATCHv3 0/6] Motorola Droid 4 Audio Support Sebastian Reichel <sebastian.reichel@collabora.co.uk> - 2017-07-25 17:20 +0200
    [PATCHv3 4/6] ARM: dts: motorola-cpcap-mapphone: add audio-codec Sebastian Reichel <sebastian.reichel@collabora.co.uk> - 2017-07-25 17:20 +0200
    [PATCHv3 2/6] dt-bindings: sound: add motorola,cpcap-audio-codec Sebastian Reichel <sebastian.reichel@collabora.co.uk> - 2017-07-25 17:20 +0200
      Re: [PATCHv3 2/6] dt-bindings: sound: add motorola,cpcap-audio-codec Mark Brown <broonie@kernel.org> - 2017-07-26 13:50 +0200
        Re: [PATCHv3 2/6] dt-bindings: sound: add motorola,cpcap-audio-codec Sebastian Reichel <sebastian.reichel@collabora.co.uk> - 2017-07-27 11:10 +0200
    [PATCHv3 5/6] ARM: dts: motorola-cpcap-mapphone: set initial mode for vaudio Sebastian Reichel <sebastian.reichel@collabora.co.uk> - 2017-07-25 17:20 +0200
    [PATCHv3 1/6] ALSA: pcm: Export soc_dpcm_runtime_update Sebastian Reichel <sebastian.reichel@collabora.co.uk> - 2017-07-25 17:20 +0200
      Re: [PATCHv3 1/6] ALSA: pcm: Export soc_dpcm_runtime_update Takashi Iwai <tiwai@suse.de> - 2017-07-25 17:50 +0200
        Re: [PATCHv3 1/6] ALSA: pcm: Export soc_dpcm_runtime_update Mark Brown <broonie@kernel.org> - 2017-07-26 13:40 +0200
        Re: [PATCHv3 1/6] ALSA: pcm: Export soc_dpcm_runtime_update Sebastian Reichel <sebastian.reichel@collabora.co.uk> - 2017-07-27 12:10 +0200
    [PATCHv3 6/6] ARM: dts: omap4-droid4: add soundcard Sebastian Reichel <sebastian.reichel@collabora.co.uk> - 2017-07-25 17:20 +0200
    Re: [PATCHv3 0/6] Motorola Droid 4 Audio Support Tony Lindgren <tony@atomide.com> - 2017-07-27 14:10 +0200

#1695834 — [PATCHv3 0/6] Motorola Droid 4 Audio Support

Hi,

This adds audio support to Motorola Droid 4.

Tested:
 - Playing via both DACs using Speaker, Earpiece, Headphone
 - Recording using internal Mic
 - Volume Controls

Known not to work:
 - 3.5mm detection support (requires closed source firmware,
   needs further investigation)
 - Modem / Bluetooth Audio (actually untested, but probably
   needs some quirks)

Changes since PATCHv2:
 * Fix a whitespace issue
 * Fix const notes Takashi provided
 * Fix a DAPM route issue I accidently introduced in v2

Changes since PATCHv1:
 * Add patch from Tony exporting soc_dpcm_runtime_update
 * Integrate DT patch for vaudio initial mode
 * Split dt-binding from codec patch and add Ack from Rob
 * Fix CPCAP position in Kconfig/Makefile
 * Avoid "err +=" constructs
 * Simplify reset function
 * Drop cpcap_audio_read/write helpers
 * Do not use tertiary operator for mute register value
 * Update Input Mux logic
 * Switch from simple-audio-card to audio-graph-card

-- Sebastian

Sebastian Reichel (5):
  dt-bindings: sound: add motorola,cpcap-audio-codec
  ASoC: codec: cpcap: new codec
  ARM: dts: motorola-cpcap-mapphone: add audio-codec
  ARM: dts: motorola-cpcap-mapphone: set initial mode for vaudio
  ARM: dts: omap4-droid4: add soundcard

Tony Lindgren (1):
  ALSA: pcm: Export soc_dpcm_runtime_update

 .../bindings/sound/motorola,cpcap-audio-codec.txt  |   19 +
 arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi     |    7 +
 arch/arm/boot/dts/omap4-droid4-xt894.dts           |   84 ++
 sound/soc/codecs/Kconfig                           |    5 +
 sound/soc/codecs/Makefile                          |    2 +
 sound/soc/codecs/cpcap.c                           | 1594 ++++++++++++++++++++
 sound/soc/soc-pcm.c                                |    2 +
 7 files changed, 1713 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/motorola,cpcap-audio-codec.txt
 create mode 100644 sound/soc/codecs/cpcap.c

-- 
2.13.2

[toc] | [next] | [standalone]

#1695835 — [PATCHv3 4/6] ARM: dts: motorola-cpcap-mapphone: add audio-codec

Add node for audio-codec to its DT file.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
 arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
index 1eb5da1dc8f0..86033aee8a29 100644
--- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
+++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
@@ -68,6 +68,12 @@
 			};
 		};
 
+		cpcap_audio: audio-codec {
+			#sound-dai-cells = <1>;
+			compatible = "motorola,cpcap-audio-codec";
+			vdd-supply = <&vaudio>;
+		};
+
 		cpcap_rtc: rtc {
 			compatible = "motorola,cpcap-rtc";
 
-- 
2.13.2

[toc] | [prev] | [next] | [standalone]

#1695837 — [PATCHv3 2/6] dt-bindings: sound: add motorola,cpcap-audio-codec

Motorola CPCAP is a PMIC with audio functionality, that can be
found on Motorola Droid 4 and probably a few other phones from
Motorola's Droid series.

This adds the DT binding for the codec sub-module found inside
the PMIC.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
 .../bindings/sound/motorola,cpcap-audio-codec.txt     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/motorola,cpcap-audio-codec.txt

diff --git a/Documentation/devicetree/bindings/sound/motorola,cpcap-audio-codec.txt b/Documentation/devicetree/bindings/sound/motorola,cpcap-audio-codec.txt
new file mode 100644
index 000000000000..6b8cd616bd46
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/motorola,cpcap-audio-codec.txt
@@ -0,0 +1,19 @@
+Motorola CPCAP audio CODEC
+--------------------------
+
+This module is part of the CPCAP. For more details about the whole
+chip see Documentation/devicetree/bindings/mfd/motorola-cpcap.txt.
+
+Required properties:
+
+  - compatible : "motorola,cpcap-audio-codec"
+  - vdd-supply : Phandle to audio regulator
+
+Example:
+
+&cpcap {
+	audio-codec {
+		compatible = "motorola,cpcap-audio-codec";
+		vdd-supply = <&vaudio>;
+	};
+};
-- 
2.13.2

[toc] | [prev] | [next] | [standalone]

#1697013 — Re: [PATCHv3 2/6] dt-bindings: sound: add motorola,cpcap-audio-codec

[Multipart message — attachments visible in raw view] — view raw

On Tue, Jul 25, 2017 at 05:10:26PM +0200, Sebastian Reichel wrote:
> Motorola CPCAP is a PMIC with audio functionality, that can be
> found on Motorola Droid 4 and probably a few other phones from
> Motorola's Droid series.

Please submit patches using subject lines reflecting the style for the
subsystem.  This makes it easier for people to identify relevant
patches.  Look at what existing commits in the area you're changing are
doing and make sure your subject lines visually resemble what they're
doing.

> +&cpcap {
> +	audio-codec {
> +		compatible = "motorola,cpcap-audio-codec";
> +		vdd-supply = <&vaudio>;
> +	};
> +};

I'd expect supplies (especially generically named supplies like this) to
be looked up at the chip level - aside from my general concerns with MFD
subnodes like this in the case of supplies it's especially problematic
as it makes it harder to do the generic chip level hookup in the DT and
it precludes other parts of the chip using the same supply (which seems
especially likely with a generically named supply like this).

[toc] | [prev] | [next] | [standalone]

#1697827 — Re: [PATCHv3 2/6] dt-bindings: sound: add motorola,cpcap-audio-codec

[Multipart message — attachments visible in raw view] — view raw

Hi,

On Wed, Jul 26, 2017 at 12:48:28PM +0100, Mark Brown wrote:
> On Tue, Jul 25, 2017 at 05:10:26PM +0200, Sebastian Reichel wrote:
> > Motorola CPCAP is a PMIC with audio functionality, that can be
> > found on Motorola Droid 4 and probably a few other phones from
> > Motorola's Droid series.
> 
> Please submit patches using subject lines reflecting the style for the
> subsystem.  This makes it easier for people to identify relevant
> patches.  Look at what existing commits in the area you're changing are
> doing and make sure your subject lines visually resemble what they're
> doing.

Right, I did not notice, that ASoC does not follow general
"dt-bindings: <subsys>:" DT bindings subject style. How
do Rob and Mark find them?

> > +&cpcap {
> > +	audio-codec {
> > +		compatible = "motorola,cpcap-audio-codec";
> > +		vdd-supply = <&vaudio>;
> > +	};
> > +};
> 
> I'd expect supplies (especially generically named supplies like this) to
> be looked up at the chip level - aside from my general concerns with MFD
> subnodes like this in the case of supplies it's especially problematic
> as it makes it harder to do the generic chip level hookup in the DT and
> it precludes other parts of the chip using the same supply (which seems
> especially likely with a generically named supply like this).

I don't follow you here. Why can't other parts of the chip use the
same supply? Regarding the other point: Handling the audio-codec
differently than all other sub-modules of cpcap seems much more
problematic to me and the codec is basically the last one
missing:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi

-- Sebastian

[toc] | [prev] | [next] | [standalone]

#1695838 — [PATCHv3 5/6] ARM: dts: motorola-cpcap-mapphone: set initial mode for vaudio

Set default mode for vaudio, which may be left in standby mode
if the system is booted via kexec from Android.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
 arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
index 86033aee8a29..7c6d61fb5cf2 100644
--- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
+++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
@@ -261,5 +261,6 @@
 		regulator-min-microvolt = <2775000>;
 		regulator-max-microvolt = <2775000>;
 		regulator-enable-ramp-delay = <1000>;
+		regulator-initial-mode = <0x00>; /* NORMAL */
 	};
 };
-- 
2.13.2

[toc] | [prev] | [next] | [standalone]

#1695839 — [PATCHv3 1/6] ALSA: pcm: Export soc_dpcm_runtime_update

From: Tony Lindgren <tony@atomide.com>

Some codecs may need to use this from loadable modules. Without
this patch compilation for this kind of codec will fail with the
following error:

ERROR: "soc_dpcm_runtime_update" [sound/soc/codecs/snd-soc-cpcap.ko]
undefined!

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
 sound/soc/soc-pcm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index dcc5ece08668..4de7d86ea6fb 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2539,6 +2539,8 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card)
 	mutex_unlock(&card->mutex);
 	return 0;
 }
+EXPORT_SYMBOL_GPL(soc_dpcm_runtime_update);
+
 int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute)
 {
 	struct snd_soc_dpcm *dpcm;
-- 
2.13.2

[toc] | [prev] | [next] | [standalone]

#1695877 — Re: [PATCHv3 1/6] ALSA: pcm: Export soc_dpcm_runtime_update

On Tue, 25 Jul 2017 17:10:25 +0200,
Sebastian Reichel wrote:
> 
> From: Tony Lindgren <tony@atomide.com>
> 
> Some codecs may need to use this from loadable modules. Without
> this patch compilation for this kind of codec will fail with the
> following error:
> 
> ERROR: "soc_dpcm_runtime_update" [sound/soc/codecs/snd-soc-cpcap.ko]
> undefined!
> 
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

If you do export the function, please make its comments prettier, so
that it appears in kernel documentation properly as an API function.

Also, in general, we use snd_ prefix for the exported stuff.
You'd need to rename it accordingly, too.

Last but not least, this is specific to ASoC, so use "ASoC" prefix to
the subject line.


thanks,

Takashi

> ---
>  sound/soc/soc-pcm.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
> index dcc5ece08668..4de7d86ea6fb 100644
> --- a/sound/soc/soc-pcm.c
> +++ b/sound/soc/soc-pcm.c
> @@ -2539,6 +2539,8 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card)
>  	mutex_unlock(&card->mutex);
>  	return 0;
>  }
> +EXPORT_SYMBOL_GPL(soc_dpcm_runtime_update);
> +
>  int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute)
>  {
>  	struct snd_soc_dpcm *dpcm;
> -- 
> 2.13.2
> 
> 

[toc] | [prev] | [next] | [standalone]

#1697003 — Re: [PATCHv3 1/6] ALSA: pcm: Export soc_dpcm_runtime_update

[Multipart message — attachments visible in raw view] — view raw

On Tue, Jul 25, 2017 at 05:42:59PM +0200, Takashi Iwai wrote:

> Last but not least, this is specific to ASoC, so use "ASoC" prefix to
> the subject line.

Right, that's a good way to get the patch skipped in review :(

[toc] | [prev] | [next] | [standalone]

#1697862 — Re: [PATCHv3 1/6] ALSA: pcm: Export soc_dpcm_runtime_update

[Multipart message — attachments visible in raw view] — view raw

Hi,

On Tue, Jul 25, 2017 at 05:42:59PM +0200, Takashi Iwai wrote:
> On Tue, 25 Jul 2017 17:10:25 +0200,
> Sebastian Reichel wrote:
> > Some codecs may need to use this from loadable modules. Without
> > this patch compilation for this kind of codec will fail with the
> > following error:
> > 
> > ERROR: "soc_dpcm_runtime_update" [sound/soc/codecs/snd-soc-cpcap.ko]
> > undefined!
> > 
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
> 
> If you do export the function, please make its comments prettier, so
> that it appears in kernel documentation properly as an API function.
> 
> Also, in general, we use snd_ prefix for the exported stuff.
> You'd need to rename it accordingly, too.
> 
> Last but not least, this is specific to ASoC, so use "ASoC" prefix to
> the subject line.

After fixing this locally I noticed, that I no longer need to call
soc_dpcm_runtime_update at all and it can remain private. So this
patch will be dropped in v4.

-- Sebastian

[toc] | [prev] | [next] | [standalone]

#1695840 — [PATCHv3 6/6] ARM: dts: omap4-droid4: add soundcard

Add sound support to Motorola Droid 4 using simple-soundcard
and CPCAP's audio codec. This does not yet correctly represent
the whole audio routing, since McBSP3 is also connected to
Bluetooth and MDM6600 modem (and probably also 4G modem).
These extra DAI links are not yet supported and have not been
tested.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
 arch/arm/boot/dts/omap4-droid4-xt894.dts | 84 ++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index 10ca1c174995..a182f9fb1c7a 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -116,6 +116,26 @@
 
 		};
 	};
+
+	soundcard {
+		compatible = "audio-graph-card";
+		label = "Droid 4 Audio";
+
+		simple-graph-card,widgets =
+			"Speaker", "Earpiece",
+			"Speaker", "Loudspeaker",
+			"Headphone", "Headphone Jack",
+			"Microphone", "Internal Mic";
+
+		simple-graph-card,routing =
+			"Earpiece", "EP",
+			"Loudspeaker", "SPKR",
+			"Headphone Jack", "HSL",
+			"Headphone Jack", "HSR",
+			"MICR", "Internal Mic";
+
+		dais = <&mcbsp2_port>, <&mcbsp3_port>;
+	};
 };
 
 &dss {
@@ -479,6 +499,24 @@
 		OMAP4_IOPAD(0x112, PIN_OUTPUT_PULLUP | MUX_MODE5)	/* uart4_rts */
 		>;
 	};
+
+	mcbsp2_pins: pinmux_mcbsp2_pins {
+		pinctrl-single,pins = <
+		OMAP4_IOPAD(0x0f6, PIN_INPUT | MUX_MODE0)	/* abe_mcbsp2_clkx */
+		OMAP4_IOPAD(0x0f8, PIN_INPUT | MUX_MODE0)	/* abe_mcbsp2_dr */
+		OMAP4_IOPAD(0x0fa, PIN_OUTPUT | MUX_MODE0)	/* abe_mcbsp2_dx */
+		OMAP4_IOPAD(0x0fc, PIN_INPUT | MUX_MODE0)	/* abe_mcbsp2_fsx */
+		>;
+	};
+
+	mcbsp3_pins: pinmux_mcbsp3_pins {
+		pinctrl-single,pins = <
+		OMAP4_IOPAD(0x106, PIN_INPUT | MUX_MODE1)	/* abe_mcbsp3_dr */
+		OMAP4_IOPAD(0x108, PIN_OUTPUT | MUX_MODE1)	/* abe_mcbsp3_dx */
+		OMAP4_IOPAD(0x10a, PIN_INPUT | MUX_MODE1)	/* abe_mcbsp3_clkx */
+		OMAP4_IOPAD(0x10c, PIN_INPUT | MUX_MODE1)	/* abe_mcbsp3_fsx */
+		>;
+	};
 };
 
 &omap4_pmx_wkup {
@@ -552,3 +590,49 @@
 				  "0", "0", "1";
 	};
 };
+
+&mcbsp2 {
+	#sound-dai-cells = <0>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcbsp2_pins>;
+	status = "okay";
+
+	mcbsp2_port: port {
+		cpu_dai2: endpoint {
+			dai-format = "i2s";
+			remote-endpoint = <&cpcap_audio_codec0>;
+			frame-master = <&cpcap_audio_codec0>;
+			bitclock-master = <&cpcap_audio_codec0>;
+		};
+	};
+};
+
+&mcbsp3 {
+	#sound-dai-cells = <0>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcbsp3_pins>;
+	status = "okay";
+
+	mcbsp3_port: port {
+		cpu_dai3: endpoint {
+			dai-format = "dsp_a";
+			frame-master = <&cpcap_audio_codec1>;
+			bitclock-master = <&cpcap_audio_codec1>;
+			remote-endpoint = <&cpcap_audio_codec1>;
+		};
+	};
+};
+
+&cpcap_audio {
+	port@0 {
+		cpcap_audio_codec0: endpoint {
+			remote-endpoint = <&cpu_dai2>;
+		};
+	};
+
+	port@1 {
+		cpcap_audio_codec1: endpoint {
+			remote-endpoint = <&cpu_dai3>;
+		};
+	};
+};
-- 
2.13.2

[toc] | [prev] | [next] | [standalone]

#1697923

* Sebastian Reichel <sebastian.reichel@collabora.co.uk> [170725 08:11]:
> Hi,
> 
> This adds audio support to Motorola Droid 4.
> 
> Tested:
>  - Playing via both DACs using Speaker, Earpiece, Headphone
>  - Recording using internal Mic
>  - Volume Controls
> 
> Known not to work:
>  - 3.5mm detection support (requires closed source firmware,
>    needs further investigation)
>  - Modem / Bluetooth Audio (actually untested, but probably
>    needs some quirks)
> 
> Changes since PATCHv2:
>  * Fix a whitespace issue
>  * Fix const notes Takashi provided
>  * Fix a DAPM route issue I accidently introduced in v2

Audio works for me after applying the cpcap-regulator fixes
and with the dts kobject ref fix I posted earlier today:

Tested-by: Tony Lindgren <tony@atomide.com>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web