rk2928: rk2926 tb: fix 'vol-' and 'wifi: rk306->usb wifi'

diff --git a/arch/arm/configs/rk2926_tb_defconfig b/arch/arm/configs/rk2926_tb_defconfig
index d9622a2ae87278a29d213a9fb03f0ae1398f0bd1..3147dfdeeab997b8fc654114dbf3ca0269a17ed0 100644 (file)
--- a/arch/arm/configs/rk2926_tb_defconfig
+++ b/arch/arm/configs/rk2926_tb_defconfig
@@ -177,6 +177,8 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIBCM4325=y
 CONFIG_BT_AUTOSLEEP=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_RK=y
 CONFIG_DEVTMPFS=y
@@ -204,7 +206,7 @@ CONFIG_PHYLIB=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_WLAN_80211=y
-CONFIG_RKWIFI=y
+CONFIG_RTL8188EU=y
 CONFIG_USB_USBNET=y
 CONFIG_PPP=y
 CONFIG_PPP_MULTILINK=y
@@ -373,6 +375,7 @@ CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
 CONFIG_SDMMC_RK29=y
 CONFIG_SDMMC0_RK29_SDCARD_DET_FROM_GPIO=y
+# CONFIG_SDMMC1_RK29 is not set
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
 CONFIG_RTC_CLASS=y

diff --git a/arch/arm/mach-rk2928/board-rk2928-tb-key.c b/arch/arm/mach-rk2928/board-rk2928-tb-key.c
index 10b612ecf53d40dca13435b79dfe820e4edb979b..383115440282bddf74ee74793e57c243e9b148e7 100755 (executable)
--- a/arch/arm/mach-rk2928/board-rk2928-tb-key.c
+++ b/arch/arm/mach-rk2928/board-rk2928-tb-key.c
@@ -11,7 +11,11 @@ static struct rk29_keys_button key_button[] = {
        {
                .desc   = "vol-",
                .code   = KEY_VOLUMEDOWN,
+                #if defined(CONFIG_MACH_RK2928_TB)
                .gpio   = RK2928_PIN0_PD1,
+                #elif defined(CONFIG_MACH_RK2926_TB)
+               .gpio   = RK2928_PIN2_PB6,
+                #endif
                .active_low = PRESS_LEV_LOW,
        },
        {