diff options
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gta02.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 17 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gps.c | 2 | ||||
| -rw-r--r-- | include/linux/mfd/pcf50633/mbc.h | 3 |
4 files changed, 18 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/gta02.h b/arch/arm/mach-s3c2410/include/mach/gta02.h index 68f853ec2ac..ef0b1843dce 100644 --- a/arch/arm/mach-s3c2410/include/mach/gta02.h +++ b/arch/arm/mach-s3c2410/include/mach/gta02.h @@ -106,4 +106,6 @@ int gta02_get_pcb_revision(void); +extern struct pcf50633 *gta02_pcf; + #endif /* _GTA02_H */ diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 0b7ff25f8fb..5b537f70d56 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -99,6 +99,9 @@ #include <../drivers/input/touchscreen/ts_filter_group.h> #include <linux/mfd/pcf50633/core.h> +#include <linux/mfd/pcf50633/gpio.h> +#include <linux/mfd/pcf50633/mbc.h> +#include <linux/pcf506xx.h> /* arbitrates which sensor IRQ owns the shared SPI bus */ static spinlock_t motion_irq_lock; @@ -524,7 +527,7 @@ gta02_configure_pmu_for_charger(struct pcf50633 *pcf, void *unused, int res) static int pmu_callback(struct device *dev, unsigned int feature, enum pmu_event event) { - struct pcf50633 *pcf = gta02_pcf_pdata.pcf; + struct pcf50633 *pcf = gta02_pcf; if (gta02_usb_vbus_draw) { pcf50633_mbc_usb_curlim_set(pcf, gta02_usb_vbus_draw); @@ -1016,10 +1019,8 @@ static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd) static void gta02_udc_vbus_draw(unsigned int ma) { - if (!gta02_pcf_pdata.pcf) { - printk(KERN_ERR "********** NULL gta02_pcf_pdata.pcf *****\n"); + if (!gta02_pcf) return; - } gta02_usb_vbus_draw = ma; @@ -1728,6 +1729,12 @@ static void gta02_pcf50633_attach_child_devices(struct device *parent_device) { int n; + gta02_pcf = pcf; + + gta02_pcf = pcf; + + gta02_pcf = pcf; + for (n = 0; n < ARRAY_SIZE(gta02_devices_pmu_children); n++) gta02_devices_pmu_children[n]->dev.parent = parent_device; @@ -1738,7 +1745,7 @@ static void gta02_pcf50633_attach_child_devices(struct device *parent_device) static void gta02_poweroff(void) { - pcf50633_reg_set_bit_mask(gta02_pcf_pdata.pcf, PCF50633_REG_OOCSHDWN, + pcf50633_reg_set_bit_mask(gta02_pcf, PCF50633_REG_OOCSHDWN, PCF50633_OOCSHDWN_GOSTDBY, PCF50633_OOCSHDWN_GOSTDBY); } diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c index 3124897efd4..3db733c86f4 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c @@ -33,6 +33,8 @@ #include <linux/regulator/consumer.h> +#include <linux/err.h> + struct neo1973_pm_gps_data { int power_was_on; struct regulator *regulator; diff --git a/include/linux/mfd/pcf50633/mbc.h b/include/linux/mfd/pcf50633/mbc.h index fb1c3d7750d..247c7d12785 100644 --- a/include/linux/mfd/pcf50633/mbc.h +++ b/include/linux/mfd/pcf50633/mbc.h @@ -129,7 +129,7 @@ int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma); int pcf50633_mbc_get_status(struct pcf50633 *); void pcf50633_mbc_set_status(struct pcf50633 *, int what, int status); - +#if 0 struct power_supply ac; struct power_supply usb; struct power_supply adapter; @@ -139,4 +139,5 @@ void pcf50633_mbc_set_status(struct pcf50633 *, int what, int status); struct platform_device *pdev; }; #endif +#endif |