audio:fix some compile log

diff --git a/drivers/headset_observe/rk_headset_irq_hook_adc.c b/drivers/headset_observe/rk_headset_irq_hook_adc.c
index 19defb325ff82a620a93fb2521d88fd94ff3fb06..cb119058670081246925ab6dfe53156a43dfc158 100755 (executable)
--- a/drivers/headset_observe/rk_headset_irq_hook_adc.c
+++ b/drivers/headset_observe/rk_headset_irq_hook_adc.c
@@ -222,7 +222,7 @@ out:
        enable_irq(headset_info->irq[HEADSET]);
        return IRQ_HANDLED;
 }
-
+#if 0
 static int headset_change_irqtype(int type,unsigned int irq_type)
 {
        int ret = 0;
@@ -243,7 +243,7 @@ static int headset_change_irqtype(int type,unsigned int irq_type)
        }
        return ret;
 }
-
+#endif
 static void hook_once_work(struct work_struct *work)
 {
        int ret,val;

diff --git a/sound/soc/codecs/rt3261-dsp.c b/sound/soc/codecs/rt3261-dsp.c
index 42e1accb5d3fbe23420fc7a46598390a61fd8053..1233f58033122746db87088a0e7e31f21817be23 100644 (file)
--- a/sound/soc/codecs/rt3261-dsp.c
+++ b/sound/soc/codecs/rt3261-dsp.c
@@ -59,7 +59,7 @@ static const u16 rt3261_dsp_rate_tab[] = {
 };
 #define RT3261_DSP_RATE_NUM (sizeof(rt3261_dsp_rate_tab) / sizeof(rt3261_dsp_rate_tab[0]))
 
-static const u16 rt3261_dsp_aec_ns_fens[][2] = {
+unsigned short rt3261_dsp_aec_ns_fens[][2] = {
        {0x22F8, 0x8005},
        {0x2309, 0x0400},
        {0x2310, 0x0824},
@@ -120,7 +120,7 @@ static const u16 rt3261_dsp_aec_ns_fens[][2] = {
 #define RT3261_DSP_AEC_NUM \
        (sizeof(rt3261_dsp_aec_ns_fens) / sizeof(rt3261_dsp_aec_ns_fens[0]))
 
-static const u16 rt3261_dsp_hfbf[][2] = {
+unsigned short rt3261_dsp_hfbf[][2] = {
        {0x22f8, 0x8004}, {0x22a0, 0x1205}, {0x22a1, 0x0f00}, {0x22a2, 0x1000},
        {0x22a3, 0x1000}, {0x22a4, 0x1000}, {0x22aa, 0x0006}, {0x22ad, 0x0060},
        {0x22ae, 0x0080}, {0x22af, 0x0000}, {0x22b0, 0x000e}, {0x22b1, 0x0010},
@@ -142,7 +142,7 @@ static const u16 rt3261_dsp_hfbf[][2] = {
 #define RT3261_DSP_HFBF_NUM \
        (sizeof(rt3261_dsp_hfbf) / sizeof(rt3261_dsp_hfbf[0]))
 
-static const u16 rt3261_dsp_ffp[][2] = {
+unsigned short rt3261_dsp_ffp[][2] = {
        {0x22f8, 0x8005}, {0x2303, 0x1971}, {0x2304, 0x8312}, {0x2305, 0x0005},
        {0x2309, 0x0200}, {0x230a, 0x1b00}, {0x230c, 0x0800}, {0x230d, 0x0400},
        {0x2325, 0x5000}, {0x2326, 0x0040}, {0x232f, 0x0080}, {0x2332, 0x0100},

diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index 5b52ffbf6a5226e029050f39e429f5e0dead656a..50f1edf480e99018cde425f6426e335916da37b6 100755 (executable)
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -26,7 +26,7 @@ choice
                tristate  "HDMI use I2S"
 
        config SND_RK_SOC_HDMI_SPDIF
-               depends on SND_RK_SOC_RK616
+               #depends on SND_RK_SOC_RK616
                select SND_RK_SOC_SPDIF
                select SND_SOC_HDMI_SPDIF
                tristate  "HDMI use SPDIF"

diff --git a/sound/soc/rockchip/rk_spdif.c b/sound/soc/rockchip/rk_spdif.c
index 0ea082b90542c3e48721b6f1de6c8b7a30367aa3..dcc13e5a4068dc6efdb1c671a87c717aa965ec3c 100755 (executable)
--- a/sound/soc/rockchip/rk_spdif.c
+++ b/sound/soc/rockchip/rk_spdif.c
@@ -102,7 +102,7 @@
 #define CFGR_JUSTIFIED_LEFT         (1<<3)
 #define CFGR_JUSTIFIED_MASK         (1<<3)
 
-/* CSE:channel status enable *
+/* CSE:channel status enable */
 /* The bit should be set to 1 when the channel conveys non-linear PCM */
 #define CFGR_CSE_DISABLE            (0<<6)
 #define CFGR_CSE_ENABLE             (1<<6)