From 37d2b0bea0314d0947af19152898c1ca7fe736cc Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Wed, 13 May 2009 20:11:06 -0500 Subject: This patch adds the option to poll vbus status to the s3c24xx udc driver. Machines that do not route the USB vbus signal to a GPIO can use this mechanism as an alternate way for the udc driver to detect the usb connect/disconnect state, which is useful (for example) to enable the link up/down state to be determined for the g_ether gadget. Signed-off-by: Mike Westerhof --- arch/arm/plat-s3c24xx/include/plat/udc.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arch') diff --git a/arch/arm/plat-s3c24xx/include/plat/udc.h b/arch/arm/plat-s3c24xx/include/plat/udc.h index 546bb4008f4..763aeba628e 100644 --- a/arch/arm/plat-s3c24xx/include/plat/udc.h +++ b/arch/arm/plat-s3c24xx/include/plat/udc.h @@ -27,6 +27,7 @@ enum s3c2410_udc_cmd_e { struct s3c2410_udc_mach_info { void (*udc_command)(enum s3c2410_udc_cmd_e); void (*vbus_draw)(unsigned int ma); + int (*get_vbus_status)(void); unsigned int vbus_pin; unsigned char vbus_pin_inverted; }; -- cgit v1.2.3 From f16c3431a1a7510eb3504ec5d96677dd0fac4cd6 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Wed, 13 May 2009 20:15:54 -0500 Subject: Add a vbus polling function for use by the udc driver. Signed-off-by: Mike Westerhof --- arch/arm/mach-s3c2442/mach-gta02.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'arch') diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index d16e9d638c1..cb821cedcd0 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, }; -- cgit v1.2.3 From 44bf2b8856db1f5079a1a531f70bbd25cf4ed488 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Sun, 24 May 2009 15:19:58 +0400 Subject: gta01: fix jbt6k74 spi registration Without this jbt6k74 is not seen by the system and consequently display doesn't work with Qi. Rebasing to .28 introduced a regression (probably in a6af63e826b79ae1ba2d8cbfa66805cc2dfe367c) resulting in jbt6k74 no longer manageable by the kernel. This was unnoticed before because u-boot does its own LCM initialization. With Qi it resulted in a white screen. This patch is fixing it by making spi host bus number (unspecified, defaults to 0) and spi device (jbt6k74) bus number match. Signed-off-by: Paul Fertser --- arch/arm/mach-s3c2410/mach-gta01.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index bddba990a74..1fe3eef2257 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -775,7 +775,6 @@ static struct spi_board_info gta01_spi_board_info[] = { /* controller_data */ /* irq */ .max_speed_hz = 10 * 1000 * 1000, - .bus_num = 1, /* chip_select */ }, }; -- cgit v1.2.3 From 1afc4078b997ecad5fb4bedceb43ceeadbacdd6f Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Fri, 5 Jun 2009 00:10:08 +0400 Subject: GTA01: disable android wakelocks Enabling wakelocks leads to immediate suspend after resume. See ce6840da7184043a09dd57d4c201a32ef7b6c083 for clarifications. Signed-off-by: Paul Fertser --- arch/arm/configs/gta01_moredrivers_defconfig | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'arch') diff --git a/arch/arm/configs/gta01_moredrivers_defconfig b/arch/arm/configs/gta01_moredrivers_defconfig index b60ebfba3b8..2977572da97 100644 --- a/arch/arm/configs/gta01_moredrivers_defconfig +++ b/arch/arm/configs/gta01_moredrivers_defconfig @@ -1699,15 +1699,7 @@ CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y # CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set CONFIG_ANDROID_TIMED_GPIO=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_ANDROID_HAS_WAKELOCK=y -CONFIG_ANDROID_HAS_EARLYSUSPEND=y -CONFIG_ANDROID_WAKELOCK=y -CONFIG_ANDROID_USER_WAKELOCK=y -CONFIG_ANDROID_EARLYSUSPEND=y -# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set -CONFIG_ANDROID_CONSOLE_EARLYSUSPEND=y -# CONFIG_ANDROID_FB_EARLYSUSPEND is not set -CONFIG_ANDROID_POWER_ALARM=y +# CONFIG_ANDROID_WAKELOCK is not set CONFIG_ANDROID_PARANOID_NETWORK=y # -- cgit v1.2.3 From 23b564c9d22cc5e442361e632626d5f131c40752 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Fri, 5 Jun 2009 00:01:15 +0400 Subject: GTA01, GTA02: remove RTC_DEBUG from defconfigs This option is meant for debugging and is not any more of interest to ordinary users. Signed-off-by: Paul Fertser --- arch/arm/configs/gta01_moredrivers_defconfig | 2 +- arch/arm/configs/gta02_moredrivers_defconfig | 2 +- arch/arm/configs/gta02_packaging_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'arch') diff --git a/arch/arm/configs/gta01_moredrivers_defconfig b/arch/arm/configs/gta01_moredrivers_defconfig index 2977572da97..1f5883729dc 100644 --- a/arch/arm/configs/gta01_moredrivers_defconfig +++ b/arch/arm/configs/gta01_moredrivers_defconfig @@ -1610,7 +1610,7 @@ CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_DEBUG=y +# CONFIG_RTC_DEBUG is not set # # RTC interfaces diff --git a/arch/arm/configs/gta02_moredrivers_defconfig b/arch/arm/configs/gta02_moredrivers_defconfig index 1dbbbf63ce8..8d06cd6c70b 100644 --- a/arch/arm/configs/gta02_moredrivers_defconfig +++ b/arch/arm/configs/gta02_moredrivers_defconfig @@ -1694,7 +1694,7 @@ CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_DEBUG=y +# CONFIG_RTC_DEBUG is not set # # RTC interfaces diff --git a/arch/arm/configs/gta02_packaging_defconfig b/arch/arm/configs/gta02_packaging_defconfig index 237fd959510..dfdfb19a2f1 100644 --- a/arch/arm/configs/gta02_packaging_defconfig +++ b/arch/arm/configs/gta02_packaging_defconfig @@ -1697,7 +1697,7 @@ CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_DEBUG=y +# CONFIG_RTC_DEBUG is not set # # RTC interfaces -- cgit v1.2.3