plat-mxc/ehci.c: fix compile breakage
Subsystems (4)
PATCH 1/1 plat-mxc/ehci.c: fix compile breakage
commits 2eb42d5c287f5e883a4b3ebe668ba880caa351e5 and 9e1dde33876ba83ad586c336647fff133d0f5472 renamed some defines but didn't fix all the places where these defines are used leading to a compile failure for USB on i.MX31, 35 and 27.
Signed-off-by Eric B?nard <[email protected]>
--- arch/arm/plat-mxc/ehci.c | 12 ++++++------ drivers/usb/gadget/fsl_mxc_udc.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/plat-mxc/ehci.c +6 -6
@@ -115,7 +115,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)#endif /* if defined(CONFIG_SOC_IMX25) */ #if defined(CONFIG_ARCH_MX3 )if (cpu_is_mx31 ()) { - v =readl (MX31_IO_ADDRESS (MX31_OTG_BASE_ADDR + + v =readl (MX31_IO_ADDRESS (MX31_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));switch (port) {
@@ -153,13 +153,13 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)return -EINVAL ; } -writel (v,MX31_IO_ADDRESS (MX31_OTG_BASE_ADDR + +writel (v,MX31_IO_ADDRESS (MX31_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));return 0 ; }if (cpu_is_mx35 ()) { - v =readl (MX35_IO_ADDRESS (MX35_OTG_BASE_ADDR + + v =readl (MX35_IO_ADDRESS (MX35_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));switch (port) {
@@ -196,7 +196,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)return -EINVAL ; } -writel (v,MX35_IO_ADDRESS (MX35_OTG_BASE_ADDR + +writel (v,MX35_IO_ADDRESS (MX35_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));return 0 ; }
@@ -206,7 +206,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)/* On i.MX27 we can use the i.MX31 USBCTRL bits, they * are identical */ - v =readl (MX27_IO_ADDRESS (MX27_OTG_BASE_ADDR + + v =readl (MX27_IO_ADDRESS (MX27_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));switch (port) {case 0 :/* OTG port */
@@ -241,7 +241,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)default :return -EINVAL ; } -writel (v,MX27_IO_ADDRESS (MX27_OTG_BASE_ADDR + +writel (v,MX27_IO_ADDRESS (MX27_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));return 0 ; }
drivers/usb/gadget/fsl_mxc_udc.c +2 -2
@@ -93,9 +93,9 @@ void fsl_udc_clk_finalize(struct platform_device *pdev)/* workaround ENGcm09152 for i.MX35 */ if (pdata->workaround &FLS_USB2_WORKAROUND_ENGCM09152 ) { - v =readl (MX35_IO_ADDRESS (MX35_OTG_BASE_ADDR + + v =readl (MX35_IO_ADDRESS (MX35_USB_BASE_ADDR +USBPHYCTRL_OTGBASE_OFFSET )); -writel (v |USBPHYCTRL_EVDO ,MX35_IO_ADDRESS (MX35_OTG_BASE_ADDR + +writel (v |USBPHYCTRL_EVDO ,MX35_IO_ADDRESS (MX35_USB_BASE_ADDR +USBPHYCTRL_OTGBASE_OFFSET )); }#endif
Signature · 1 line
1.7.3.2
PATCH 1/1 plat-mxc/ehci.c: fix compile breakage
Quoted 6 lines · Eric B?nard
commits
2eb42d5c287f5e883a4b3ebe668ba880caa351e5and9e1dde33876ba83ad586c336647fff133d0f5472renamed some defines but didn't fix all the places where these defines are used leading to a compile failure for USB on i.MX31, 35 and 27.Signed-off-by Eric B?nard <[email protected]>
grml, it seems the defconfigs I test with have support for ehci and usb-gadget disabled. :-|
You probably need to split your patch.
Other than that
Acked-by Uwe Kleine-K?nig <[email protected]>
and thanks
Uwe
Quoted 85 lines
--- arch/arm/plat-mxc/ehci.c | 12 ++++++------ drivers/usb/gadget/fsl_mxc_udc.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)arch/arm/plat-mxc/ehci.c +6
-6@@ -115,7 +115,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)#endif /* if defined(CONFIG_SOC_IMX25) */ #if defined(CONFIG_ARCH_MX3 )if (cpu_is_mx31 ()) { - v =readl (MX31_IO_ADDRESS (MX31_OTG_BASE_ADDR + + v =readl (MX31_IO_ADDRESS (MX31_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));switch (port) {@@ -153,13 +153,13 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)return -EINVAL ; } -writel (v,MX31_IO_ADDRESS (MX31_OTG_BASE_ADDR + +writel (v,MX31_IO_ADDRESS (MX31_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));return 0 ; }if (cpu_is_mx35 ()) { - v =readl (MX35_IO_ADDRESS (MX35_OTG_BASE_ADDR + + v =readl (MX35_IO_ADDRESS (MX35_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));switch (port) {@@ -196,7 +196,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)return -EINVAL ; } -writel (v,MX35_IO_ADDRESS (MX35_OTG_BASE_ADDR + +writel (v,MX35_IO_ADDRESS (MX35_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));return 0 ; }@@ -206,7 +206,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)/* On i.MX27 we can use the i.MX31 USBCTRL bits, they * are identical */ - v =readl (MX27_IO_ADDRESS (MX27_OTG_BASE_ADDR + + v =readl (MX27_IO_ADDRESS (MX27_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));switch (port) {case 0 :/* OTG port */ @@ -241,7 +241,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)default :return -EINVAL ; } -writel (v,MX27_IO_ADDRESS (MX27_OTG_BASE_ADDR + +writel (v,MX27_IO_ADDRESS (MX27_USB_BASE_ADDR +USBCTRL_OTGBASE_OFFSET ));return 0 ; }drivers/usb/gadget/fsl_mxc_udc.c +2
-2@@ -93,9 +93,9 @@ void fsl_udc_clk_finalize(struct platform_device *pdev)/* workaround ENGcm09152 for i.MX35 */ if (pdata->workaround &FLS_USB2_WORKAROUND_ENGCM09152 ) { - v =readl (MX35_IO_ADDRESS (MX35_OTG_BASE_ADDR + + v =readl (MX35_IO_ADDRESS (MX35_USB_BASE_ADDR +USBPHYCTRL_OTGBASE_OFFSET )); -writel (v |USBPHYCTRL_EVDO ,MX35_IO_ADDRESS (MX35_OTG_BASE_ADDR + +writel (v |USBPHYCTRL_EVDO ,MX35_IO_ADDRESS (MX35_USB_BASE_ADDR +USBPHYCTRL_OTGBASE_OFFSET )); }#endif Signature · 7 lines
1.7.3.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |