aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnric Balletbo i Serra <enric.balletbo@collabora.com>2016-01-16 05:51:13 -0500
committerTony Lindgren <tony@atomide.com>2016-02-12 17:26:26 -0500
commitb328d9b86d5d22274a48b597f3226a8a21188cbc (patch)
treec2aad2c5465c5114b44443cc4fa06e4916732bc9
parent01c37be40fc35137a8b97e5176017958d57e401c (diff)
ARM: dts: am335x-sl50: Fix audio codec setup.
The MCLK is provided by an external clock of 24.576MHz. Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/boot/dts/am335x-sl50.dts20
1 files changed, 18 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
index 9e1dac639fad..a676869536bc 100644
--- a/arch/arm/boot/dts/am335x-sl50.dts
+++ b/arch/arm/boot/dts/am335x-sl50.dts
@@ -67,12 +67,28 @@
67 default-brightness-level = <6>; 67 default-brightness-level = <6>;
68 }; 68 };
69 69
70 clocks {
71 compatible = "simple-bus";
72 #address-cells = <1>;
73 #size-cells = <0>;
74
75 /* audio external oscillator */
76 tlv320aic3x_mclk: oscillator@0 {
77 compatible = "fixed-clock";
78 #clock-cells = <0>;
79 clock-frequency = <24576000>; /* 24.576MHz */
80 };
81 };
82
70 sound { 83 sound {
71 compatible = "ti,da830-evm-audio"; 84 compatible = "ti,da830-evm-audio";
72 ti,model = "AM335x-SL50"; 85 ti,model = "AM335x-SL50";
73 ti,audio-codec = <&audio_codec>; 86 ti,audio-codec = <&audio_codec>;
74 ti,mcasp-controller = <&mcasp0>; 87 ti,mcasp-controller = <&mcasp0>;
75 ti,codec-clock-rate = <12000000>; 88
89 clocks = <&tlv320aic3x_mclk>;
90 clock-names = "mclk";
91
76 ti,audio-routing = 92 ti,audio-routing =
77 "Headphone Jack", "HPLOUT", 93 "Headphone Jack", "HPLOUT",
78 "Headphone Jack", "HPROUT", 94 "Headphone Jack", "HPROUT",
@@ -230,7 +246,7 @@
230 AM33XX_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */ 246 AM33XX_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */
231 AM33XX_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */ 247 AM33XX_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */
232 AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_axr0.mcasp0_axr0 */ 248 AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_axr0.mcasp0_axr0 */
233 AM33XX_IOPAD(0x99c, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/ 249 AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2 */
234 >; 250 >;
235 }; 251 };
236 252