diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-20 11:04:47 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-20 11:06:08 +0100 |
| commit | f051557a74512c864a350fd3f835e2dd5e7558a1 (patch) | |
| tree | 1bd5c15ef1973404e7a5bc27eeeef78571c5cc32 /arch/arm/mach-imx | |
| parent | 6f142500387365a3b8a4331c2540b7aa2a9bf9b6 (diff) | |
| download | barebox-f051557a74512c864a350fd3f835e2dd5e7558a1.tar.gz barebox-f051557a74512c864a350fd3f835e2dd5e7558a1.tar.xz | |
ARM i.MX6 USB phy: Fix phy function names
The imx6_usb_phy1* functions are misnamed. It's usb phy2 that is configured
here, so rename the functions accordingly.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/usb.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/usb-imx6.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/include/mach/usb.h b/arch/arm/mach-imx/include/mach/usb.h index 0a88e7fe2c..85528d77e6 100644 --- a/arch/arm/mach-imx/include/mach/usb.h +++ b/arch/arm/mach-imx/include/mach/usb.h @@ -11,7 +11,7 @@ #define MX35_H1_USBTE_BIT (1 << 4) #define MXC_EHCI_INTERFACE_SINGLE_UNI (2 << 0) -int imx6_usb_phy1_disable_oc(void); -int imx6_usb_phy1_enable(void); +int imx6_usb_phy2_disable_oc(void); +int imx6_usb_phy2_enable(void); #endif /* __MACH_USB_H_*/ diff --git a/arch/arm/mach-imx/usb-imx6.c b/arch/arm/mach-imx/usb-imx6.c index cd234d2084..a3c4304add 100644 --- a/arch/arm/mach-imx/usb-imx6.c +++ b/arch/arm/mach-imx/usb-imx6.c @@ -46,7 +46,7 @@ #define USBPHY1_PLL_480_CTRL_EN_USB_CLK (1 << 6) #define USBPHY1_PLL_480_CTRL_BYPASS (1 << 16) -int imx6_usb_phy1_disable_oc(void) +int imx6_usb_phy2_disable_oc(void) { int val; @@ -64,7 +64,7 @@ int imx6_usb_phy1_disable_oc(void) return 0; } -int imx6_usb_phy1_enable(void) +int imx6_usb_phy2_enable(void) { int val; |