Modify GTA02 power manager for bluetooth. From: Willie 1. Default power value isn't correct. Now we set pcf50633 LDO4 to 3.2 voltage. 2. Separate GTA01 and GTA02 source code. 3. Add pcf50633 API for enable register. --- arch/arm/mach-s3c2440/mach-gta02.c | 4 +- arch/arm/plat-s3c24xx/neo1973_pm_bt.c | 42 +++++++++++++++++++++-- drivers/i2c/chips/pcf50633.c | 59 +++++++++++++++++++++++++++++++++ include/linux/pcf50633.h | 11 ++++++ 4 files changed, 109 insertions(+), 7 deletions(-) Index: linux-2.6.24-rc7/arch/arm/mach-s3c2440/mach-gta02.c =================================================================== --- linux-2.6.24-rc7.orig/arch/arm/mach-s3c2440/mach-gta02.c +++ linux-2.6.24-rc7/arch/arm/mach-s3c2440/mach-gta02.c @@ -209,10 +209,10 @@ }, }, [PCF50633_REGULATOR_LDO4] = { - .name = "gl_2v5", + .name = "bt_3v2", .voltage = { .init = 2500, - .max = 2500, + .max = 3300, }, }, [PCF50633_REGULATOR_LDO5] = { Index: linux-2.6.24-rc7/arch/arm/plat-s3c24xx/neo1973_pm_bt.c =================================================================== --- linux-2.6.24-rc7.orig/arch/arm/plat-s3c24xx/neo1973_pm_bt.c +++ linux-2.6.24-rc7/arch/arm/plat-s3c24xx/neo1973_pm_bt.c @@ -16,12 +16,19 @@ #include #include -#include - #include #include + +#ifdef CONFIG_MACH_NEO1973_GTA01 #include +#include +#endif + +#ifdef CONFIG_MACH_NEO1973_GTA02 #include +#include +#endif + #define DRVMSG "FIC Neo1973 Bluetooth Power Management" @@ -30,6 +37,8 @@ { if (!strcmp(attr->attr.name, "power_on")) { switch (machine_arch_type) { + +#ifdef CONFIG_MACH_NEO1973_GTA01 case MACH_TYPE_NEO1973_GTA01: if (pcf50606_onoff_get(pcf50606_global, PCF50606_REGULATOR_D1REG) && @@ -37,21 +46,33 @@ PCF50606_REGULATOR_D1REG) == 3100) goto out_1; break; +#endif /* CONFIG_MACH_NEO1973_GTA01 */ + +#ifdef CONFIG_MACH_NEO1973_GTA02 case MACH_TYPE_NEO1973_GTA02: if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN)) goto out_1; break; +#endif /* CONFIG_MACH_NEO1973_GTA02 */ + } } else if (!strcmp(attr->attr.name, "reset")) { switch (machine_arch_type) { + +#ifdef CONFIG_MACH_NEO1973_GTA01 case MACH_TYPE_NEO1973_GTA01: if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0) goto out_1; break; +#endif /* CONFIG_MACH_NEO1973_GTA01 */ + +#ifdef CONFIG_MACH_NEO1973_GTA02 case MACH_TYPE_NEO1973_GTA02: if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN) == 0) goto out_1; break; +#endif /* CONFIG_MACH_NEO1973_GTA02 */ + } } @@ -64,9 +85,12 @@ const char *buf, size_t count) { unsigned long on = simple_strtoul(buf, NULL, 10); + unsigned int vol; if (!strcmp(attr->attr.name, "power_on")) { switch (machine_arch_type) { + +#ifdef CONFIG_MACH_NEO1973_GTA01 case MACH_TYPE_NEO1973_GTA01: /* if we are powering up, assert reset, then power, * then release reset */ @@ -80,22 +104,39 @@ PCF50606_REGULATOR_D1REG, on); s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on); break; +#endif /* CONFIG_MACH_NEO1973_GTA01 */ + +#ifdef CONFIG_MACH_NEO1973_GTA02 case MACH_TYPE_NEO1973_GTA02: + s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1); if (on) - s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0); - else - s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 1); + pcf50633_voltage_set(pcf50633_global, + PCF50633_REGULATOR_LDO4, 3200); + pcf50633_onoff_set(pcf50633_global, + PCF50633_REGULATOR_LDO4, on); + vol = pcf50633_voltage_get(pcf50633_global, + PCF50633_REGULATOR_LDO4); + dev_info(dev, "GTA02 Set PCF50633 LDO4 = %d\n", vol); break; +#endif /* CONFIG_MACH_NEO1973_GTA02 */ + } } else if (!strcmp(attr->attr.name, "reset")) { /* reset is low-active, so we need to invert */ switch (machine_arch_type) { + +#ifdef CONFIG_MACH_NEO1973_GTA01 case MACH_TYPE_NEO1973_GTA01: s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1); break; +#endif /* CONFIG_MACH_NEO1973_GTA01 */ + +#ifdef CONFIG_MACH_NEO1973_GTA02 case MACH_TYPE_NEO1973_GTA02: s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1); break; +#endif /* CONFIG_MACH_NEO1973_GTA02 */ + } } @@ -143,18 +184,30 @@ dev_info(&pdev->dev, DRVMSG ": starting\n"); switch (machine_arch_type) { + +#ifdef CONFIG_MACH_NEO1973_GTA01 case MACH_TYPE_NEO1973_GTA01: /* we make sure that the voltage is off */ pcf50606_onoff_set(pcf50606_global, PCF50606_REGULATOR_D1REG, 0); + /* we pull reset to low to make sure that the chip doesn't + * drain power through the reset line */ + s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0); break; +#endif /* CONFIG_MACH_NEO1973_GTA01 */ + +#ifdef CONFIG_MACH_NEO1973_GTA02 case MACH_TYPE_NEO1973_GTA02: - /* FIXME: implementation */ + /* we make sure that the voltage is off */ + pcf50633_onoff_set(pcf50633_global, + PCF50633_REGULATOR_LDO4, 0); + /* we pull reset to low to make sure that the chip doesn't + * drain power through the reset line */ + s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0); break; +#endif /* CONFIG_MACH_NEO1973_GTA02 */ + } - /* we pull reset to low to make sure that the chip doesn't - * drain power through the reset line */ - s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0); return sysfs_create_group(&pdev->dev.kobj, >a01_bt_attr_group); } Index: linux-2.6.24-rc7/include/linux/pcf50633.h =================================================================== --- linux-2.6.24-rc7.orig/include/linux/pcf50633.h +++ linux-2.6.24-rc7/include/linux/pcf50633.h @@ -46,6 +46,7 @@ extern unsigned int pcf50633_voltage_get(struct pcf50633_data *pcf, enum pcf50633_regulator_id reg); + extern int pcf50633_onoff_get(struct pcf50633_data *pcf, enum pcf50633_regulator_id reg);