UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drivers:usb:fsl: Replace macros with enumerated type 

Replace macros with enumerated type to represent usb ip
controller version

Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nikhil Badola 2015-06-15 15:46:37 +05:30 committed by Greg Kroah-Hartman
parent 5fd3fc1c53
commit 38aa420096
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/host/fsl-mph-dr-of.c
View File

@ -119,9 +119,9 @@ error:
static const struct of_device_id fsl_usb2_mph_dr_of_match[]; static const struct of_device_id fsl_usb2_mph_dr_of_match[];
static int usb_get_ver_info(struct device_node *np) static enum fsl_usb2_controller_ver usb_get_ver_info(struct device_node *np)
{ {
int ver = -1; enum fsl_usb2_controller_ver ver = FSL_USB_VER_NONE;
/* /*
* returns 1 for usb controller version 1.6 * returns 1 for usb controller version 1.6
@ -142,7 +142,7 @@ static int usb_get_ver_info(struct device_node *np)
else /* for previous controller versions */ else /* for previous controller versions */
ver = FSL_USB_VER_OLD; ver = FSL_USB_VER_OLD;
if (ver > -1) if (ver > FSL_USB_VER_NONE)
return ver; return ver;
} }
@ -215,7 +215,7 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev)
pdata->controller_ver = usb_get_ver_info(np); pdata->controller_ver = usb_get_ver_info(np);
if (pdata->have_sysif_regs) { if (pdata->have_sysif_regs) {
if (pdata->controller_ver < 0) { if (pdata->controller_ver == FSL_USB_VER_NONE) {
dev_warn(&ofdev->dev, "Could not get controller version\n"); dev_warn(&ofdev->dev, "Could not get controller version\n");
return -ENODEV; return -ENODEV;
} }

16
include/linux/fsl_devices.h
View File

@ -20,11 +20,6 @@
#define FSL_UTMI_PHY_DLY 10 /*As per P1010RM, delay for UTMI #define FSL_UTMI_PHY_DLY 10 /*As per P1010RM, delay for UTMI
PHY CLK to become stable - 10ms*/ PHY CLK to become stable - 10ms*/
#define FSL_USB_PHY_CLK_TIMEOUT 10000 /* uSec */ #define FSL_USB_PHY_CLK_TIMEOUT 10000 /* uSec */
#define FSL_USB_VER_OLD 0
#define FSL_USB_VER_1_6 1
#define FSL_USB_VER_2_2 2
#define FSL_USB_VER_2_4 3
#define FSL_USB_VER_2_5 4
#include <linux/types.h> #include <linux/types.h>
@ -52,6 +47,15 @@
* *
*/ */
enum fsl_usb2_controller_ver {
FSL_USB_VER_NONE = -1,
FSL_USB_VER_OLD = 0,
FSL_USB_VER_1_6 = 1,
FSL_USB_VER_2_2 = 2,
FSL_USB_VER_2_4 = 3,
FSL_USB_VER_2_5 = 4,
};
enum fsl_usb2_operating_modes { enum fsl_usb2_operating_modes {
FSL_USB2_MPH_HOST, FSL_USB2_MPH_HOST,
FSL_USB2_DR_HOST, FSL_USB2_DR_HOST,
@ -72,7 +76,7 @@ struct platform_device;
struct fsl_usb2_platform_data { struct fsl_usb2_platform_data {
/* board specific information */ /* board specific information */
int controller_ver; enum fsl_usb2_controller_ver controller_ver;
enum fsl_usb2_operating_modes operating_mode; enum fsl_usb2_operating_modes operating_mode;
enum fsl_usb2_phy_modes phy_mode; enum fsl_usb2_phy_modes phy_mode;
unsigned int port_enables; unsigned int port_enables;