From: lhh Date: Thu, 9 Sep 2010 14:26:23 +0000 (+0800) Subject: it50 bt io change X-Git-Tag: firefly_0821_release~11166 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f32db7c9e842a9663102c00ce1653463812fb96a;p=firefly-linux-kernel-4.4.55.git it50 bt io change --- diff --git a/arch/arm/mach-rk2818/board-infoit50.c b/arch/arm/mach-rk2818/board-infoit50.c index 8f8fe1060179..32e84363f691 100755 --- a/arch/arm/mach-rk2818/board-infoit50.c +++ b/arch/arm/mach-rk2818/board-infoit50.c @@ -226,9 +226,9 @@ static int info_wifi_status(struct device *dev) static int info_wifi_status_register(void (*callback)(int card_present, void *dev_id), void *dev_id) { if(wifi_status_cb) - return -EAGAIN; - wifi_status_cb = callback; - wifi_status_cb_devid = dev_id; + return -EAGAIN; + wifi_status_cb = callback; + wifi_status_cb_devid = dev_id; return 0; } @@ -258,7 +258,7 @@ static int info_wifi_power(int on) } info_wifi_power_state = on; - return 0; + return 0; } static int info_wifi_reset_state; @@ -285,12 +285,12 @@ static int info_wifi_set_carddetect(int val) static struct wifi_platform_data info_wifi_control = { .set_power = info_wifi_power, - .set_reset = info_wifi_reset, - .set_carddetect = info_wifi_set_carddetect, + .set_reset = info_wifi_reset, + .set_carddetect = info_wifi_set_carddetect, }; static struct platform_device info_wifi_device = { .name = "bcm4329_wlan", - .id = 1, + .id = 1, .dev = { .platform_data = &info_wifi_control, }, @@ -363,51 +363,11 @@ struct rk2818_gpio_expander_info extgpio_tca6424_settinginfo[] = { .pin_type = GPIO_OUT, .pin_value = GPIO_LOW, }, - { - .gpio_num = TCA6424_P02,// charge check - .pin_type = GPIO_IN, - }, { .gpio_num = TCA6424_P03, ///sensor power .pin_type = GPIO_OUT, .pin_value = GPIO_LOW, }, - { - .gpio_num = TCA6424_P04,// tp3 - .pin_type = GPIO_OUT, - .pin_value = GPIO_LOW, - }, - { - .gpio_num = TCA6424_P05, - .pin_type = GPIO_OUT, - .pin_value = GPIO_LOW, - }, - { - .gpio_num = TCA6424_P11, - .pin_type = GPIO_OUT, - .pin_value = GPIO_HIGH, - }, - { - .gpio_num = TCA6424_P12, - .pin_type = GPIO_IN, - //.pin_value =GPIO_HIGH, - }, - - { - .gpio_num = TCA6424_P13,// tp3 - .pin_type = GPIO_IN, - //.pin_value =GPIO_HIGH, - }, - { - .gpio_num = TCA6424_P14, - .pin_type = GPIO_IN, - //.pin_value =GPIO_HIGH, - }, - { - .gpio_num = TCA6424_P15,// tp3 - .pin_type = GPIO_IN, - //.pin_value =GPIO_HIGH, - }, { .gpio_num = TCA6424_P12,// 3G PowerOn .pin_type = GPIO_OUT, diff --git a/arch/arm/mach-rk2818/board-infosdk-rfkill.c b/arch/arm/mach-rk2818/board-infosdk-rfkill.c index 3806bd48f046..0f7476580c14 100755 --- a/arch/arm/mach-rk2818/board-infosdk-rfkill.c +++ b/arch/arm/mach-rk2818/board-infosdk-rfkill.c @@ -26,15 +26,19 @@ #include #include -#if 1 +#if 0 #define DBG(x...) printk(KERN_INFO x) #else #define DBG(x...) #endif +#ifdef CONFIG_MACH_RK2818INFO_IT50 +#define INFO_BT_GPIO_POWER_N TCA6424_P02 +#define INFO_BT_GPIO_RESET_N TCA6424_P14 +#else #define INFO_BT_GPIO_POWER_N TCA6424_P25 #define INFO_BT_GPIO_RESET_N TCA6424_P22 - +#endif static struct rfkill *bt_rfk; static const char bt_name[] = "bcm4329"; extern int info_bt_power_state;