From f051557a74512c864a350fd3f835e2dd5e7558a1 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Sun, 20 Jan 2013 11:04:47 +0100 Subject: [PATCH] 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 --- arch/arm/boards/freescale-mx6-sabrelite/board.c | 4 ++-- arch/arm/mach-imx/include/mach/usb.h | 4 ++-- arch/arm/mach-imx/usb-imx6.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c index 55087c2bc..2a1278635 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/board.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c @@ -231,8 +231,8 @@ static struct esdhc_platform_data sabrelite_sd4_data = { static void sabrelite_ehci_init(void) { - imx6_usb_phy1_disable_oc(); - imx6_usb_phy1_enable(); + imx6_usb_phy2_disable_oc(); + imx6_usb_phy2_enable(); /* hub reset */ gpio_direction_output(204, 0); diff --git a/arch/arm/mach-imx/include/mach/usb.h b/arch/arm/mach-imx/include/mach/usb.h index 0a88e7fe2..85528d77e 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 cd234d208..a3c4304ad 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;