From 5c939010466ed6dc815b6b92d7401837618e680b Mon Sep 17 00:00:00 2001 From: Ramneek Mehresh Date: Wed, 19 Sep 2012 14:18:45 +0530 Subject: [PATCH] --- yaml --- r: 326127 b: refs/heads/master c: e98b6a4f9667e41eb96104991794eb29212ec2b7 h: refs/heads/master i: 326125: ee9aecf1321c66a6136b0b8c3ec7ef00c9e08d1d 326123: 549302e6ba73829baa1ad860d8792a8204b9f70b 326119: fe749954a6cacb4c296a635413eb5c8f4c336b9b 326111: 26e5d29d3e48b3a783fde953eb4a1ef5d597de6a v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/fsl-mph-dr-of.c | 2 ++ trunk/include/linux/fsl_devices.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 29744cba70ca..b2f4cca02298 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c638eb2872b3af079501e7ee44cbb8a5cce9b4b5 +refs/heads/master: e98b6a4f9667e41eb96104991794eb29212ec2b7 diff --git a/trunk/drivers/usb/host/fsl-mph-dr-of.c b/trunk/drivers/usb/host/fsl-mph-dr-of.c index 22ff6b3a676f..1e771292383f 100644 --- a/trunk/drivers/usb/host/fsl-mph-dr-of.c +++ b/trunk/drivers/usb/host/fsl-mph-dr-of.c @@ -133,6 +133,8 @@ static int usb_get_ver_info(struct device_node *np) ver = FSL_USB_VER_1_6; else if (of_device_is_compatible(np, "fsl-usb2-dr-v2.2")) ver = FSL_USB_VER_2_2; + else if (of_device_is_compatible(np, "fsl-usb2-dr-v2.4")) + ver = FSL_USB_VER_2_4; else /* for previous controller versions */ ver = FSL_USB_VER_OLD; diff --git a/trunk/include/linux/fsl_devices.h b/trunk/include/linux/fsl_devices.h index ccfc4bb3dc48..38b5660813ff 100644 --- a/trunk/include/linux/fsl_devices.h +++ b/trunk/include/linux/fsl_devices.h @@ -23,6 +23,7 @@ #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 #include