Merge tag 'clk-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/clk...

[pandora-kernel.git] / drivers / usb / host / fsl-mph-dr-of.c

diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index 7e325e9..5e0d600 100644 (file)
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -126,6 +126,8 @@ static int usb_get_ver_info(struct device_node *np)
        /*
         * returns 1 for usb controller version 1.6
         * returns 2 for usb controller version 2.2
+        * returns 3 for usb controller version 2.4
+        * returns 4 for usb controller version 2.5
         * returns 0 otherwise
         */
        if (of_device_is_compatible(np, "fsl-usb2-dr")) {
@@ -135,6 +137,8 @@ static int usb_get_ver_info(struct device_node *np)
                        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 if (of_device_is_compatible(np, "fsl-usb2-dr-v2.5"))
+                       ver = FSL_USB_VER_2_5;
                else /* for previous controller versions */
                        ver = FSL_USB_VER_OLD;
 
@@ -150,6 +154,10 @@ 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-mph-v2.2"))
                        ver = FSL_USB_VER_2_2;
+               else if (of_device_is_compatible(np, "fsl-usb2-mph-v2.4"))
+                       ver = FSL_USB_VER_2_4;
+               else if (of_device_is_compatible(np, "fsl-usb2-mph-v2.5"))
+                       ver = FSL_USB_VER_2_5;
                else /* for previous controller versions */
                        ver = FSL_USB_VER_OLD;
        }