clk: versatile: clk-icst: Support 'reg' in addition to 'vco-offset' for register...

The ICST binding now also supports 'reg' in addition to 'vco-offset' for
the VCO register address. Add support to the driver to get the VCO
address from 'reg'.

Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-clk@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210913192816.1225025-6-robh@kernel.org
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c
index fdd6aa3..77fd0ec 100644 (file)
--- a/drivers/clk/versatile/clk-icst.c
+++ b/drivers/clk/versatile/clk-icst.c
@@ -501,7 +501,8 @@ static void __init of_syscon_icst_setup(struct device_node *np)
                return;
        }
 
                return;
        }
 

-       if (of_property_read_u32(np, "vco-offset", &icst_desc.vco_offset)) {
+       if (of_property_read_u32(np, "reg", &icst_desc.vco_offset) &&
+           of_property_read_u32(np, "vco-offset", &icst_desc.vco_offset)) {

                pr_err("no VCO register offset for ICST clock\n");
                return;
        }
                pr_err("no VCO register offset for ICST clock\n");
                return;
        }