Skip to contentSkip to conversation

usb: ehci-omap: Fix build break

PATCH In review Olof Johansson 2 participants 2 messages Sep 22, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: ehci-omap: Fix build break

Fix build break:

CC drivers/usb/host/ehci-hcd.o
In file included from drivers/usb/host/ehci-hcd.c:1101:
drivers/usb/host/ehci-omap.c: In function 'omap_start_ehc':
drivers/usb/host/ehci-omap.c:238: error: 'CHIP_GE_OMAP3430ES3' undeclared (first use in this function) drivers/usb/host/ehci-omap.c:238: error: (Each undeclared identifier is reported only once drivers/usb/host/ehci-omap.c:238: error: for each function it appears in.)
make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1

No reference to CHIP_GE_OMAP3430ES3 anywhere else, I'm assuming it's ES3_1 that's supposed to be used.

drivers/usb/host/ehci-omap.c +1 -1
index f77a99d..301e7b6 100644
@@ -235,7 +235,7 @@ static void omap_usb_utmi_init(struct ehci_hcd_omap *omap, u8 tll_channel_mask)
  */
 static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
 {
-	struct omap_chip_id oci = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES3);
+	struct omap_chip_id oci = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES3_1);
 	unsigned long timeout = jiffies + msecs_to_jiffies(1000);
 	u8 tll_ch_mask = 0;
 	unsigned reg = 0;
#1 lore raw
Quoted 11 lines · Olof Johansson

Fix build break:

CC drivers/usb/host/ehci-hcd.o
In file included from drivers/usb/host/ehci-hcd.c:1101:
drivers/usb/host/ehci-omap.c: In function 'omap_start_ehc':
drivers/usb/host/ehci-omap.c:238: error: 'CHIP_GE_OMAP3430ES3' undeclared (first use in this function) drivers/usb/host/ehci-omap.c:238: error: (Each undeclared identifier is reported only once drivers/usb/host/ehci-omap.c:238: error: for each function it appears in.)
make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1

Quoted 2 lines

No reference to CHIP_GE_OMAP3430ES3 anywhere else, I'm assuming it's ES3_1 that's supposed to be used.

I'm dropping the "ehci: Support for ES3.x" patch instead for now until it's fixed to use the omap_rev().

So this should not be needed.

Tony

Quoted 15 lines
drivers/usb/host/ehci-omap.c +1 -1
index f77a99d..301e7b6 100644
@@ -235,7 +235,7 @@ static void omap_usb_utmi_init(struct ehci_hcd_omap *omap, u8 tll_channel_mask)
  */
 static int omap_start_ehc(struct ehci_hcd_omap *omap, struct usb_hcd *hcd)
 {
-	struct omap_chip_id oci = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES3);
+	struct omap_chip_id oci = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES3_1);
 	unsigned long timeout = jiffies + msecs_to_jiffies(1000);
 	u8 tll_ch_mask = 0;
 	unsigned reg = 0;