wm8994: checkout for bluetooth

vibrator: checkout for board_raho_0928

diff --git a/arch/arm/mach-rk2818/board-raho-0928.c b/arch/arm/mach-rk2818/board-raho-0928.c
index 8672ce4b93ba757dcc104140ed353274f53c7b13..0885919f87ebbaa8f99b6d0c59b0535a7a168142 100755 (executable)
--- a/arch/arm/mach-rk2818/board-raho-0928.c
+++ b/arch/arm/mach-rk2818/board-raho-0928.c
@@ -2087,7 +2087,7 @@ struct rk2818_adckey_platform_data rk2818_adckey_platdata = {
 static struct timed_gpio timed_gpios[] = {
        {
                .name = "vibrator",
-               .gpio = SPI_GPIO_P1_12,
+               .gpio = FPGA_PIO1_12,
                .max_timeout = 1000,
                .active_low = 1,
        },

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 11b2d4aea71ea5dbb628239f629bf0458b53d32b..5525cf7b296f07d5d346beef0973ba2a5ec01dc3 100755 (executable)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -93,7 +93,7 @@ void wm8994_set_volume(unsigned char wm8994_mode,unsigned char volume,unsigned c
 enum stream_type_wm8994
 {
        VOICE_CALL      =0,
-       BLUETOOTH_SCO,
+       BLUETOOTH_SCO =6,
 };
 
 /* For voice device route set, add by phc  */