[PATCH 0/2] ARM: DTS: am437x-sk-evm: Use simple-card for audio support

[PATCH 0/2] ARM: DTS: am437x-sk-evm: Use simple-card for audio support

[Peter Ujfalusi]

Hi,

There is no reason to use the davinci-evm machine driver's compatible for audio
support since the setup is simple and the common simple-audio-card can handle it
just fine.
Also add McASP1 sleep pin configuration.

Regards,
Peter
---
Peter Ujfalusi (2):
  ARM: DTS: am437x-sk-evm: Add sleep pin settings for mcasp1
  ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio
    support

 arch/arm/boot/dts/am437x-sk-evm.dts | 42 +++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 9 deletions(-)

-- 
2.4.5

[PATCH 1/2] ARM: DTS: am437x-sk-evm: Add sleep pin settings for mcasp1

[Peter Ujfalusi]

When McASP is not in use the pins can be put to sleep mode to conserve
power.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/boot/dts/am437x-sk-evm.dts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index c17097d2c167..b5de6b0d622c 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -364,6 +364,15 @@
 		>;
 	};
 
+	mcasp1_pins_sleep: mcasp1_pins_sleep {
+		pinctrl-single,pins = <
+			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+			0x108 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+		>;
+	};
+
 	lcd_pins: lcd_pins {
 		pinctrl-single,pins = <
 			0x1c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpcm_ad7.gpio1_7 */
@@ -640,8 +649,9 @@
 };
 
 &mcasp1 {
-	pinctrl-names = "default";
+	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&mcasp1_pins>;
+	pinctrl-1 = <&mcasp1_pins_sleep>;
 
 	status = "okay";
 
-- 
2.4.5

[PATCH 2/2] ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio support

[Peter Ujfalusi]

The sound support consist only Headset output on the board and can be
handled by "simple-audio-card"

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/boot/dts/am437x-sk-evm.dts | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index b5de6b0d622c..e09216cb14df 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -32,14 +32,26 @@
 	};
 
 	sound {
-		compatible = "ti,da830-evm-audio";
-		ti,model = "AM437x-SK-EVM";
-		ti,audio-codec = <&tlv320aic3106>;
-		ti,mcasp-controller = <&mcasp1>;
-		ti,codec-clock-rate = <24000000>;
-		ti,audio-routing =
-			"Headphone Jack",       "HPLOUT",
-			"Headphone Jack",       "HPROUT";
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "AM437x-SK-EVM";
+		simple-audio-card,widgets =
+			"Headphone", "Headphone Jack";
+		simple-audio-card,routing =
+			"Headphone Jack",	"HPLOUT",
+			"Headphone Jack",	"HPROUT";
+		simple-audio-card,format = "dsp_b";
+		simple-audio-card,bitclock-master = <&sound_master>;
+		simple-audio-card,frame-master = <&sound_master>;
+		simple-audio-card,bitclock-inversion;
+
+		simple-audio-card,cpu {
+			sound-dai = <&mcasp1>;
+		};
+
+		sound_master: simple-audio-card,codec {
+			sound-dai = <&tlv320aic3106>;
+			system-clock-frequency = <24000000>;
+		};
 	};
 
 	matrix_keypad: matrix_keypad at 0 {
@@ -489,6 +501,7 @@
 	};
 
 	tlv320aic3106: tlv320aic3106 at 1b {
+		#sound-dai-cells = <0>;
 		compatible = "ti,tlv320aic3106";
 		reg = <0x1b>;
 		status = "okay";
@@ -649,6 +662,7 @@
 };
 
 &mcasp1 {
+	#sound-dai-cells = <0>;
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&mcasp1_pins>;
 	pinctrl-1 = <&mcasp1_pins_sleep>;
-- 
2.4.5

[PATCH 0/2] ARM: DTS: am437x-sk-evm: Use simple-card for audio support

[Felipe Balbi]

Hi,

On Thu, Jul 02, 2015 at 02:58:04PM +0300, Peter Ujfalusi wrote:
> Hi,
> 
> There is no reason to use the davinci-evm machine driver's compatible for audio
> support since the setup is simple and the common simple-audio-card can handle it
> just fine.
> Also add McASP1 sleep pin configuration.
> 
> Regards,
> Peter
> ---
> Peter Ujfalusi (2):
>   ARM: DTS: am437x-sk-evm: Add sleep pin settings for mcasp1
>   ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio
>     support

you should add a patch enabling CONFIG_SND_SIMPLE_CARD=m in
omap2plus_defconfig

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150702/7317d566/attachment.sig>

[PATCH 1/2] ARM: DTS: am437x-sk-evm: Add sleep pin settings for mcasp1

[Felipe Balbi]

On Thu, Jul 02, 2015 at 02:58:05PM +0300, Peter Ujfalusi wrote:
> When McASP is not in use the pins can be put to sleep mode to conserve
> power.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Tested-by: Felipe Balbi <balbi@ti.com>

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150702/d9d6d8f7/attachment.sig>

[PATCH 2/2] ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio support

[Felipe Balbi]

On Thu, Jul 02, 2015 at 02:58:06PM +0300, Peter Ujfalusi wrote:
> The sound support consist only Headset output on the board and can be
> handled by "simple-audio-card"
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Still works fine:

Tested-by: Felipe Balbi <balbi@ti.com>

one question though, should Line In be listed below ? Also, unrelated to
$subject, but if I wait for a few seconds between runs of speaker-test
(iow, if I allow mcasp to idle) then I hear a slight chopping sound when
starting, perhaps we're unmuting too early ?

> ---
>  arch/arm/boot/dts/am437x-sk-evm.dts | 30 ++++++++++++++++++++++--------
>  1 file changed, 22 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
> index b5de6b0d622c..e09216cb14df 100644
> --- a/arch/arm/boot/dts/am437x-sk-evm.dts
> +++ b/arch/arm/boot/dts/am437x-sk-evm.dts
> @@ -32,14 +32,26 @@
>  	};
>  
>  	sound {
> -		compatible = "ti,da830-evm-audio";
> -		ti,model = "AM437x-SK-EVM";
> -		ti,audio-codec = <&tlv320aic3106>;
> -		ti,mcasp-controller = <&mcasp1>;
> -		ti,codec-clock-rate = <24000000>;
> -		ti,audio-routing =
> -			"Headphone Jack",       "HPLOUT",
> -			"Headphone Jack",       "HPROUT";
> +		compatible = "simple-audio-card";
> +		simple-audio-card,name = "AM437x-SK-EVM";
> +		simple-audio-card,widgets =
> +			"Headphone", "Headphone Jack";
> +		simple-audio-card,routing =
> +			"Headphone Jack",	"HPLOUT",
> +			"Headphone Jack",	"HPROUT";
> +		simple-audio-card,format = "dsp_b";
> +		simple-audio-card,bitclock-master = <&sound_master>;
> +		simple-audio-card,frame-master = <&sound_master>;
> +		simple-audio-card,bitclock-inversion;
> +
> +		simple-audio-card,cpu {
> +			sound-dai = <&mcasp1>;
> +		};
> +
> +		sound_master: simple-audio-card,codec {
> +			sound-dai = <&tlv320aic3106>;
> +			system-clock-frequency = <24000000>;
> +		};
>  	};
>  
>  	matrix_keypad: matrix_keypad at 0 {
> @@ -489,6 +501,7 @@
>  	};
>  
>  	tlv320aic3106: tlv320aic3106 at 1b {
> +		#sound-dai-cells = <0>;
>  		compatible = "ti,tlv320aic3106";
>  		reg = <0x1b>;
>  		status = "okay";
> @@ -649,6 +662,7 @@
>  };
>  
>  &mcasp1 {
> +	#sound-dai-cells = <0>;
>  	pinctrl-names = "default", "sleep";
>  	pinctrl-0 = <&mcasp1_pins>;
>  	pinctrl-1 = <&mcasp1_pins_sleep>;
> -- 
> 2.4.5
> 

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150702/c4158e81/attachment-0001.sig>

[PATCH 2/2] ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio support

[Peter Ujfalusi]

On 07/02/2015 03:23 PM, Felipe Balbi wrote:
> On Thu, Jul 02, 2015 at 02:58:06PM +0300, Peter Ujfalusi wrote:
>> The sound support consist only Headset output on the board and can be
>> handled by "simple-audio-card"
>>
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> 
> Still works fine:
> 
> Tested-by: Felipe Balbi <balbi@ti.com>
> 
> one question though, should Line In be listed below ?

Does the board have Line-in? I don't have the board, but I know this patch
works on it ;)
We only had playback path before also.

