| Message ID | b4103e44d6ac46b6c1c264e2aeac80b39941fe74.1639663832.git.geert+renesas@glider.be |
|---|---|
| State | New |
| Headers | show |
| Series | serial: sh-sci: Clock handling improvements | expand |
On Thu, Dec 16, 2021 at 03:17:32PM +0100, Geert Uytterhoeven wrote: > Since commit 1b463bd51042927e ("ARM: dts: r8a7794: Rename the serial > port clock to fck") in v4.6, all upstream DTS files call the SCIF > functional clock "fck". > > Hence the time is ripe to drop backward-compatibility with old DTBs that > use the old "sci_ick" name. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > Note that such old DTBs have stopped working anyway since commit > 58256143cff7c2e0 ("clk: renesas: Remove R-Car Gen2 legacy DT clock > support") in v5.5. Ah, with that paragraph in mind: Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 88005d2fc2a00b0b..686ca1777222b1d4 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2784,17 +2784,6 @@ static int sci_init_clocks(struct sci_port *sci_port, struct device *dev) return -EPROBE_DEFER; if (IS_ERR(clk) && i == SCI_FCK) { - /* - * "fck" used to be called "sci_ick", and we need to - * maintain DT backward compatibility. - */ - clk = devm_clk_get(dev, "sci_ick"); - if (PTR_ERR(clk) == -EPROBE_DEFER) - return -EPROBE_DEFER; - - if (!IS_ERR(clk)) - goto found; - /* * Not all SH platforms declare a clock lookup entry * for SCI devices, in which case we need to get the
Since commit 1b463bd51042927e ("ARM: dts: r8a7794: Rename the serial port clock to fck") in v4.6, all upstream DTS files call the SCIF functional clock "fck". Hence the time is ripe to drop backward-compatibility with old DTBs that use the old "sci_ick" name. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Note that such old DTBs have stopped working anyway since commit 58256143cff7c2e0 ("clk: renesas: Remove R-Car Gen2 legacy DT clock support") in v5.5. --- drivers/tty/serial/sh-sci.c | 11 ----------- 1 file changed, 11 deletions(-)