usb: usb251xb: add usb data lane port swap feature

The HW can swap the USB differential-pair (D+/D-) for each port
separately. So the USB signals can be re-aligned with a misplaced
USB connector on the PCB.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Reviewed-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index a6efb9a7293912ca5647b31622a579f8f348e9fd..4d72b7d1d383be2643d09756f11f709a8b1906a5 100644 (file)
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -337,10 +337,12 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
        struct device *dev = hub->dev;
        struct device_node *np = dev->of_node;
        int len, err, i;
-       u32 property_u32 = 0;
+       u32 port, property_u32 = 0;
        const u32 *cproperty_u32;
        const char *cproperty_char;
        char str[USB251XB_STRING_BUFSIZE / 2];
+       struct property *prop;
+       const __be32 *p;
 
        if (!np) {
                dev_err(dev, "failed to get ofdata\n");
@@ -539,6 +541,16 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
                              (wchar_t *)hub->serial,
                              USB251XB_STRING_BUFSIZE);
 
+       /*
+        * The datasheet documents the register as 'Port Swap' but in real the
+        * register controls the USB DP/DM signal swapping for each port.
+        */
+       hub->port_swap = USB251XB_DEF_PORT_SWAP;
+       of_property_for_each_u32(np, "swap-dx-lanes", prop, p, port) {
+               if ((port >= 0) && (port <= data->port_cnt))
+                       hub->port_swap |= BIT(port);
+       }
+
        /* The following parameters are currently not exposed to devicetree, but
         * may be as soon as needed.
         */
@@ -546,7 +558,6 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
        hub->boost_up = USB251XB_DEF_BOOST_UP;
        hub->boost_57 = USB251XB_DEF_BOOST_57;
        hub->boost_14 = USB251XB_DEF_BOOST_14;
-       hub->port_swap = USB251XB_DEF_PORT_SWAP;
        hub->port_map12 = USB251XB_DEF_PORT_MAP_12;
        hub->port_map34 = USB251XB_DEF_PORT_MAP_34;
        hub->port_map56 = USB251XB_DEF_PORT_MAP_56;