rk3168m: spdif support

diff --git a/arch/arm/configs/rk3168m_tb_defconfig b/arch/arm/configs/rk3168m_tb_defconfig
index 447d4e96f51960ad0c8a1009fd036f9dffc4e153..51f5721ec41514826f8bcf9a7577b56cdf02fdd8 100644 (file)
--- a/arch/arm/configs/rk3168m_tb_defconfig
+++ b/arch/arm/configs/rk3168m_tb_defconfig
@@ -326,8 +326,8 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_I2S_DMA_EVENT_STATIC=y
-CONFIG_SND_RK29_SOC_SPDIF=y
+CONFIG_SND_I2S_DMA_EVENT_DYNAMIC=y
+CONFIG_SND_RK_SOC_SPDIF=y
 CONFIG_SND_RK29_SOC_RK616=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 CONFIG_UHID=y

diff --git a/sound/soc/rk29/spdif.c b/sound/soc/rk29/spdif.c
index 53e4e7b129926dd80ad6c02737eac9bd57259b31..953716087d6fd8031a6d1606bc0f66827d3a9167 100644 (file)
--- a/sound/soc/rk29/spdif.c
+++ b/sound/soc/rk29/spdif.c
@@ -335,7 +335,11 @@ static __devinit int spdif_probe(struct platform_device *pdev)
 #endif
 
 #if defined (CONFIG_ARCH_RK30)    
+    #if defined (CONFIG_ARCH_RK3066B)
+    iomux_set(SPDIF_TX);
+    #else
     rk30_mux_api_set(GPIO1B2_SPDIFTX_NAME, GPIO1B_SPDIF_TX);
+    #endif
 #elif defined (CONFIG_ARCH_RK3188)
     iomux_set(SPDIF_TX);
 #endif