From: Rob Herring Date: Mon, 13 Sep 2021 19:28:13 +0000 (-0500) Subject: clk: versatile: clk-icst: Support 'reg' in addition to 'vco-offset' for register... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=69bfe08f2390d75dc5431b0a6a001ecc8c0a5738;p=uclinux-h8%2Flinux.git clk: versatile: clk-icst: Support 'reg' in addition to 'vco-offset' for register address 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 Cc: Stephen Boyd Cc: linux-arm-kernel@lists.infradead.org Cc: linux-clk@vger.kernel.org Signed-off-by: Rob Herring Link: https://lore.kernel.org/r/20210913192816.1225025-6-robh@kernel.org Reviewed-by: Linus Walleij Signed-off-by: Stephen Boyd --- diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c index fdd6aa3cb1fc..77fd0ecaf155 100644 --- 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; } - 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; }