From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabio.estevam@freescale.com (Fabio Estevam) Date: Wed, 19 Jan 2011 15:09:15 -0200 Subject: [PATCH] usb: gadget/fsl_mxc_udc: Detect the CPU type in run-time In-Reply-To: <4D37050E.6010009@eukrea.com> References: <1295451164-3363-1-git-send-email-fabio.estevam@freescale.com> <4D37050E.6010009@eukrea.com> Message-ID: <4D371ABB.7000608@freescale.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 1/19/2011 1:36 PM, Eric B?nard wrote: > Hi Fabio, > > On 19/01/2011 16:32, Fabio Estevam wrote: >> Instead of checking the CPU type in build-time, do it in run-time. >> >> Signed-off-by: Fabio Estevam >> --- >> drivers/usb/gadget/fsl_mxc_udc.c | 23 ++++++++++++----------- >> 1 files changed, 12 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c >> index 77b1eb5..167abe0 100644 >> --- a/drivers/usb/gadget/fsl_mxc_udc.c >> +++ b/drivers/usb/gadget/fsl_mxc_udc.c >> @@ -88,17 +88,18 @@ eenahb: >> void fsl_udc_clk_finalize(struct platform_device *pdev) >> { >> struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data; >> -#if defined(CONFIG_ARCH_MX35) >> - unsigned int v; >> - >> - /* workaround ENGcm09152 for i.MX35 */ >> - if (pdata->workaround& FLS_USB2_WORKAROUND_ENGCM09152) { >> - v = readl(MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + >> - USBPHYCTRL_OTGBASE_OFFSET)); >> - writel(v | USBPHYCTRL_EVDO, MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + >> - USBPHYCTRL_OTGBASE_OFFSET)); >> - } >> -#endif >> + if (cpu_is_mx35()) { >> + unsigned int v; >> + >> + /* workaround ENGcm09152 for i.MX35 */ >> + if (pdata->workaround& FLS_USB2_WORKAROUND_ENGCM09152) { >> + v = readl(MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + >> + USBPHYCTRL_OTGBASE_OFFSET)); >> + writel(v | USBPHYCTRL_EVDO, >> + MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + >> + USBPHYCTRL_OTGBASE_OFFSET)); >> + } >> + } >> > are you sure this compiles when MX35 is not selected ? Including #include fixes the build for a non- mx35 kernel. Would this be acceptable? If so, I can send v2. Regards, Fabio Estevam