Hi list,
I modify some power initial code for bluetooth. Thanks.
Regards,
Willie
Modify GTA02 power manager for bluetooth.
From: Willie <[EMAIL PROTECTED]>
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(-)
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 3aef853..f51cad1 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -211,10 +211,10 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
},
},
[PCF50633_REGULATOR_LDO4] = {
- .name = "gl_2v5",
+ .name = "bt_3v2",
.voltage = {
.init = 2500,
- .max = 2500,
+ .max = 3300,
},
},
[PCF50633_REGULATOR_LDO5] = {
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
index d134dcb..b6e6687 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
@@ -16,12 +16,16 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
+#ifdef CONFIG_MACH_NEO1973_GTA02
+#include <linux/pcf50633.h>
+#include <asm/arch/gta02.h>
+#else
#include <linux/pcf50606.h>
+#include <asm/arch/gta01.h>
+#endif
#include <asm/hardware.h>
#include <asm/mach-types.h>
-#include <asm/arch/gta01.h>
-#include <asm/arch/gta02.h>
#define DRVMSG "FIC Neo1973 Bluetooth Power Management"
@@ -30,6 +34,7 @@ static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
{
if (!strcmp(attr->attr.name, "power_on")) {
switch (machine_arch_type) {
+#ifndef CONFIG_MACH_NEO1973_GTA02
case MACH_TYPE_NEO1973_GTA01:
if (pcf50606_onoff_get(pcf50606_global,
PCF50606_REGULATOR_D1REG) &&
@@ -37,21 +42,26 @@ static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
PCF50606_REGULATOR_D1REG) == 3100)
goto out_1;
break;
+#else
case MACH_TYPE_NEO1973_GTA02:
if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN))
goto out_1;
break;
+#endif
}
} else if (!strcmp(attr->attr.name, "reset")) {
switch (machine_arch_type) {
+#ifndef CONFIG_MACH_NEO1973_GTA02
case MACH_TYPE_NEO1973_GTA01:
if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
goto out_1;
break;
+#else
case MACH_TYPE_NEO1973_GTA02:
if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN) == 0)
goto out_1;
break;
+#endif
}
}
@@ -64,9 +74,11 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
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) {
+#ifndef CONFIG_MACH_NEO1973_GTA02
case MACH_TYPE_NEO1973_GTA01:
/* if we are powering up, assert reset, then power,
* then release reset */
@@ -80,22 +92,37 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
PCF50606_REGULATOR_D1REG, on);
s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
break;
+#else
case MACH_TYPE_NEO1973_GTA02:
- if (on)
- s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
- else
+ if (on) {
s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 1);
+ pcf50633_voltage_set(pcf50633_global,
+ PCF50633_REGULATOR_LDO4, 3200);
+ pcf50633_ena_voltage(pcf50633_global,
+ PCF50633_REGULATOR_LDO4, 0x01);
+ } else {
+ s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
+ pcf50633_ena_voltage(pcf50633_global,
+ PCF50633_REGULATOR_LDO4, 0x00);
+ }
+ vol = pcf50633_voltage_get(pcf50633_global,
+ PCF50633_REGULATOR_LDO4);
+ dev_info(dev, "GTA02 Set PCF50633 LDO4 = %d\n", vol);
break;
+#endif
}
} else if (!strcmp(attr->attr.name, "reset")) {
/* reset is low-active, so we need to invert */
switch (machine_arch_type) {
+#ifndef CONFIG_MACH_NEO1973_GTA02
case MACH_TYPE_NEO1973_GTA01:
s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
break;
+#else
case MACH_TYPE_NEO1973_GTA02:
s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
break;
+#endif
}
}
@@ -143,18 +170,23 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
dev_info(&pdev->dev, DRVMSG ": starting\n");
switch (machine_arch_type) {
+#ifndef CONFIG_MACH_NEO1973_GTA02
case MACH_TYPE_NEO1973_GTA01:
/* we make sure that the voltage is off */
pcf50606_onoff_set(pcf50606_global,
PCF50606_REGULATOR_D1REG, 0);
break;
+#else
case MACH_TYPE_NEO1973_GTA02:
/* FIXME: implementation */
break;
+#endif
}
/* we pull reset to low to make sure that the chip doesn't
* drain power through the reset line */
+#ifndef CONFIG_MACH_NEO1973_GTA02
s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
+#endif
return sysfs_create_group(&pdev->dev.kobj, >a01_bt_attr_group);
}
diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
index bf025a0..48f997e 100644
--- a/drivers/i2c/chips/pcf50633.c
+++ b/drivers/i2c/chips/pcf50633.c
@@ -319,6 +319,20 @@ static const u_int8_t regulator_registers[__NUM_PCF50633_REGULATORS] = {
[PCF50633_REGULATOR_HCLDO] = PCF50633_REG_HCLDOOUT,
};
+static const u_int8_t ena_regulator_registers[__NUM_PCF50633_REGULATORS] = {
+ [PCF50633_REGULATOR_AUTO] = PCF50633_REG_AUTOENA,
+ [PCF50633_REGULATOR_DOWN1] = PCF50633_REG_DOWN1ENA,
+ [PCF50633_REGULATOR_DOWN2] = PCF50633_REG_DOWN2ENA,
+ [PCF50633_REGULATOR_MEMLDO] = PCF50633_REG_MEMLDOENA,
+ [PCF50633_REGULATOR_LDO1] = PCF50633_REG_LDO1ENA,
+ [PCF50633_REGULATOR_LDO2] = PCF50633_REG_LDO2ENA,
+ [PCF50633_REGULATOR_LDO3] = PCF50633_REG_LDO3ENA,
+ [PCF50633_REGULATOR_LDO4] = PCF50633_REG_LDO4ENA,
+ [PCF50633_REGULATOR_LDO5] = PCF50633_REG_LDO5ENA,
+ [PCF50633_REGULATOR_LDO6] = PCF50633_REG_LDO6ENA,
+ [PCF50633_REGULATOR_HCLDO] = PCF50633_REG_HCLDOENA,
+};
+
int pcf50633_onoff_set(struct pcf50633_data *pcf,
enum pcf50633_regulator_id reg, int on)
{
@@ -401,6 +415,51 @@ int pcf50633_voltage_set(struct pcf50633_data *pcf,
}
EXPORT_SYMBOL_GPL(pcf50633_voltage_set);
+int pcf50633_ena_voltage(struct pcf50633_data *pcf,
+ enum pcf50633_regulator_id reg,
+ u_int8_t on)
+{
+ u_int8_t regnr;
+
+ DEBUGP("pcf=%p, reg=%d", pcf, reg);
+
+ if(reg >= __NUM_PCF50633_REGULATORS)
+ return -EINVAL;
+
+ regnr = ena_regulator_registers[reg];
+
+ switch(reg) {
+ case PCF50633_REGULATOR_AUTO:
+ case PCF50633_REGULATOR_DOWN1:
+ case PCF50633_REGULATOR_DOWN2:
+ case PCF50633_REGULATOR_LDO1:
+ case PCF50633_REGULATOR_LDO2:
+ case PCF50633_REGULATOR_LDO3:
+ case PCF50633_REGULATOR_LDO4:
+ case PCF50633_REGULATOR_LDO5:
+ case PCF50633_REGULATOR_LDO6:
+ case PCF50633_REGULATOR_HCLDO:
+ reg_write(pcf, regnr, on);
+ break;
+
+ default:
+ return -EINVAL;
+ }
+}
+EXPORT_SYMBOL_GPL(pcf50633_ena_voltage);
+
+void pcf50633_ldo4ena_set(struct pcf50633_data*pcf, u_int8_t val)
+{
+ reg_write(pcf,PCF50633_REG_LDO4ENA,val);
+}
+EXPORT_SYMBOL(pcf50633_ldo4ena_set);
+
+void pcf50633_ldo5ena_set(struct pcf50633_data*pcf, u_int8_t val)
+{
+ reg_write(pcf,PCF50633_REG_LDO5ENA,val);
+}
+EXPORT_SYMBOL(pcf50633_ldo5ena_set);
+
unsigned int pcf50633_voltage_get(struct pcf50633_data *pcf,
enum pcf50633_regulator_id reg)
{
diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
index 0bef3f6..49b25db 100644
--- a/include/linux/pcf50633.h
+++ b/include/linux/pcf50633.h
@@ -31,6 +31,12 @@ enum pcf50633_gpio {
};
extern void
+pcf50633_ldo4ena_set(struct pcf50633_data*pcf, u_int8_t val);
+
+extern void
+pcf50633_ldo5ena_set(struct pcf50633_data*pcf, u_int8_t val);
+
+extern void
pcf50633_gpio_set(struct pcf50633_data *pcf, enum pcf50633_gpio gpio, int on);
extern int
@@ -44,6 +50,11 @@ extern unsigned int
pcf50633_voltage_get(struct pcf50633_data *pcf,
enum pcf50633_regulator_id reg);
extern int
+pcf50633_ena_voltage(struct pcf50633_data *pcf,
+ enum pcf50633_regulator_id reg,
+ u_int8_t on);
+
+extern int
pcf50633_onoff_get(struct pcf50633_data *pcf,
enum pcf50633_regulator_id reg);
