rk3168_86v_codec(ds803f): enable MT5931_MT6622 wifi

diff --git a/arch/arm/configs/rk3168_86v_codec_defconfig b/arch/arm/configs/rk3168_86v_codec_defconfig
index 101527a88ecc673a3690199a690d701994b04765..e6db57985f5b6c19917b87132e4cf3c88be2c188 100644 (file)
--- a/arch/arm/configs/rk3168_86v_codec_defconfig
+++ b/arch/arm/configs/rk3168_86v_codec_defconfig
@@ -173,7 +173,17 @@ CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_ACT_GACT=y
 CONFIG_NET_ACT_MIRRED=y
-CONFIG_CFG80211=y
+CONFIG_BT=y
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=y
+CONFIG_BT_HIDP=y
+CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM4325=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_RK=y
 CONFIG_DEVTMPFS=y
@@ -201,7 +211,7 @@ CONFIG_PHYLIB=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_WLAN_80211=y
-CONFIG_RTL8188EU=y
+CONFIG_MT5931_MT6622=y
 CONFIG_USB_USBNET=y
 CONFIG_PPP=y
 CONFIG_PPP_MULTILINK=y
@@ -418,6 +428,5 @@ CONFIG_SCHEDSTATS=y
 # CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
 CONFIG_ENABLE_DEFAULT_TRACERS=y
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_TWOFISH=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set

diff --git a/arch/arm/mach-rk30/board-rk3168-86v-sdmmc-config.c b/arch/arm/mach-rk30/board-rk3168-86v-sdmmc-config.c
index 6badb11fe0d79009da833612f52f4c537a8153c2..0854902fbdb783cffbac409e36baa30cc1a17e1f 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk3168-86v-sdmmc-config.c
+++ b/arch/arm/mach-rk30/board-rk3168-86v-sdmmc-config.c
@@ -89,11 +89,11 @@ int rk31sdk_get_sdmmc0_pin_io_voltage(void)
        //#define RK30SDK_WIFI_GPIO_RESET_ENABLE_VALUE    GPIO_HIGH
 
        #else
-       #define RK30SDK_WIFI_GPIO_POWER_N               RK30_PIN0_PA5
+       #define RK30SDK_WIFI_GPIO_POWER_N               RK30_PIN3_PD0
        #define RK30SDK_WIFI_GPIO_POWER_ENABLE_VALUE    GPIO_HIGH
 
-       #define RK30SDK_WIFI_GPIO_RESET_N               RK30_PIN3_PD1
-       #define RK30SDK_WIFI_GPIO_RESET_ENABLE_VALUE    GPIO_HIGH       
+//     #define RK30SDK_WIFI_GPIO_RESET_N               RK30_PIN3_PD1
+//     #define RK30SDK_WIFI_GPIO_RESET_ENABLE_VALUE    GPIO_HIGH       
        #endif
 
 #elif defined(CONFIG_MT6620)

diff --git a/arch/arm/mach-rk30/board-rk3168-86v.c b/arch/arm/mach-rk30/board-rk3168-86v.c
index 09efd678142257eba3eebb3852d03bfe5c08eb84..3111502614206a2268797f9346731a0fcd947cee 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk3168-86v.c
+++ b/arch/arm/mach-rk30/board-rk3168-86v.c
@@ -1202,7 +1202,7 @@ struct platform_device rk_device_gps = {
 #if defined(CONFIG_MT5931_MT6622)
 static struct mt6622_platform_data mt6622_platdata = {
                    .power_gpio         = { // BT_REG_ON
-                       .io             = RK30_PIN3_PD5, // set io to INVALID_GPIO for disable it
+                       .io             = RK30_PIN3_PC7, // set io to INVALID_GPIO for disable it
                            .enable         = GPIO_HIGH,
                            .iomux          = {
                                    .name       = NULL,
@@ -1210,7 +1210,7 @@ static struct mt6622_platform_data mt6622_platdata = {
                    },
 
                    .reset_gpio         = { // BT_RST
-                       .io             = RK30_PIN0_PD7,
+                       .io             = RK30_PIN3_PD1,
                        .enable         = GPIO_HIGH,
                        .iomux          = {
                            .name       = NULL,
@@ -1218,7 +1218,7 @@ static struct mt6622_platform_data mt6622_platdata = {
                    },
 
                    .irq_gpio           = {
-                           .io             = RK30_PIN3_PD2,
+                           .io             = RK30_PIN0_PA5,
                            .enable         = GPIO_HIGH,
                            .iomux          = {
                                    .name       = NULL,