From: lyx <lyx@rock-chips.com>
Date: Fri, 8 Oct 2010 13:20:45 +0000 (-0700)
Subject: wm8994: checkout for bluetooth
X-Git-Tag: firefly_0821_release~11077
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d14b27ed5174c89df097b469ce0a25ac7c699560;p=firefly-linux-kernel-4.4.55.git

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 8672ce4b93ba..0885919f87eb 100755
--- 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 11b2d4aea71e..5525cf7b296f 100755
--- 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  */