pinctrl: aspeed-g5: Adapt to new LPC device tree layout

Add check against LPC device v2 compatible string to
ensure that the fixed device tree layout is adopted.
The LPC register offsets are also fixed accordingly.

Signed-off-by: Chia-Wei Wang <chiawei_wang@aspeedtech.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20210319062752.145730-4-andrew@aj.id.au
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
index 0cab4c2576e2a129800b8fb5169c443398c453bc..996ebcba4d3867bb190473d0c40a8c2878ee3093 100644 (file)
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
@@ -60,7 +60,7 @@
 #define COND2          { ASPEED_IP_SCU, SCU94, GENMASK(1, 0), 0, 0 }
 
 /* LHCR0 is offset from the end of the H8S/2168-compatible registers */
-#define LHCR0          0x20
+#define LHCR0          0xa0
 #define GFX064         0x64
 
 #define B14 0
@@ -2648,14 +2648,19 @@ static struct regmap *aspeed_g5_acquire_regmap(struct aspeed_pinmux_data *ctx,
        }
 
        if (ip == ASPEED_IP_LPC) {
-               struct device_node *node;
+               struct device_node *np;
                struct regmap *map;
 
-               node = of_parse_phandle(ctx->dev->of_node,
+               np = of_parse_phandle(ctx->dev->of_node,
                                        "aspeed,external-nodes", 1);
-               if (node) {
-                       map = syscon_node_to_regmap(node->parent);
-                       of_node_put(node);
+               if (np) {
+                       if (!of_device_is_compatible(np->parent, "aspeed,ast2400-lpc-v2") &&
+                           !of_device_is_compatible(np->parent, "aspeed,ast2500-lpc-v2") &&
+                           !of_device_is_compatible(np->parent, "aspeed,ast2600-lpc-v2"))
+                               return ERR_PTR(-ENODEV);
+
+                       map = syscon_node_to_regmap(np->parent);
+                       of_node_put(np);
                        if (IS_ERR(map))
                                return map;
                } else