wm8994: add Earpiece Volume control

diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 9e370d14ad88f2bce72ccd0ce1204eb01bd854fa..06c72f8fc7d8dd584aae113be4bd6eb22f230c58 100755 (executable)
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -295,7 +295,9 @@ SOC_DOUBLE_R("Output ZC Switch", WM8993_LEFT_OPGA_VOLUME,
             WM8993_RIGHT_OPGA_VOLUME, 7, 1, 0),
 
 SOC_SINGLE("Earpiece Switch", WM8993_HPOUT2_VOLUME, 5, 1, 1),
-SOC_SINGLE_TLV("Earpiece Volume", WM8993_HPOUT2_VOLUME, 4, 1, 1, earpiece_tlv),
+SOC_SINGLE_TLV("HPOUT2 Volume", WM8993_HPOUT2_VOLUME, 4, 1, 1, earpiece_tlv),
+SOC_DOUBLE_R_TLV("Earpiece Volume", WM8993_LEFT_OPGA_VOLUME, 
+               WM8993_RIGHT_OPGA_VOLUME, 0, 63, 0, outpga_tlv),
 
 SOC_SINGLE_TLV("SPKL Input Volume", WM8993_SPKMIXL_ATTENUATION,
               5, 1, 1, wm_hubs_spkmix_tlv),

diff --git a/sound/soc/rk29/rk29_wm8994.c b/sound/soc/rk29/rk29_wm8994.c
index 969fa26fe43203d6d10e5cad0684b95dda8a603a..f5da0f052302ce1fd0c3c0742a292f7ac9bf3aa0 100755 (executable)
--- a/sound/soc/rk29/rk29_wm8994.c
+++ b/sound/soc/rk29/rk29_wm8994.c
@@ -105,7 +105,7 @@ static int rk29_aif1_hw_params(struct snd_pcm_substream *substream,
                DBG("rk29_hw_params_wm8994:failed to set the sysclk for codec side\n"); 
                return ret;
        }
-#else if
+#elif defined (CONFIG_SND_RK29_CODEC_SOC_MASTER)
        
 #endif