]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
pinctrl-sx150x: Improve sx150x_init_misc for SX1504/5/6
authorAndrey Smirnov <andrew.smirnov@gmail.com>
Mon, 7 Nov 2016 16:53:15 +0000 (08:53 -0800)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 8 Nov 2016 08:38:20 +0000 (09:38 +0100)
For Sx1504/5/6 only SX1506 has RegAdvanced, so put some code in place to
account for that.

Tested-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-sx150x.c

index 27194e700d2f19d00df27071cc73d16187a9c180..d51ec73092c2e590c3d429235cfb6f0ec057b913 100644 (file)
@@ -936,6 +936,13 @@ static int sx150x_init_misc(struct sx150x_pinctrl *pctl)
        case SX150X_456:
                reg   = pctl->data->pri.x456.reg_advance;
                value = 0x00;
+
+               /*
+                * Only SX1506 has RegAdvanced, SX1504/5 are expected
+                * to initialize this offset to zero
+                */
+               if (!reg)
+                       return 0;
                break;
        case SX150X_123:
                reg   = pctl->data->pri.x123.reg_advance;