diff options
| author | Andy Green <andy@openmoko.com> | 2009-01-27 14:39:18 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-27 14:39:18 +0000 |
| commit | b68e19ab0a3704aeb9eefdff1bbe0692a5c248b2 (patch) | |
| tree | e823f06c43c30c5e3586db7cd0b427d9b6c1b41a /drivers/misc | |
| parent | b23d50393d1817cd082e0b2d91b7467026800faf (diff) | |
tracking-2.6.29-rc2-soc-card-vs-machine-struct.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/neo1973_pm_host.c | 14 | ||||
| -rw-r--r-- | drivers/misc/neo1973_pm_resume_reason.c | 6 |
2 files changed, 14 insertions, 6 deletions
diff --git a/drivers/misc/neo1973_pm_host.c b/drivers/misc/neo1973_pm_host.c index bb25acdb7d2..b82a29c3830 100644 --- a/drivers/misc/neo1973_pm_host.c +++ b/drivers/misc/neo1973_pm_host.c @@ -21,21 +21,29 @@ #ifdef CONFIG_MACH_NEO1973_GTA02 #include <mach/gta02.h> -#include <linux/pcf50633.h> +#include <linux/mfd/pcf50633/gpio.h> static ssize_t pm_host_read(struct device *dev, struct device_attribute *attr, char *buf) { return sprintf(buf, "%d\n", - pcf50633_gpio_get(pcf50633_global, PCF50633_GPO)); + pcf50633_gpio_get(gta02_pcf, PCF50633_GPO) + == PCF50633_GPOCFG_GPOSEL_1); } static ssize_t pm_host_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { unsigned long on = simple_strtoul(buf, NULL, 10); + u8 val; - pcf50633_gpio_set(pcf50633_global, PCF50633_GPO, on); + if (on) + val = PCF50633_GPOCFG_GPOSEL_1; + else + val = PCF50633_GPOCFG_GPOSEL_0; + + + pcf50633_gpio_set(gta02_pcf, PCF50633_GPO, val); return count; } diff --git a/drivers/misc/neo1973_pm_resume_reason.c b/drivers/misc/neo1973_pm_resume_reason.c index c7730b60da9..62984a50a0a 100644 --- a/drivers/misc/neo1973_pm_resume_reason.c +++ b/drivers/misc/neo1973_pm_resume_reason.c @@ -22,7 +22,7 @@ #ifdef CONFIG_MACH_NEO1973_GTA02 #include <mach/gta02.h> -#include <linux/pcf50633.h> +#include <linux/mfd/pcf50633/core.h> #endif static unsigned int *gstatus4_mapped; @@ -79,8 +79,8 @@ static ssize_t resume_reason_read(struct device *dev, end += sprintf(end, " %s\n", resume_reasons[gta][bit]); #ifdef CONFIG_MACH_NEO1973_GTA02 - if ((gta) && (bit == 9)) /* PMU */ - end += pcf50633_report_resumers(pcf50633_global, end); + if ((gta) && (bit == 9)); /* PMU */ +// end += pcf50633_report_resumers(gta02_pcf_pdata.pcf, end); #endif } |