[4/4] ARM: dts: am335x-sl50: Fix audio codec setup.
diff mbox

Message ID 1452941473-6349-5-git-send-email-enric.balletbo@collabora.com
State New
Headers show

Commit Message

Enric Balletbo i Serra Jan. 16, 2016, 10:51 a.m. UTC
The MCLK is provided by an external clock of 24.576MHz.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---
 arch/arm/boot/dts/am335x-sl50.dts | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

Comments

Javier Martinez Canillas Feb. 2, 2016, 7:07 p.m. UTC | #1
Hello Enric,

On 01/16/2016 07:51 AM, Enric Balletbo i Serra wrote:
> The MCLK is provided by an external clock of 24.576MHz.
>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> ---
>   arch/arm/boot/dts/am335x-sl50.dts | 20 ++++++++++++++++++--
>   1 file changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
> index 9e1dac6..a676869 100644
> --- a/arch/arm/boot/dts/am335x-sl50.dts
> +++ b/arch/arm/boot/dts/am335x-sl50.dts
> @@ -67,12 +67,28 @@
>   		default-brightness-level = <6>;
>   	};
>
> +	clocks {
> +		compatible = "simple-bus";
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		/* audio external oscillator */
> +		tlv320aic3x_mclk: oscillator@0 {
> +			compatible = "fixed-clock";
> +			#clock-cells = <0>;
> +			clock-frequency  = <24576000>;	/* 24.576MHz */
> +		};
> +	};
> +
>   	sound {
>   		compatible = "ti,da830-evm-audio";
>   		ti,model = "AM335x-SL50";
>   		ti,audio-codec = <&audio_codec>;
>   		ti,mcasp-controller = <&mcasp0>;
> -		ti,codec-clock-rate = <12000000>;
> +
> +		clocks = <&tlv320aic3x_mclk>;
> +		clock-names = "mclk";
> +
>   		ti,audio-routing =
>   			"Headphone Jack",	"HPLOUT",
>   			"Headphone Jack",	"HPROUT",
> @@ -230,7 +246,7 @@
>   			AM33XX_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mcasp0_fsx.mcasp0_fsx */
>   			AM33XX_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mcasp0_aclkx.mcasp0_aclkx */
>   			AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mcasp0_axr0.mcasp0_axr0 */
> -			AM33XX_IOPAD(0x99c, PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mcasp0_ahclkr.mcasp0_axr2*/
> +			AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mcasp0_ahclkr.mcasp0_axr2 */

Please also mention this change in the commit message.

>   		>;
>   	};
>
>

after the updated commit message:

Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

Best regards,

Patch
diff mbox

diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
index 9e1dac6..a676869 100644
--- a/arch/arm/boot/dts/am335x-sl50.dts
+++ b/arch/arm/boot/dts/am335x-sl50.dts
@@ -67,12 +67,28 @@ 
 		default-brightness-level = <6>;
 	};
 
+	clocks {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		/* audio external oscillator */
+		tlv320aic3x_mclk: oscillator@0 {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency  = <24576000>;	/* 24.576MHz */
+		};
+	};
+
 	sound {
 		compatible = "ti,da830-evm-audio";
 		ti,model = "AM335x-SL50";
 		ti,audio-codec = <&audio_codec>;
 		ti,mcasp-controller = <&mcasp0>;
-		ti,codec-clock-rate = <12000000>;
+
+		clocks = <&tlv320aic3x_mclk>;
+		clock-names = "mclk";
+
 		ti,audio-routing =
 			"Headphone Jack",	"HPLOUT",
 			"Headphone Jack",	"HPROUT",
@@ -230,7 +246,7 @@ 
 			AM33XX_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mcasp0_fsx.mcasp0_fsx */
 			AM33XX_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mcasp0_aclkx.mcasp0_aclkx */
 			AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* mcasp0_axr0.mcasp0_axr0 */
-			AM33XX_IOPAD(0x99c, PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mcasp0_ahclkr.mcasp0_axr2*/
+			AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mcasp0_ahclkr.mcasp0_axr2 */
 		>;
 	};