diff options
author | Thomas White <taw27@cam.ac.uk> | 2009-06-08 14:44:14 +0100 |
---|---|---|
committer | Thomas White <taw27@cam.ac.uk> | 2009-06-08 14:44:14 +0100 |
commit | 3a83621f0e6a52eff7402702b0774092cc7b0187 (patch) | |
tree | 0962d7359b5b15176a87d03b80be7ba70e252313 /arch/arm/mach-s3c2442 | |
parent | 6e278419626d23b3c15e4cb0ee3b56ce4ab99f87 (diff) | |
parent | 23b564c9d22cc5e442361e632626d5f131c40752 (diff) |
Merge branch 'andy-tracking' into drm-tracking
Diffstat (limited to 'arch/arm/mach-s3c2442')
-rw-r--r-- | arch/arm/mach-s3c2442/mach-gta02.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index 072abd56759..e7a5f0a55a1 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -476,11 +476,22 @@ static void gta02_udc_vbus_draw(unsigned int ma) schedule_delayed_work(>a02_charger_work, GTA02_CHARGER_CONFIGURE_TIMEOUT); } + +static int gta02_udc_vbus_status(void) +{ + struct pcf50633 *pcf = gta02_pcf; + + if (!gta02_pcf) + return -ENODEV; + + return !!(pcf50633_mbc_get_status(pcf) & PCF50633_MBC_USB_ONLINE); +} #else /* !CONFIG_CHARGER_PCF50633 */ #define gta02_get_charger_online_status NULL #define gta02_get_charger_active_status NULL #define gta02_pmu_event_callback NULL #define gta02_udc_vbus_draw NULL +#define gta02_udc_vbus_status NULL #endif static struct platform_device gta01_pm_gps_dev = { @@ -954,6 +965,7 @@ static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd) static struct s3c2410_udc_mach_info gta02_udc_cfg = { .vbus_draw = gta02_udc_vbus_draw, .udc_command = gta02_udc_command, + .get_vbus_status= gta02_udc_vbus_status, }; |