rendered paste bodydiff --git a/arch/arm/mach-msm/board-htcraphael-rfkill.c b/arch/arm/mach-msm/board-htcraphael-rfkill.cindex 54601e8..21db5ab 100644--- a/arch/arm/mach-msm/board-htcraphael-rfkill.c+++ b/arch/arm/mach-msm/board-htcraphael-rfkill.c@@ -21,6 +21,7 @@ #include <linux/rfkill.h> #include <linux/delay.h> #include <asm/gpio.h>+#include <asm/mach-types.h> #include "board-htcraphael.h" #include "proc_comm_wince.h" /* ?? GPIO ?? */@@ -65,11 +66,17 @@ static int bluetooth_set_power(void *data, enum rfkill_state state) gpio_configure(RAPH100_WIFI_BT_PWR2, GPIOF_DRIVE_OUTPUT | GPIOF_OUTPUT_HIGH); gpio_set_value(RAPH100_WIFI_BT_PWR2, 1); mdelay(50);- gpio_configure(RAPH100_BT_RST, GPIOF_DRIVE_OUTPUT | GPIOF_OUTPUT_LOW);- gpio_set_value(RAPH100_BT_RST, 0);- mdelay(50);- gpio_set_value(RAPH100_BT_RST, 1);- mdelay(200);+ if(machine_is_htcraphael_cdma() || machine_is_htcraphael_cdma500() || machine_is_htcdiamond_cdma()) {+ gpio_configure(0x52, GPIOF_DRIVE_OUTPUT | GPIOF_OUTPUT_LOW);+ gpio_set_value(0x52, 1);+ mdelay(200);+ } else {+ gpio_configure(RAPH100_BT_RST, GPIOF_DRIVE_OUTPUT | GPIOF_OUTPUT_LOW);+ gpio_set_value(RAPH100_BT_RST, 0);+ mdelay(50);+ gpio_set_value(RAPH100_BT_RST, 1);+ mdelay(200);+ } break; case RFKILL_STATE_OFF: printk(" bluetooth rfkill state OFF\n");