[PATCH v3 4/5] pinctrl: aspeed-g5: Adapt to new LPC device tree layout

[Chia-Wei, Wang]

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_w...@aspeedtech.com>
---
 drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c 
b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
index 0cab4c2576e2..6e0e5b64e677 100644
--- 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,21 @@ static struct regmap *aspeed_g5_acquire_regmap(struct 
aspeed_pinmux_data *ctx,
        }
 
        if (ip == ASPEED_IP_LPC) {
-               struct device_node *node;
+               struct device_node *lhc_np;
+               struct device_node *lpc_np;
                struct regmap *map;
 
-               node = of_parse_phandle(ctx->dev->of_node,
+               lhc_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 (lhc_np) {
+                       lpc_np = lhc_np->parent;
+                       if (!of_device_is_compatible(lpc_np, 
"aspeed,ast2400-lpc-v2") &&
+                           !of_device_is_compatible(lpc_np, 
"aspeed,ast2500-lpc-v2") &&
+                           !of_device_is_compatible(lpc_np, 
"aspeed,ast2600-lpc-v2"))
+                               return ERR_PTR(-ENODEV);
+
+                       map = syscon_node_to_regmap(lpc_np);
+                       of_node_put(lhc_np);
                        if (IS_ERR(map))
                                return map;
                } else
-- 
2.17.1