From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 21 Aug 2012 01:08:32 +0000 (+0800)
Subject: rk2928: usb_detect: mark bvalid_init as __init, clear bvalid irq when init
X-Git-Tag: firefly_0821_release~8886^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=62669068b886d34771cd13a19f4517ab2ab8d4a6;p=firefly-linux-kernel-4.4.55.git

rk2928: usb_detect: mark bvalid_init as __init, clear bvalid irq when init
---

diff --git a/arch/arm/plat-rk/usb_detect.c b/arch/arm/plat-rk/usb_detect.c
index 411b0dd5aa6d..40a46884d036 100644
--- a/arch/arm/plat-rk/usb_detect.c
+++ b/arch/arm/plat-rk/usb_detect.c
@@ -91,7 +91,7 @@ static irqreturn_t bvalid_irq_handler(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static int bvalid_init(void)
+static int __init bvalid_init(void)
 {
 	int ret;
 	int irq = IRQ_OTG_BVALID;
@@ -112,9 +112,9 @@ static int bvalid_init(void)
 		return ret;
 	}
 
-	/* enable bvalid irq */
+	/* clear & enable bvalid irq */
 #ifdef CONFIG_ARCH_RK2928
-	writel_relaxed((1 << 30) | (1 << 14), RK2928_GRF_BASE + GRF_UOC0_CON5);
+	writel_relaxed((3 << 30) | (3 << 14), RK2928_GRF_BASE + GRF_UOC0_CON5);
 #endif
 
 	enable_irq_wake(irq);