[PATCH 2/3] usb/{gadget,host}: Remove dead CONFIG_CPU_PXA27x

Christian Dietrich qy03fugy at stud.informatik.uni-erlangen.de
Wed Jul 14 07:32:03 EDT 2010


CONFIG_CPU_PXA27x doesn't exist in Kconfig, therefore removing all
references for it from the source code.

Signed-off-by: Christian Dietrich <qy03fugy at stud.informatik.uni-erlangen.de>
---
 drivers/usb/gadget/pxa27x_udc.c |   16 ----------------
 drivers/usb/host/ohci-pxa27x.c  |    8 --------
 2 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 85b0d89..73783f5 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -2561,12 +2561,6 @@ static void pxa_udc_shutdown(struct platform_device *_dev)
 		udc_disable(udc);
 }
 
-#ifdef CONFIG_CPU_PXA27x
-extern void pxa27x_clear_otgph(void);
-#else
-#define pxa27x_clear_otgph()   do {} while (0)
-#endif
-
 #ifdef CONFIG_PM
 /**
  * pxa_udc_suspend - Suspend udc device
@@ -2625,16 +2619,6 @@ static int pxa_udc_resume(struct platform_device *_dev)
 	dplus_pullup(udc, udc->pullup_resume);
 	if (should_enable_udc(udc))
 		udc_enable(udc);
-	/*
-	 * We do not handle OTG yet.
-	 *
-	 * OTGPH bit is set when sleep mode is entered.
-	 * it indicates that OTG pad is retaining its state.
-	 * Upon exit from sleep mode and before clearing OTGPH,
-	 * Software must configure the USB OTG pad, UDC, and UHC
-	 * to the state they were in before entering sleep mode.
-	 */
-	pxa27x_clear_otgph();
 
 	return 0;
 }
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index a18debd..227bdf0 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -203,12 +203,6 @@ static inline void pxa27x_reset_hc(struct pxa27x_ohci *ohci)
 	__raw_writel(uhchr & ~UHCHR_FHR, ohci->mmio_base + UHCHR);
 }
 
-#ifdef CONFIG_CPU_PXA27x
-extern void pxa27x_clear_otgph(void);
-#else
-#define pxa27x_clear_otgph()	do {} while (0)
-#endif
-
 static int pxa27x_start_hc(struct pxa27x_ohci *ohci, struct device *dev)
 {
 	int retval = 0;
@@ -239,8 +233,6 @@ static int pxa27x_start_hc(struct pxa27x_ohci *ohci, struct device *dev)
 	__raw_writel(uhchr, ohci->mmio_base + UHCHR);
 	__raw_writel(UHCHIE_UPRIE | UHCHIE_RWIE, ohci->mmio_base + UHCHIE);
 
-	/* Clear any OTG Pin Hold */
-	pxa27x_clear_otgph();
 	return 0;
 }
 
-- 
1.7.0.4




More information about the linux-arm-kernel mailing list