Commit 29bb6afc authored by Eric Bénard's avatar Eric Bénard Committed by Sascha Hauer
Browse files

plat-mxc/ehci.c: fix compile breakage 



commits 2eb42d5c and
9e1dde33 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: default avatarEric Bénard <eric@eukrea.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 4e5cf41e

arch/arm/plat-mxc/ehci.c

+6 −6
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE