Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: renesas: rcar-gen3: Correct parent clock of Audio-DMAC

The clock sources of the AXI-bus clock (266.66 MHz) used for Audio-DMAC
DMA transfers are:

Channel R-Car H3 R-Car M3-W R-Car M3-N R-Car E3
---------------------------------------------------------------
Audio-DMAC0 S1D2 S1D2 S1D2 S1D2
Audio-DMAC1 S1D2 S1D2 S1D2 -

As a result, change the parent clocks of the Audio-DMAC{0,1} module
clocks on R-Car H3, R-Car M3-W, and R-Car M3-N to S1D2, and change the
parent clock of the Audio-DMAC0 module on R-Car E3 to S1D2.

NOTE: This information will be reflected in a future revision of the
R-Car Gen3 Hardware Manual.

Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
[geert: Update R-Car D3, RZ/G2M, and RZ/G2E]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

authored by

Takeshi Kihara and committed by
Geert Uytterhoeven
b9df2ea2 3c772f71

+11 -11
+2 -2
drivers/clk/renesas/r8a774a1-cpg-mssr.c
··· 143 143 DEF_MOD("rwdt", 402, R8A774A1_CLK_R), 144 144 DEF_MOD("intc-ex", 407, R8A774A1_CLK_CP), 145 145 DEF_MOD("intc-ap", 408, R8A774A1_CLK_S0D3), 146 - DEF_MOD("audmac1", 501, R8A774A1_CLK_S0D3), 147 - DEF_MOD("audmac0", 502, R8A774A1_CLK_S0D3), 146 + DEF_MOD("audmac1", 501, R8A774A1_CLK_S1D2), 147 + DEF_MOD("audmac0", 502, R8A774A1_CLK_S1D2), 148 148 DEF_MOD("hscif4", 516, R8A774A1_CLK_S3D1), 149 149 DEF_MOD("hscif3", 517, R8A774A1_CLK_S3D1), 150 150 DEF_MOD("hscif2", 518, R8A774A1_CLK_S3D1),
+1 -1
drivers/clk/renesas/r8a774c0-cpg-mssr.c
··· 158 158 DEF_MOD("intc-ex", 407, R8A774C0_CLK_CP), 159 159 DEF_MOD("intc-ap", 408, R8A774C0_CLK_S0D3), 160 160 161 - DEF_MOD("audmac0", 502, R8A774C0_CLK_S3D4), 161 + DEF_MOD("audmac0", 502, R8A774C0_CLK_S1D2), 162 162 DEF_MOD("hscif4", 516, R8A774C0_CLK_S3D1C), 163 163 DEF_MOD("hscif3", 517, R8A774C0_CLK_S3D1C), 164 164 DEF_MOD("hscif2", 518, R8A774C0_CLK_S3D1C),
+2 -2
drivers/clk/renesas/r8a7795-cpg-mssr.c
··· 154 154 DEF_MOD("rwdt", 402, R8A7795_CLK_R), 155 155 DEF_MOD("intc-ex", 407, R8A7795_CLK_CP), 156 156 DEF_MOD("intc-ap", 408, R8A7795_CLK_S0D3), 157 - DEF_MOD("audmac1", 501, R8A7795_CLK_S0D3), 158 - DEF_MOD("audmac0", 502, R8A7795_CLK_S0D3), 157 + DEF_MOD("audmac1", 501, R8A7795_CLK_S1D2), 158 + DEF_MOD("audmac0", 502, R8A7795_CLK_S1D2), 159 159 DEF_MOD("drif7", 508, R8A7795_CLK_S3D2), 160 160 DEF_MOD("drif6", 509, R8A7795_CLK_S3D2), 161 161 DEF_MOD("drif5", 510, R8A7795_CLK_S3D2),
+2 -2
drivers/clk/renesas/r8a7796-cpg-mssr.c
··· 147 147 DEF_MOD("rwdt", 402, R8A7796_CLK_R), 148 148 DEF_MOD("intc-ex", 407, R8A7796_CLK_CP), 149 149 DEF_MOD("intc-ap", 408, R8A7796_CLK_S0D3), 150 - DEF_MOD("audmac1", 501, R8A7796_CLK_S0D3), 151 - DEF_MOD("audmac0", 502, R8A7796_CLK_S0D3), 150 + DEF_MOD("audmac1", 501, R8A7796_CLK_S1D2), 151 + DEF_MOD("audmac0", 502, R8A7796_CLK_S1D2), 152 152 DEF_MOD("drif7", 508, R8A7796_CLK_S3D2), 153 153 DEF_MOD("drif6", 509, R8A7796_CLK_S3D2), 154 154 DEF_MOD("drif5", 510, R8A7796_CLK_S3D2),
+2 -2
drivers/clk/renesas/r8a77965-cpg-mssr.c
··· 146 146 DEF_MOD("intc-ex", 407, R8A77965_CLK_CP), 147 147 DEF_MOD("intc-ap", 408, R8A77965_CLK_S0D3), 148 148 149 - DEF_MOD("audmac1", 501, R8A77965_CLK_S0D3), 150 - DEF_MOD("audmac0", 502, R8A77965_CLK_S0D3), 149 + DEF_MOD("audmac1", 501, R8A77965_CLK_S1D2), 150 + DEF_MOD("audmac0", 502, R8A77965_CLK_S1D2), 151 151 DEF_MOD("drif7", 508, R8A77965_CLK_S3D2), 152 152 DEF_MOD("drif6", 509, R8A77965_CLK_S3D2), 153 153 DEF_MOD("drif5", 510, R8A77965_CLK_S3D2),
+1 -1
drivers/clk/renesas/r8a77990-cpg-mssr.c
··· 153 153 DEF_MOD("intc-ex", 407, R8A77990_CLK_CP), 154 154 DEF_MOD("intc-ap", 408, R8A77990_CLK_S0D3), 155 155 156 - DEF_MOD("audmac0", 502, R8A77990_CLK_S3D4), 156 + DEF_MOD("audmac0", 502, R8A77990_CLK_S1D2), 157 157 DEF_MOD("drif7", 508, R8A77990_CLK_S3D2), 158 158 DEF_MOD("drif6", 509, R8A77990_CLK_S3D2), 159 159 DEF_MOD("drif5", 510, R8A77990_CLK_S3D2),
+1 -1
drivers/clk/renesas/r8a77995-cpg-mssr.c
··· 133 133 DEF_MOD("rwdt", 402, R8A77995_CLK_R), 134 134 DEF_MOD("intc-ex", 407, R8A77995_CLK_CP), 135 135 DEF_MOD("intc-ap", 408, R8A77995_CLK_S1D2), 136 - DEF_MOD("audmac0", 502, R8A77995_CLK_S3D1), 136 + DEF_MOD("audmac0", 502, R8A77995_CLK_S1D2), 137 137 DEF_MOD("hscif3", 517, R8A77995_CLK_S3D1C), 138 138 DEF_MOD("hscif0", 520, R8A77995_CLK_S3D1C), 139 139 DEF_MOD("thermal", 522, R8A77995_CLK_CP),