Hi Wolfram, CC clk On Wed, Nov 10, 2021 at 8:16 PM Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx> wrote: > Here is the second RFC to refactor SDHI clocks so that SDnH is a > separate clock. The main advantage is that we can handle per-SoC quirks > regarding the clocks now in the SDHI driver rather than the clock > driver. This is where it belongs because only there we know which mode > needs which tuning. Also, the code is way cleaner and more readable now. > > Geert seemed basically okay with this approach, so I continued to work > on it by addressing his comments and adding DT updates for all other > involved SoCs. I also excluded V3M now because it has a different SDnH > handling. It shouldn't be affected by this series. But it may be that we > need to add V3M SDnH handling later because it may be missing since > ever. If so, this series will make that additional task a lot easier. And R-Car V3H_2, which has extra bits in the SD-IFn registers, for which we're gonna need a soc_device_match() quirk... > The downside is that patch 4 looks messy. When switching from old to new > handling in the clock driver, I see no alternative to switch the MMC > driver in the same patch. clk_set_rate just has to work. However, the > MMC part is small, so I hope we can deal with it as an exception this > time. My suggestion is that Geert takes all the patches via his clk and > renesas-dt trees wich MMC acks from Ulf. Is this okay for you, guys? I can take them all[*]. Unless I'm mistaken, the mmc changes have a hard dependency on the clk changes, so they have to go in through renesas-clk, while the DT changes can go in independently through renesas-devel? [*] The DT bindings patch needs a respin, but that can be handled separately, and go in through Rob? > These patches have been tested on R-Car H3 ES1.0, H3 ES2.0, M3-W ES1.0, > M3N, E3, and V3U (remote only). On Gen2 a H2 has been tested. I tested > SDR104, HS200, HS400, and regular modes. All observed values and > relations in 'clk_summary' made perfect sense. Actually, this is the > first time all quirks are correctly handled. HS200 with 4tap was broken > before which was the initial reason for this patch series. > > Detailed changes are in the patch descriptions. > > A branch can be found here: > > git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/sdhi/separate-sdhn-v2 > > Looking forward to comments and testing. > > Thanks and happy hacking, > > Wolfram > > Wolfram Sang (21): > clk: renesas: rcar-gen3: add dummy SDnH clock > clk: renesas: rcar-gen3: add SDnH clock > clk: renesas: r8a779a0: add SDnH clock to V3U > mmc: sdhi: internal_dmac: flag non-standard SDnH handling for V3M > clk: renesas: rcar-gen3: switch to new SD clock handling > clk: renesas: rcar-gen3: remove outdated SD_SKIP_FIRST > dt-bindings: mmc: renesas,sdhi: add optional SDnH clock > arm64: dts: reneas: r8a774a1: add SDnH clocks > arm64: dts: reneas: r8a774b1: add SDnH clocks > arm64: dts: reneas: r8a774c0: add SDnH clocks > arm64: dts: reneas: r8a774e1: add SDnH clocks > arm64: dts: reneas: r8a77951: add SDnH clocks > arm64: dts: reneas: r8a77960: add SDnH clocks > arm64: dts: reneas: r8a77961: add SDnH clocks > arm64: dts: reneas: r8a77965: add SDnH clocks > arm64: dts: reneas: r8a77980: add SDnH clocks > arm64: dts: reneas: r8a77990: add SDnH clocks > arm64: dts: reneas: r8a77995: add SDnH clocks > mmc: sdhi: use dev_err_probe when getting clock fails > mmc: sdhi: parse DT for SDnH > arm64: dts: reneas: r8a779a0: add SDnH clocks > > .../devicetree/bindings/mmc/renesas,sdhi.yaml | 16 +- > arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 12 +- > arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 12 +- > arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 9 +- > arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 12 +- > arch/arm64/boot/dts/renesas/r8a77951.dtsi | 12 +- > arch/arm64/boot/dts/renesas/r8a77960.dtsi | 12 +- > arch/arm64/boot/dts/renesas/r8a77961.dtsi | 12 +- > arch/arm64/boot/dts/renesas/r8a77965.dtsi | 12 +- > arch/arm64/boot/dts/renesas/r8a77980.dtsi | 3 +- > arch/arm64/boot/dts/renesas/r8a77990.dtsi | 9 +- > arch/arm64/boot/dts/renesas/r8a77995.dtsi | 3 +- > arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 3 +- > drivers/clk/renesas/r8a774a1-cpg-mssr.c | 12 +- > drivers/clk/renesas/r8a774b1-cpg-mssr.c | 12 +- > drivers/clk/renesas/r8a774c0-cpg-mssr.c | 9 +- > drivers/clk/renesas/r8a774e1-cpg-mssr.c | 12 +- > drivers/clk/renesas/r8a7795-cpg-mssr.c | 12 +- > drivers/clk/renesas/r8a7796-cpg-mssr.c | 12 +- > drivers/clk/renesas/r8a77965-cpg-mssr.c | 12 +- > drivers/clk/renesas/r8a77980-cpg-mssr.c | 3 +- > drivers/clk/renesas/r8a77990-cpg-mssr.c | 9 +- > drivers/clk/renesas/r8a77995-cpg-mssr.c | 3 +- > drivers/clk/renesas/r8a779a0-cpg-mssr.c | 17 +- > drivers/clk/renesas/rcar-cpg-lib.c | 211 +++--------------- > drivers/clk/renesas/rcar-cpg-lib.h | 7 +- > drivers/clk/renesas/rcar-gen3-cpg.c | 24 +- > drivers/clk/renesas/rcar-gen3-cpg.h | 4 + > drivers/mmc/host/renesas_sdhi.h | 4 + > drivers/mmc/host/renesas_sdhi_core.c | 39 +++- > drivers/mmc/host/renesas_sdhi_internal_dmac.c | 21 ++ > 31 files changed, 261 insertions(+), 289 deletions(-) Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds