Unverified Commit e6ec5a39 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: fsl-asoc-card: Add optional dt property for setting mclk-id 

Merge series from Ariel D'Alessandro <ariel.dalessandro@collabora.com>:

Sound cards may allow using different main clock inputs. In the generic
fsl-asoc-card driver, these values are hardcoded for each specific card
configuration.  Let's make it more flexible, allowing setting mclk-id
from the device-tree node.
parents d2fe7fc5 6045ffd3

Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ Optional properties: 
  - dai-format		: audio format, for details see simple-card.yaml.

  - frame-inversion	: dai-link uses frame clock inversion, for details see simple-card.yaml.

  - bitclock-inversion	: dai-link uses bit clock inversion, for details see simple-card.yaml.

  - mclk-id		: main clock id, specific for each card configuration.



Optional unless SSI is selected as a CPU DAI:

Documentation/devicetree/bindings/sound/tlv320aic31xx.txt

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ The pins can be used in referring sound node's audio-routing property. 


Example:

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/sound/tlv320aic31xx-micbias.h>

#include <dt-bindings/sound/tlv320aic31xx.h>



tlv320aic31xx: tlv320aic31xx@18 {

	compatible = "ti,tlv320aic311x";

arch/arm/boot/dts/am43x-epos-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <dt-bindings/pinctrl/am43xx.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/pwm/pwm.h>

#include <dt-bindings/sound/tlv320aic31xx-micbias.h>

#include <dt-bindings/sound/tlv320aic31xx.h>



/ {

	model = "TI AM43x EPOS EVM";

include/dt-bindings/sound/tlv320aic31xx-micbias.h→include/dt-bindings/sound/tlv320aic31xx.h

+14 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __DT_TLV320AIC31XX_MICBIAS_H

#define __DT_TLV320AIC31XX_MICBIAS_H

#ifndef __DT_TLV320AIC31XX_H

#define __DT_TLV320AIC31XX_H



#define MICBIAS_2_0V		1

#define MICBIAS_2_5V		2

#define MICBIAS_AVDDV		3



#endif /* __DT_TLV320AIC31XX_MICBIAS_H */
 
#define PLL_CLKIN_MCLK		0x00

#define PLL_CLKIN_BCLK		0x01

#define PLL_CLKIN_GPIO1		0x02

#define PLL_CLKIN_DIN		0x03



#endif /* __DT_TLV320AIC31XX_H */

sound/soc/codecs/tlv320aic31xx.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <sound/soc.h>

#include <sound/initval.h>

#include <sound/tlv.h>

#include <dt-bindings/sound/tlv320aic31xx-micbias.h>

#include <dt-bindings/sound/tlv320aic31xx.h>



#include "tlv320aic31xx.h"