> Also, unrelated to
> $subject, but if I wait for a few seconds between runs of speaker-test
> (iow, if I allow mcasp to idle) then I hear a slight chopping sound when
> starting, perhaps we're unmuting too early ?

Is it only with this patch (via simple-card) or was it the same via the
davinci-evm (ti,da830-evm-audio)?

-- 
P?ter

> 
>> ---
>>  arch/arm/boot/dts/am437x-sk-evm.dts | 30 ++++++++++++++++++++++--------
>>  1 file changed, 22 insertions(+), 8 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
>> index b5de6b0d622c..e09216cb14df 100644
>> --- a/arch/arm/boot/dts/am437x-sk-evm.dts
>> +++ b/arch/arm/boot/dts/am437x-sk-evm.dts
>> @@ -32,14 +32,26 @@
>>  	};
>>  
>>  	sound {
>> -		compatible = "ti,da830-evm-audio";
>> -		ti,model = "AM437x-SK-EVM";
>> -		ti,audio-codec = <&tlv320aic3106>;
>> -		ti,mcasp-controller = <&mcasp1>;
>> -		ti,codec-clock-rate = <24000000>;
>> -		ti,audio-routing =
>> -			"Headphone Jack",       "HPLOUT",
>> -			"Headphone Jack",       "HPROUT";
>> +		compatible = "simple-audio-card";
>> +		simple-audio-card,name = "AM437x-SK-EVM";
>> +		simple-audio-card,widgets =
>> +			"Headphone", "Headphone Jack";
>> +		simple-audio-card,routing =
>> +			"Headphone Jack",	"HPLOUT",
>> +			"Headphone Jack",	"HPROUT";
>> +		simple-audio-card,format = "dsp_b";
>> +		simple-audio-card,bitclock-master = <&sound_master>;
>> +		simple-audio-card,frame-master = <&sound_master>;
>> +		simple-audio-card,bitclock-inversion;
>> +
>> +		simple-audio-card,cpu {
>> +			sound-dai = <&mcasp1>;
>> +		};
>> +
>> +		sound_master: simple-audio-card,codec {
>> +			sound-dai = <&tlv320aic3106>;
>> +			system-clock-frequency = <24000000>;
>> +		};
>>  	};
>>  
>>  	matrix_keypad: matrix_keypad at 0 {
>> @@ -489,6 +501,7 @@
>>  	};
>>  
>>  	tlv320aic3106: tlv320aic3106 at 1b {
>> +		#sound-dai-cells = <0>;
>>  		compatible = "ti,tlv320aic3106";
>>  		reg = <0x1b>;
>>  		status = "okay";
>> @@ -649,6 +662,7 @@
>>  };
>>  
>>  &mcasp1 {
>> +	#sound-dai-cells = <0>;
>>  	pinctrl-names = "default", "sleep";
>>  	pinctrl-0 = <&mcasp1_pins>;
>>  	pinctrl-1 = <&mcasp1_pins_sleep>;
>> -- 
>> 2.4.5
>>
> 

[PATCH 0/2] ARM: DTS: am437x-sk-evm: Use simple-card for audio support

[Peter Ujfalusi]

On 07/02/2015 03:10 PM, Felipe Balbi wrote:
> Hi,
> 
> On Thu, Jul 02, 2015 at 02:58:04PM +0300, Peter Ujfalusi wrote:
>> Hi,
>>
>> There is no reason to use the davinci-evm machine driver's compatible for audio
>> support since the setup is simple and the common simple-audio-card can handle it
>> just fine.
>> Also add McASP1 sleep pin configuration.
>>
>> Regards,
>> Peter
>> ---
>> Peter Ujfalusi (2):
>>   ARM: DTS: am437x-sk-evm: Add sleep pin settings for mcasp1
>>   ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio
>>     support
> 
> you should add a patch enabling CONFIG_SND_SIMPLE_CARD=m in
> omap2plus_defconfig

Oh, true.
I'll then resend this as part of a bigger series (am335x-evmsk/evm,
am437x-gp/epos/sk).
I planned to send them as separate, but you are right, simple card need to be
enabled first.

-- 
P?ter

[PATCH 2/2] ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio support

[Felipe Balbi]

On Thu, Jul 02, 2015 at 03:52:49PM +0300, Peter Ujfalusi wrote:
> On 07/02/2015 03:23 PM, Felipe Balbi wrote:
> > On Thu, Jul 02, 2015 at 02:58:06PM +0300, Peter Ujfalusi wrote:
> >> The sound support consist only Headset output on the board and can be
> >> handled by "simple-audio-card"
> >>
> >> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> > 
> > Still works fine:
> > 
> > Tested-by: Felipe Balbi <balbi@ti.com>
> > 
> > one question though, should Line In be listed below ?
> 
> Does the board have Line-in? I don't have the board, but I know this patch

yeah, it does :-)

> works on it ;)
> We only had playback path before also.

indeed, should go for -next only :-s

> > Also, unrelated to
> > $subject, but if I wait for a few seconds between runs of speaker-test
> > (iow, if I allow mcasp to idle) then I hear a slight chopping sound when
> > starting, perhaps we're unmuting too early ?
> 
> Is it only with this patch (via simple-card) or was it the same via the
> davinci-evm (ti,da830-evm-audio)?

/me goes test again

also without this patch :-)

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150702/8b873ad5/attachment.sig>