]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: dts: cm-t335: add audio support
authorUri Mashiach <uri.mashiach@compulab.co.il>
Wed, 30 Dec 2015 11:41:35 +0000 (13:41 +0200)
committerTony Lindgren <tony@atomide.com>
Wed, 27 Jan 2016 18:32:59 +0000 (10:32 -0800)
The TLV320AIC23B codec is connected to the CPU by McASP controller 1 for
data and I2C0 for control.

Modifications:
- Enable and configure McASP controller 1.
- Add TLV320AIC23B codec pinmux.
- Add TLV320AIC23B codec configurations.
- Use simple-audio-card as CPU to codec glue.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/am335x-cm-t335.dts

index f0c880ff33a69a139301255064a9a92433f90cf9..af6dbba093f3ee02921de669bacd95fea400df49 100644 (file)
                brightness-levels = <0 51 53 56 62 75 101 152 255>;
                default-brightness-level = <8>;
        };
+
+       sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "cm-t335";
+
+               simple-audio-card,widgets =
+                       "Microphone", "Mic Jack",
+                       "Line", "Line In",
+                       "Headphone", "Headphone Jack";
+
+               simple-audio-card,routing =
+                       "Headphone Jack", "LHPOUT",
+                       "Headphone Jack", "RHPOUT",
+                       "LLINEIN", "Line In",
+                       "RLINEIN", "Line In",
+                       "MICIN", "Mic Jack";
+
+               simple-audio-card,format = "i2s";
+               simple-audio-card,bitclock-master = <&sound_master>;
+               simple-audio-card,frame-master = <&sound_master>;
+
+               simple-audio-card,cpu {
+                       sound-dai = <&mcasp1>;
+               };
+
+               sound_master: simple-audio-card,codec {
+                       sound-dai = <&tlv320aic23>;
+                       system-clock-frequency = <12000000>;
+               };
+       };
 };
 
 &am33xx_pinmux {
                        AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLUP | MUX_MODE7)
                >;
        };
+
+       /* TLV320AIC23B codec */
+       mcasp1_pins: pinmux_mcasp1_pins {
+               pinctrl-single,pins = <
+                       /* MII1_CRS.mcasp1_aclkx */
+                       AM33XX_IOPAD(0x90c, PIN_INPUT_PULLDOWN | MUX_MODE4)
+                       /* MII1_RX_ER.mcasp1_fsx */
+                       AM33XX_IOPAD(0x910, PIN_INPUT_PULLDOWN | MUX_MODE4)
+                       /* MII1_COL.mcasp1_axr2 */
+                       AM33XX_IOPAD(0x908, PIN_INPUT_PULLDOWN | MUX_MODE4)
+                       /* RMII1_REF_CLK.mcasp1_axr3 */
+                       AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE4)
+               >;
+       };
 };
 
 &uart0 {
@@ -282,6 +326,13 @@ status = "okay";
                compatible = "emmicro,em3027";
                reg = <0x56>;
        };
+       /* Audio codec */
+       tlv320aic23: codec@1a {
+               compatible = "ti,tlv320aic23";
+               reg = <0x1a>;
+               #sound-dai-cells= <0>;
+               status = "okay";
+       };
 };
 
 &usb {
@@ -441,3 +492,21 @@ status = "okay";
        };
 };
 
+/* CPU audio */
+&mcasp1 {
+               pinctrl-names = "default";
+               pinctrl-0 = <&mcasp1_pins>;
+
+               op-mode = <0>;          /* MCASP_IIS_MODE */
+               tdm-slots = <2>;
+               /* 16 serializers */
+               num-serializer = <16>;
+               serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
+                       0 0 2 1 0 0 0 0 0 0 0 0 0 0 0 0
+               >;
+               tx-num-evt = <1>;
+               rx-num-evt = <1>;
+
+               #sound-dai-cells= <0>;
+               status = "okay";
+};