| Message ID | 20211109164650.2233507-1-robh@kernel.org |
|---|---|
| Headers | show |
| Series | Fix Arm Ltd board node name collisions | expand |
On Tue, Nov 9, 2021 at 5:46 PM Rob Herring <robh@kernel.org> wrote: > Commit 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and > node names") moved to using generic node names. That results in trying > to register multiple clocks with the same name. Fix this by including > the unit-address in the clock name. > > Fixes: 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and node names") > Cc: stable@vger.kernel.org > 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> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Tue, Nov 9, 2021 at 5:46 PM Rob Herring <robh@kernel.org> wrote: > This does break DT ABI compatibility which is partially mitigated if > these changes are backported to stable. The alternative is reverting the > referenced DT changes and coming up with different node names without > unit-addresses. Ultimately, ABI issues are platform maintainers' > decision, not mine. I don't mind breaking the ABI for these boards since everyone I know rebuild the DT with the kernel and boot. I don't know if other users flash it though, so check what Sudeep says. Yours, Linus Walleij
Quoting Rob Herring (2021-11-09 08:46:50) > Commit 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and > node names") moved to using generic node names. That results in trying > to register multiple clocks with the same name. Fix this by including > the unit-address in the clock name. > > Fixes: 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and node names") > Cc: stable@vger.kernel.org > 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> > --- Reviewed-by: Stephen Boyd <sboyd@kernel.org>
The node name changes in commits 25b892b583cc ("ARM: dts: arm: Update register-bit-led nodes 'reg' and node names") and 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and node names") caused name collisions with the kernel's handling of ICST clock names and platform device names. This series fixes the kernel side to handle the DT changes. This does break DT ABI compatibility which is partially mitigated if these changes are backported to stable. The alternative is reverting the referenced DT changes and coming up with different node names without unit-addresses. Ultimately, ABI issues are platform maintainers' decision, not mine. Rob Rob Herring (2): of: Support using 'mask' in making device bus id clk: versatile: clk-icst: Ensure clock names are unique drivers/clk/versatile/clk-icst.c | 6 ++++-- drivers/of/platform.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-)