Changeset 2118

Timestamp:

06/02/07 01:07:41 (6 years ago)

Author:

laforge

Message:

fix bluetooth power-up routine (make sure device reset is used correctly)

File:

• trunk/src/target/kernel/patches/gta01-power_control.patch (modified) (9 diffs)

trunk/src/target/kernel/patches/gta01-power_control.patch

@@ -1 @@
-Index: linux-2.6.21-moko/arch/arm/common/Makefile
+Index: linux-2.6.21.3-moko/arch/arm/common/Makefile
 ===================================================================
---- linux-2.6.21-moko.orig/arch/arm/common/Makefile
-+++ linux-2.6.21-moko/arch/arm/common/Makefile
+--- linux-2.6.21.3-moko.orig/arch/arm/common/Makefile
++++ linux-2.6.21.3-moko/arch/arm/common/Makefile
 @@ -17,3 +17,4 @@
  obj-$(CONFIG_SHARP_SCOOP)      += scoop.o
@@ -8 +8 @@
  obj-$(CONFIG_ARCH_IXP23XX)     += uengine.o
 +obj-$(CONFIG_MACH_NEO1973_GTA01)+= gta01_pm_gsm.o gta01_pm_gps.o gta01_pm_bt.o
-Index: linux-2.6.21-moko/arch/arm/common/gta01_pm_gps.c
+Index: linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gps.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21-moko/arch/arm/common/gta01_pm_gps.c
++++ linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gps.c
 @@ -0,0 +1,558 @@
 +/*
@@ -571 +571 @@
 +MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
 +MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GPS Power Management");
-Index: linux-2.6.21-moko/arch/arm/common/gta01_pm_gsm.c
+Index: linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gsm.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21-moko/arch/arm/common/gta01_pm_gsm.c
++++ linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gsm.c
 @@ -0,0 +1,217 @@
 +/*
@@ -793 +793 @@
 +MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
 +MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GSM Management");
-Index: linux-2.6.21-moko/arch/arm/common/gta01_pm_bt.c
+Index: linux-2.6.21.3-moko/arch/arm/common/gta01_pm_bt.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21-moko/arch/arm/common/gta01_pm_bt.c
-@@ -0,0 +1,140 @@
++++ linux-2.6.21.3-moko/arch/arm/common/gta01_pm_bt.c
+@@ -0,0 +1,154 @@
 +/*
 + * Bluetooth PM code for the FIC Neo1973 GSM Phone
@@ -833 +833 @@
 +                       goto out_1;
 +       } else if (!strcmp(attr->attr.name, "reset")) {
-+               if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN))
++               if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
 +                       goto out_1;
 +       }
@@ -848 +848 @@
 +
 +       if (!strcmp(attr->attr.name, "power_on")) {
-+               if (on)
++               /* if we are powering up, assert reset, then power, then
++                * release reset */
++               if (on) {
++                       s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
 +                       pcf50606_voltage_set(pcf50606_global,
 +                                            PCF50606_REGULATOR_D1REG,
 +                                            3100);
++               }
 +               pcf50606_onoff_set(pcf50606_global,
 +                                  PCF50606_REGULATOR_D1REG, on);
++               s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
 +       } else if (!strcmp(attr->attr.name, "reset")) {
-+               s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
++               /* reset is low-active, so we need to invert */
++               s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1 );
 +       }
 +
@@ -868 +874 @@
 +{
 +       dev_info(&pdev->dev, DRVMSG ": suspending\n");
-+       /* FIXME */
++       /* FIXME: The PMU should save the PMU status, and the GPIO code should
++        * preserve the GPIO level, so there shouldn't be anything left to do
++        * for us, should there? */
 +
 +       return 0;
@@ -876 +884 @@
 +{
 +       dev_info(&pdev->dev, DRVMSG ": resuming\n");
-+       /* FIXME */
 +
 +       return 0;
@@ -899 +906 @@
 +{
 +       dev_info(&pdev->dev, DRVMSG ": starting\n");
++
++       /* 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);
 +
 +       return sysfs_create_group(&pdev->dev.kobj, &gta01_bt_attr_group);