From f0ec0ae82cd39799a2b00bcafc9cfb976c53a456 Mon Sep 17 00:00:00 2001 From: wlf Date: Sat, 23 Mar 2013 16:30:55 +0800 Subject: [PATCH] RK3188: wakeup system by OTG BVALID interrupt in defconfig --- arch/arm/plat-rk/Kconfig | 2 +- arch/arm/plat-rk/include/plat/board.h | 2 +- arch/arm/plat-rk/usb_detect.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-rk/Kconfig b/arch/arm/plat-rk/Kconfig index 88f3964b6136..8981798b1fd5 100755 --- a/arch/arm/plat-rk/Kconfig +++ b/arch/arm/plat-rk/Kconfig @@ -210,6 +210,6 @@ config RK_TIMER config RK_USB_DETECT_BY_OTG_BVALID bool "Wakeup system by OTG BVALID interrupt when USB OTG conneted" depends on USB_GADGET && (ARCH_RK2928 || ARCH_RK3188) - default y if ARCH_RK2928 + default y if ARCH_RK2928 || ARCH_RK3188 endif diff --git a/arch/arm/plat-rk/include/plat/board.h b/arch/arm/plat-rk/include/plat/board.h index a4839c1695ee..5a7bad299fc0 100755 --- a/arch/arm/plat-rk/include/plat/board.h +++ b/arch/arm/plat-rk/include/plat/board.h @@ -477,7 +477,7 @@ struct rk_hdmi_platform_data { int board_boot_mode(void); /* for USB detection */ -#ifdef CONFIG_USB_GADGET +#if defined(CONFIG_USB_GADGET) && !defined(CONFIG_RK_USB_DETECT_BY_OTG_BVALID) int __init board_usb_detect_init(unsigned gpio); #else static int inline board_usb_detect_init(unsigned gpio) { return 0; } diff --git a/arch/arm/plat-rk/usb_detect.c b/arch/arm/plat-rk/usb_detect.c index b40b020a94de..2671071a3f6b 100755 --- a/arch/arm/plat-rk/usb_detect.c +++ b/arch/arm/plat-rk/usb_detect.c @@ -37,6 +37,7 @@ static irqreturn_t usb_detect_irq_handler(int irq, void *dev_id) return IRQ_HANDLED; } +#ifndef CONFIG_RK_USB_DETECT_BY_OTG_BVALID int __init board_usb_detect_init(unsigned gpio) { int ret; @@ -75,6 +76,7 @@ int __init board_usb_detect_init(unsigned gpio) return 0; } +#endif #ifdef IRQ_OTG_BVALID #include -- 2.34.1