ARM: imx: fix ehci-mxc build.
Subsystems (3)
PATCH 1/1 ARM: imx: fix ehci-mxc build.
The ehci-mxc.c is broken by commit:65fd42724aee31018b0bb53f4cb04971423be664
CHK include/linux/version.h
CHK include/generated/utsrelease.h
make[1]: `include/generated/mach-types.h' is up to date.
CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC drivers/serial/imx.o LD drivers/serial/built-in.o CC drivers/usb/host/ehci-hcd.o
In file included from drivers/usb/host/ehci-hcd.c:1165:drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first use in this function) drivers/usb/host/ehci-mxc.c:192: error: (Each undeclared identifier is reported only once drivers/usb/host/ehci-mxc.c:192: error: for each function it appears in.) drivers/usb/host/ehci-mxc.c:117: warning: unused variable 'temp'
make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1
make[2]: *** [drivers/usb/host] Error 2
make[1]: *** [drivers/usb] Error 2
make: *** [drivers] Error 2
This patch is fix this by reuse old code.
--- drivers/usb/host/ehci-mxc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/usb/host/ehci-mxc.c +4 -2
@@ -1,6 +1,7 @@/* * Copyright (c) 2008 Sascha Hauer <[email protected]>, Pengutronix * Copyright (c) 2009 Daniel Mack <[email protected]> +* Copyright (c) 2010 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the
@@ -26,6 +27,7 @@#include <mach/mxc_ehci.h> #define ULPI_VIEWPORT_OFFSET 0x170 +#define PORTSC_OFFSET 0x184struct ehci_mxc_priv {struct clk *usbclk, *ahbclk;
@@ -114,7 +116,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;struct usb_hcd *hcd;struct resource *res; -int irq, ret, temp; +int irq, ret;struct ehci_mxc_priv *priv;struct device *dev = &pdev->dev;
@@ -189,7 +191,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) }/* set up the PORTSCx register */ -ehci_writel (ehci, pdata->portsc, &ehci->regs->port_status[0 ]); +writel (pdata->portsc, hcd->regs +PORTSC_OFFSET );mdelay (10 );/* setup specific usb hw */
Signature · 1 line
1.6.3.3
PATCH 1/1 ARM: imx: fix ehci-mxc build.
Hi Jiejing,
Quoted 34 lines · Zhang Jiejing
From: Zhang Jiejing <[email protected]>
Subject: [PATCH] ARM: imx: fix ehci-mxc build.
To: linux-arm-kernel at lists.infradead.org
Cc: "Liu Hui" <[email protected]>, "Sascha Hauer" <[email protected]>, "Zhang Jiejing" <[email protected]>, "Daniel Mack" <[email protected]>, "Matthieu CASTET" <[email protected]>
Date: Tuesday, November 16, 2010, 11:57 PM
Theehci-mxc.cis broken by commit:65fd42724aee31018b0bb53f4cb04971423be664? CHK? ???include/linux/version.h
? CHK?
???include/generated/utsrelease.h
make[1]: `include/generated/mach-types.h' is up to date. ? CALL? ?scripts/checksyscalls.sh
? CHK?
???include/generated/compile.h
? CC? ? ?drivers/serial/imx.o
? LD? ? ?drivers/serial/built-in.o
? CC? ? ?drivers/usb/host/ehci-hcd.o
In file included fromdrivers/usb/host/ehci-hcd.c:1165:drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first use in this function)drivers/usb/host/ehci-mxc.c:192: error: (Each undeclared identifier is reported only oncedrivers/usb/host/ehci-mxc.c:192: error: for each function it appears in.)drivers/usb/host/ehci-mxc.c:117: warning: unused variable 'temp'
make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1 make[2]: *** [drivers/usb/host] Error 2
make[1]: *** [drivers/usb] Error 2
make: *** [drivers] Error 2
Quoted 1 line
This patch is fix this by reuse old code.
Uwe has already sent a fix for this issue: http://git.pengutronix.de/?p=imx/linux-2.6.git;a=commitdiff;h=1cbc09fe2e64ccfb33a4d0e85c46c90a9167a53c
Regards,
Fabio Estevam
PATCH 1/1 ARM: imx: fix ehci-mxc build.
Quoted 38 lines · Fabio Estevam
Hi Jiejing,
Quoted 34 lines · Zhang Jiejing
From: Zhang Jiejing <[email protected]>
Subject: [PATCH] ARM: imx: fix ehci-mxc build.
To: linux-arm-kernel at lists.infradead.org
Cc: "Liu Hui" <[email protected]>, "Sascha Hauer" <[email protected]>, "Zhang Jiejing" <[email protected]>, "Daniel Mack" <[email protected]>, "Matthieu CASTET" <[email protected]>
Date: Tuesday, November 16, 2010, 11:57 PM
Theehci-mxc.cis broken by commit:65fd42724aee31018b0bb53f4cb04971423be664? CHK? ???include/linux/version.h
? CHK?
???include/generated/utsrelease.h
make[1]: `include/generated/mach-types.h' is up to date. ? CALL? ?scripts/checksyscalls.sh
? CHK?
???include/generated/compile.h
? CC? ? ?drivers/serial/imx.o
? LD? ? ?drivers/serial/built-in.o
? CC? ? ?drivers/usb/host/ehci-hcd.o
In file included fromdrivers/usb/host/ehci-hcd.c:1165:drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first use in this function)drivers/usb/host/ehci-mxc.c:192: error: (Each undeclared identifier is reported only oncedrivers/usb/host/ehci-mxc.c:192: error: for each function it appears in.)drivers/usb/host/ehci-mxc.c:117: warning: unused variable 'temp'
make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1 make[2]: *** [drivers/usb/host] Error 2
make[1]: *** [drivers/usb] Error 2
make: *** [drivers] Error 2
Quoted 3 lines
Quoted 1 line
This patch is fix this by reuse old code.
Uwe has already sent a fix for this issue: http://git.pengutronix.de/?p=imx/linux-2.6.git;a=commitdiff;h=1cbc09fe2e64ccfb33a4d0e85c46c90a9167a53c
In the meantime gregkh has taken the fix (e.g 724c85251f78f1332e0a28f80cead0cee5b7c906 in current next)
(BTW, your colleague Nguyen Dinh-R00091 tested that patch :-)
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 1/1 ARM: imx: fix ehci-mxc build.
In reply to Zhang JiejingHi,
Quoted 1 line
+ * Copyright (c) 2010 Freescale Semiconductor, Inc.
Copyright additions are usually only added for significant changes.
Regards,
Wolfram
Signature · 9 lines
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101117/4a705c49/attachment.sig>
PATCH 1/1 ARM: imx: fix ehci-mxc build.
Hi,
Got it, since Uwe already fixed in a better way, I drop this patch.
Thanks for your review.
Best regards,
Zhang Jiejing
2010/11/17 Wolfram Sang <[email protected]>
Quoted 22 lines
Hi,
Quoted 1 line
+ * Copyright (c) 2010 Freescale Semiconductor, Inc.
Copyright additions are usually only added for significant changes.
Regards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)iEYEARECAAYFAkzjjIgACgkQD27XaX1/VRsjIQCfX4gim+vB83MmQLuBQk4GAkWo FqMAoMQeIHsEwZJae45hvwqSoGQrRBDO
=CCHm
-----END PGP SIGNATURE-----
Quoted 6 lines
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101117/fc7e2d45/attachment-0001.html>