From: xbw <xbw@rock-chips.com>
Date: Thu, 6 Dec 2012 10:08:24 +0000 (+0800)
Subject: MTK6620: rk30sdk use mt6620 4in1 module
X-Git-Tag: firefly_0821_release~8134
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=783e037f925d3d53354ada58fe4ec638546b9669;p=firefly-linux-kernel-4.4.55.git

MTK6620: rk30sdk use mt6620 4in1 module
---

diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index b37fa99c430c..63f53c593c64 100755
--- a/arch/arm/mach-rk30/board-rk30-sdk.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk.c
@@ -1555,12 +1555,14 @@ static void __init machine_rk30_board_init(void)
 	platform_add_devices(devices, ARRAY_SIZE(devices));
 	board_usb_detect_init(RK30_PIN6_PA3);
 
-#ifdef CONFIG_WIFI_CONTROL_FUNC
+#if defined(CONFIG_WIFI_CONTROL_FUNC)
 	rk29sdk_wifi_bt_gpio_control_init();
+#elif defined(CONFIG_WIFI_COMBO_MODULE_CONTROL_FUNC)
+    rk29sdk_wifi_combo_module_gpio_init();
 #endif
 
 #if defined(CONFIG_MT6620)
-    clk_set_rate(clk_get_sys("rk_serial.0", "uart"), 16*1000000);
+    clk_set_rate(clk_get_sys("rk_serial.0", "uart"), 48*1000000);
 #endif
 }