diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-23 13:11:29 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-30 12:47:15 +0200 |
| commit | 1e8c05e402db8de75e3169e53bb9747df7dffa61 (patch) | |
| tree | bf05f690a55b8e1ddfdf9d6c9f7f4d9962248106 /arch | |
| parent | a6e358b2f5b219fda18a7bc9348cb969043c19d5 (diff) | |
| download | barebox-1e8c05e402db8de75e3169e53bb9747df7dffa61.tar.gz barebox-1e8c05e402db8de75e3169e53bb9747df7dffa61.tar.xz | |
ARM i.MX23 usb: move to SoC specific functions
Makes space for a i.MX28 specific USBPHY implementation.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/chumby_falconwing/falconwing.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/usb.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/usb-imx23.c (renamed from arch/arm/mach-mxs/usb.c) | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c index 38f28be9c5..b40713d33b 100644 --- a/arch/arm/boards/chumby_falconwing/falconwing.c +++ b/arch/arm/boards/chumby_falconwing/falconwing.c @@ -316,7 +316,7 @@ static void falconwing_init_usb(void) /* bring USB hub out of reset */ gpio_direction_output(GPIO_USB_HUB_RESET, 1); - imx_usb_phy_enable(); + imx23_usb_phy_enable(); add_generic_usb_ehci_device(-1, IMX_USB_BASE, NULL); } diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile index 172d928128..1ba00f1d43 100644 --- a/arch/arm/mach-mxs/Makefile +++ b/arch/arm/mach-mxs/Makefile @@ -1,5 +1,5 @@ obj-y += imx.o iomux-imx.o reset-imx.o obj-$(CONFIG_DRIVER_VIDEO_STM) += imx_lcd_clk.o -obj-$(CONFIG_ARCH_IMX23) += speed-imx23.o clocksource-imx23.o usb.o +obj-$(CONFIG_ARCH_IMX23) += speed-imx23.o clocksource-imx23.o usb-imx23.o obj-$(CONFIG_ARCH_IMX28) += speed-imx28.o clocksource-imx28.o obj-$(CONFIG_MXS_OCOTP) += ocotp.o diff --git a/arch/arm/mach-mxs/include/mach/usb.h b/arch/arm/mach-mxs/include/mach/usb.h index af7d885cb3..b2384992d4 100644 --- a/arch/arm/mach-mxs/include/mach/usb.h +++ b/arch/arm/mach-mxs/include/mach/usb.h @@ -1,6 +1,6 @@ #ifndef __MACH_USB_H #define __MACH_USB_H -int imx_usb_phy_enable(void); +int imx23_usb_phy_enable(void); #endif /* __MACH_USB_H */ diff --git a/arch/arm/mach-mxs/usb.c b/arch/arm/mach-mxs/usb-imx23.c index b7a93769b7..4748efcacc 100644 --- a/arch/arm/mach-mxs/usb.c +++ b/arch/arm/mach-mxs/usb-imx23.c @@ -1,5 +1,5 @@ /* - * i.MX23/28 USBPHY setup + * i.MX23 USBPHY setup * * Copyright 2011 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> * @@ -49,7 +49,7 @@ #define SET 0x4 #define CLR 0x8 -int imx_usb_phy_enable(void) +int imx23_usb_phy_enable(void) { u32 reg; @@ -89,4 +89,3 @@ int imx_usb_phy_enable(void) return 0; } - |