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 EHCI/OHCI

According to the R-Car Gen3 Hardware Manual Rev. 1.00, and the RZ/G2
Hardware Manual Rev. 0.61, the parent clock of the EHCI/OHCI module
clocks on R-Car Gen3 and RZ/G2 SoCs is S3D2.

Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
[takeshi: Update R-Car H3, M3-N, and E3]
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
[geert: Update 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

Kazuya Mizuguchi and committed by
Geert Uytterhoeven
8d36fdcc 4aeed945

+12 -12
+2 -2
drivers/clk/renesas/r8a774a1-cpg-mssr.c
··· 165 165 DEF_MOD("vspd0", 623, R8A774A1_CLK_S0D2), 166 166 DEF_MOD("vspb", 626, R8A774A1_CLK_S0D1), 167 167 DEF_MOD("vspi0", 631, R8A774A1_CLK_S0D1), 168 - DEF_MOD("ehci1", 702, R8A774A1_CLK_S3D4), 169 - DEF_MOD("ehci0", 703, R8A774A1_CLK_S3D4), 168 + DEF_MOD("ehci1", 702, R8A774A1_CLK_S3D2), 169 + DEF_MOD("ehci0", 703, R8A774A1_CLK_S3D2), 170 170 DEF_MOD("hsusb", 704, R8A774A1_CLK_S3D4), 171 171 DEF_MOD("csi20", 714, R8A774A1_CLK_CSI0), 172 172 DEF_MOD("csi40", 716, R8A774A1_CLK_CSI0),
+1 -1
drivers/clk/renesas/r8a774c0-cpg-mssr.c
··· 178 178 DEF_MOD("vspb", 626, R8A774C0_CLK_S0D1), 179 179 DEF_MOD("vspi0", 631, R8A774C0_CLK_S0D1), 180 180 181 - DEF_MOD("ehci0", 703, R8A774C0_CLK_S3D4), 181 + DEF_MOD("ehci0", 703, R8A774C0_CLK_S3D2), 182 182 DEF_MOD("hsusb", 704, R8A774C0_CLK_S3D4), 183 183 DEF_MOD("csi40", 716, R8A774C0_CLK_CSI0), 184 184 DEF_MOD("du1", 723, R8A774C0_CLK_S1D1),
+4 -4
drivers/clk/renesas/r8a7795-cpg-mssr.c
··· 195 195 DEF_MOD("vspi2", 629, R8A7795_CLK_S2D1), /* ES1.x */ 196 196 DEF_MOD("vspi1", 630, R8A7795_CLK_S0D1), 197 197 DEF_MOD("vspi0", 631, R8A7795_CLK_S0D1), 198 - DEF_MOD("ehci3", 700, R8A7795_CLK_S3D4), 199 - DEF_MOD("ehci2", 701, R8A7795_CLK_S3D4), 200 - DEF_MOD("ehci1", 702, R8A7795_CLK_S3D4), 201 - DEF_MOD("ehci0", 703, R8A7795_CLK_S3D4), 198 + DEF_MOD("ehci3", 700, R8A7795_CLK_S3D2), 199 + DEF_MOD("ehci2", 701, R8A7795_CLK_S3D2), 200 + DEF_MOD("ehci1", 702, R8A7795_CLK_S3D2), 201 + DEF_MOD("ehci0", 703, R8A7795_CLK_S3D2), 202 202 DEF_MOD("hsusb", 704, R8A7795_CLK_S3D4), 203 203 DEF_MOD("hsusb3", 705, R8A7795_CLK_S3D4), 204 204 DEF_MOD("csi21", 713, R8A7795_CLK_CSI0), /* ES1.x */
+2 -2
drivers/clk/renesas/r8a7796-cpg-mssr.c
··· 177 177 DEF_MOD("vspd0", 623, R8A7796_CLK_S0D2), 178 178 DEF_MOD("vspb", 626, R8A7796_CLK_S0D1), 179 179 DEF_MOD("vspi0", 631, R8A7796_CLK_S0D1), 180 - DEF_MOD("ehci1", 702, R8A7796_CLK_S3D4), 181 - DEF_MOD("ehci0", 703, R8A7796_CLK_S3D4), 180 + DEF_MOD("ehci1", 702, R8A7796_CLK_S3D2), 181 + DEF_MOD("ehci0", 703, R8A7796_CLK_S3D2), 182 182 DEF_MOD("hsusb", 704, R8A7796_CLK_S3D4), 183 183 DEF_MOD("csi20", 714, R8A7796_CLK_CSI0), 184 184 DEF_MOD("csi40", 716, R8A7796_CLK_CSI0),
+2 -2
drivers/clk/renesas/r8a77965-cpg-mssr.c
··· 175 175 DEF_MOD("vspb", 626, R8A77965_CLK_S0D1), 176 176 DEF_MOD("vspi0", 631, R8A77965_CLK_S0D1), 177 177 178 - DEF_MOD("ehci1", 702, R8A77965_CLK_S3D4), 179 - DEF_MOD("ehci0", 703, R8A77965_CLK_S3D4), 178 + DEF_MOD("ehci1", 702, R8A77965_CLK_S3D2), 179 + DEF_MOD("ehci0", 703, R8A77965_CLK_S3D2), 180 180 DEF_MOD("hsusb", 704, R8A77965_CLK_S3D4), 181 181 DEF_MOD("csi20", 714, R8A77965_CLK_CSI0), 182 182 DEF_MOD("csi40", 716, R8A77965_CLK_CSI0),
+1 -1
drivers/clk/renesas/r8a77990-cpg-mssr.c
··· 181 181 DEF_MOD("vspb", 626, R8A77990_CLK_S0D1), 182 182 DEF_MOD("vspi0", 631, R8A77990_CLK_S0D1), 183 183 184 - DEF_MOD("ehci0", 703, R8A77990_CLK_S3D4), 184 + DEF_MOD("ehci0", 703, R8A77990_CLK_S3D2), 185 185 DEF_MOD("hsusb", 704, R8A77990_CLK_S3D4), 186 186 DEF_MOD("csi40", 716, R8A77990_CLK_CSI0), 187 187 DEF_MOD("du1", 723, R8A77990_CLK_S1D1),