shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk3066 i2s : add I2S0 channels choose，default using two channels

Browse Source
This commit is contained in:
邱建斌
2012-12-21 17:49:18 +08:00
parent e5d4ce84a6
commit 2f18c497f0
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/rk29/Kconfig
View File

@@ -15,6 +15,18 @@ config SND_RK29_SOC_I2S_8CH
depends on SND_RK29_SOC_I2S && !ARCH_RK3066B
help
This supports the use of the 8 Channel I2S interface on rk29 processors.
if SND_RK29_SOC_I2S_8CH
choice
bool "Set I2S0 using the number of channels"
default SND_I2SO_USE_DOUBLE_CHANNELS
config SND_I2SO_USE_EIGHT_CHANNELS
tristate "I2S0 use 8 channels"
config SND_I2SO_USE_DOUBLE_CHANNELS
tristate "I2S0 use 2 channels"
endchoice
endif
config SND_RK29_SOC_I2S_2CH
bool "Soc RK29 I2S 2 Channel support(I2S1)"

8
sound/soc/rk29/rk30_i2s.c
View File

@@ -507,9 +507,11 @@ static int rockchip_i2s_dai_probe(struct snd_soc_dai *dai)
rk30_mux_api_set(GPIO0B2_I2S8CHLRCKRX_NAME, GPIO0B_I2S_8CH_LRCK_RX);
rk30_mux_api_set(GPIO0B3_I2S8CHLRCKTX_NAME, GPIO0B_I2S_8CH_LRCK_TX);
rk30_mux_api_set(GPIO0B4_I2S8CHSDO0_NAME, GPIO0B_I2S_8CH_SDO0);
//rk30_mux_api_set(GPIO0B5_I2S8CHSDO1_NAME, GPIO0B_I2S_8CH_SDO1);
//rk30_mux_api_set(GPIO0B6_I2S8CHSDO2_NAME, GPIO0B_I2S_8CH_SDO2);
//rk30_mux_api_set(GPIO0B7_I2S8CHSDO3_NAME, GPIO0B_I2S_8CH_SDO3);
#ifdef SND_I2SO_USE_EIGHT_CHANNELS
rk30_mux_api_set(GPIO0B5_I2S8CHSDO1_NAME, GPIO0B_I2S_8CH_SDO1);
rk30_mux_api_set(GPIO0B6_I2S8CHSDO2_NAME, GPIO0B_I2S_8CH_SDO2);
rk30_mux_api_set(GPIO0B7_I2S8CHSDO3_NAME, GPIO0B_I2S_8CH_SDO3);
#endif
break;
case 1:
rk30_mux_api_set(GPIO0C0_I2S12CHCLK_NAME, GPIO0C_I2S1_2CH_CLK);