]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
usb: phy: ab8500-usb: fix phy tuning value select logic
authorFabio Baltieri <fabio.baltieri@linaro.org>
Wed, 15 May 2013 12:03:28 +0000 (14:03 +0200)
committerFelipe Balbi <balbi@ti.com>
Tue, 28 May 2013 17:01:34 +0000 (20:01 +0300)
The driver supports both ab8500 and ab8505, but the actual phy tuning
values logic sets ab8500 values:

if (!is_ab8500_2p0_or_earlier(ab->ab8500))

which is supposed to set values for ab8500, but incorrectly results true
for ab8505 too.

Fix this by adding an additional is_ab8500(ab->ab8500) check.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Maxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/phy/phy-ab8500-usb.c

index 63bb7cc14a2a79d056fda84ec5c6dcfe867c20d3..e6d461943f8472f68c37478ad8cf0a1299317144 100644 (file)
@@ -835,8 +835,8 @@ static int ab8500_usb_probe(struct platform_device *pdev)
                return err;
        }
 
-       /* Phy tuning values for AB8500 */
-       if (!is_ab8500_2p0_or_earlier(ab->ab8500)) {
+       /* Phy tuning values for AB8500 > v2.0 */
+       if (is_ab8500(ab->ab8500) && !is_ab8500_2p0_or_earlier(ab->ab8500)) {
                /* Enable the PBT/Bank 0x12 access */
                err = abx500_set_register_interruptible(ab->dev,
                                AB8500_DEVELOPMENT, AB8500_BANK12_ACCESS, 0x01);