diff --git a/arch/riscv/boot/dts/thead/th1520.dtsi b/arch/riscv/boot/dts/thead/th1520.dtsi index 97894a0bb..f8dd9e128 100644 --- a/arch/riscv/boot/dts/thead/th1520.dtsi +++ b/arch/riscv/boot/dts/thead/th1520.dtsi @@ -2162,7 +2162,7 @@ clocks = <&clk CLKGEN_I2C1_PCLK>; clock-names = "pclk"; clock-frequency = <100000>; - // i2c_mode = "dma"; + i2c_mode = "dma"; dmas = <&dmac0 14>, <&dmac0 15>; dma-names = "tx", "rx"; #dma-cells = <1>; @@ -2238,7 +2238,7 @@ clocks = <&clk CLKGEN_I2C4_PCLK>; clock-names = "pclk"; clock-frequency = <100000>; - // i2c_mode = "dma"; + i2c_mode = "dma"; dmas = <&dmac0 20>, <&dmac0 21>; dma-names = "tx", "rx"; #dma-cells = <1>; diff --git a/sound/soc/codecs/es8323.c b/sound/soc/codecs/es8323.c index 94c4cf94c..8aee9bd51 100644 --- a/sound/soc/codecs/es8323.c +++ b/sound/soc/codecs/es8323.c @@ -685,11 +685,11 @@ static int es8323_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) u8 iface = 0; u8 adciface = 0; u8 daciface = 0; - printk(KERN_EMERG "yd %s %d\n", __func__, __LINE__); + iface = snd_soc_component_read(component, ES8323_IFACE); adciface = snd_soc_component_read(component, ES8323_ADC_IFACE); daciface = snd_soc_component_read(component, ES8323_DAC_IFACE); - printk(KERN_EMERG "yd %s %d\n", __func__, __LINE__); + /* set master/slave audio interface */ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: /* MASTER MODE */ @@ -749,7 +749,7 @@ static int es8323_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) snd_soc_component_write(component, ES8323_IFACE, iface); snd_soc_component_write(component, ES8323_ADC_IFACE, adciface); snd_soc_component_write(component, ES8323_DAC_IFACE, daciface); - printk(KERN_EMERG "yd %s %d\n", __func__, __LINE__); + return 0; }