From 0856f59fdd0f0001f7ccd532267369b11b6dc06c Mon Sep 17 00:00:00 2001 From: xbw Date: Tue, 29 Jan 2013 17:12:33 +0800 Subject: [PATCH] sdio-wiif: add the funtion to get wifi-module voltage in board-xxx-sdmmc-config.c --- arch/arm/mach-rk30/board-LR097-sdmmc-config.c | 23 +++++++++++++++++ .../board-rk3168-ds1006h-sdmmc-config.c | 23 +++++++++++++++++ .../mach-rk30/board-rk3168-tb-sdmmc-conifg.c | 25 ++++++++++++++++++- .../board-rk3188-ds1006h-sdmmc-config.c | 23 +++++++++++++++++ 4 files changed, 93 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-rk30/board-LR097-sdmmc-config.c b/arch/arm/mach-rk30/board-LR097-sdmmc-config.c index c3df92069eaf..a6e434514e26 100644 --- a/arch/arm/mach-rk30/board-LR097-sdmmc-config.c +++ b/arch/arm/mach-rk30/board-LR097-sdmmc-config.c @@ -117,4 +117,27 @@ #endif // #if COMBO_MODULE_MT6620_CDT--#endif #endif +double rk31sdk_get_sdio_wifi_voltage(void) +{ + double voltage; + + /****************************************************************************** + ** Please tell me how much wifi-module uses voltage in your project. + ******************************************************************************/ +#if defined(CONFIG_BCM4329) || defined(CONFIG_BCM4319) || defined(CONFIG_RK903) || defined(CONFIG_RK901) + voltage = 1.8 ; //power 1.8V + +#elif defined(CONFIG_MT5931_MT6622)||defined(CONFIG_MT5931)||defined(CONFIG_MT6620) + voltage = 2.8 ; //power 2.8V +#elif defined(CONFIG_RDA5990)||defined(CONFIG_RTL8723AS) + voltage = 3.3 ; //power 3.3V +#else + //default, sdio use 3.0V + voltage = 3.0 ; //power 3.0V +#endif + + return voltage; +} + + diff --git a/arch/arm/mach-rk30/board-rk3168-ds1006h-sdmmc-config.c b/arch/arm/mach-rk30/board-rk3168-ds1006h-sdmmc-config.c index 861772f09844..e399723c457b 100644 --- a/arch/arm/mach-rk30/board-rk3168-ds1006h-sdmmc-config.c +++ b/arch/arm/mach-rk30/board-rk3168-ds1006h-sdmmc-config.c @@ -117,4 +117,27 @@ #endif // #if COMBO_MODULE_MT6620_CDT--#endif #endif +double rk31sdk_get_sdio_wifi_voltage(void) +{ + double voltage; + + /****************************************************************************** + ** Please tell me how much wifi-module uses voltage in your project. + ******************************************************************************/ +#if defined(CONFIG_BCM4329) || defined(CONFIG_BCM4319) || defined(CONFIG_RK903) || defined(CONFIG_RK901) + voltage = 1.8 ; //power 1.8V + +#elif defined(CONFIG_MT5931_MT6622)||defined(CONFIG_MT5931)||defined(CONFIG_MT6620) + voltage = 2.8 ; //power 2.8V +#elif defined(CONFIG_RDA5990)||defined(CONFIG_RTL8723AS) + voltage = 3.3 ; //power 3.3V +#else + //default, sdio use 3.0V + voltage = 3.0 ; //power 3.0V +#endif + + return voltage; +} + + diff --git a/arch/arm/mach-rk30/board-rk3168-tb-sdmmc-conifg.c b/arch/arm/mach-rk30/board-rk3168-tb-sdmmc-conifg.c index 861772f09844..373e648a603e 100644 --- a/arch/arm/mach-rk30/board-rk3168-tb-sdmmc-conifg.c +++ b/arch/arm/mach-rk30/board-rk3168-tb-sdmmc-conifg.c @@ -59,7 +59,7 @@ #elif defined(CONFIG_BCM4329) || defined(CONFIG_BCM4319) || defined(CONFIG_RK903) || defined(CONFIG_RK901) #define RK30SDK_WIFI_GPIO_POWER_N RK30_PIN3_PD0 - #define RK30SDK_WIFI_GPIO_POWER_ENABLE_VALUE GPIO_HIGH + #define RK30SDK_WIFI_GPIO_POWER_ENABLE_VALUE GPIO_HIGH #define RK30SDK_WIFI_GPIO_RESET_N RK30_PIN2_PA7 #define RK30SDK_WIFI_GPIO_RESET_ENABLE_VALUE GPIO_HIGH @@ -117,4 +117,27 @@ #endif // #if COMBO_MODULE_MT6620_CDT--#endif #endif +double rk31sdk_get_sdio_wifi_voltage(void) +{ + double voltage; + + /****************************************************************************** + ** Please tell me how much wifi-module uses voltage in your project. + ******************************************************************************/ +#if defined(CONFIG_BCM4329) || defined(CONFIG_BCM4319) || defined(CONFIG_RK903) || defined(CONFIG_RK901) + voltage = 1.8 ; //power 1.8V + +#elif defined(CONFIG_MT5931_MT6622)||defined(CONFIG_MT5931)||defined(CONFIG_MT6620) + voltage = 2.8 ; //power 2.8V +#elif defined(CONFIG_RDA5990)||defined(CONFIG_RTL8723AS) + voltage = 3.3 ; //power 3.3V +#else + //default, sdio use 3.0V + voltage = 3.0 ; //power 3.0V +#endif + + return voltage; +} + + diff --git a/arch/arm/mach-rk3188/board-rk3188-ds1006h-sdmmc-config.c b/arch/arm/mach-rk3188/board-rk3188-ds1006h-sdmmc-config.c index 861772f09844..e399723c457b 100644 --- a/arch/arm/mach-rk3188/board-rk3188-ds1006h-sdmmc-config.c +++ b/arch/arm/mach-rk3188/board-rk3188-ds1006h-sdmmc-config.c @@ -117,4 +117,27 @@ #endif // #if COMBO_MODULE_MT6620_CDT--#endif #endif +double rk31sdk_get_sdio_wifi_voltage(void) +{ + double voltage; + + /****************************************************************************** + ** Please tell me how much wifi-module uses voltage in your project. + ******************************************************************************/ +#if defined(CONFIG_BCM4329) || defined(CONFIG_BCM4319) || defined(CONFIG_RK903) || defined(CONFIG_RK901) + voltage = 1.8 ; //power 1.8V + +#elif defined(CONFIG_MT5931_MT6622)||defined(CONFIG_MT5931)||defined(CONFIG_MT6620) + voltage = 2.8 ; //power 2.8V +#elif defined(CONFIG_RDA5990)||defined(CONFIG_RTL8723AS) + voltage = 3.3 ; //power 3.3V +#else + //default, sdio use 3.0V + voltage = 3.0 ; //power 3.0V +#endif + + return voltage; +} + + -- 2.34.1