diff options
author | Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com> | 2018-07-25 05:07:05 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2019-04-02 04:08:27 -0400 |
commit | c2182095c850a02e150613ac026be99ce1c2ff9f (patch) | |
tree | 4ca95281db9a8d23ac095e49a6d888fbcad08d80 | |
parent | 8d36fdcce21c1713eacf45380696f8cec3d724bf (diff) |
clk: renesas: rcar-gen3: Correct parent clock of HS-USB
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 HS-USB 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>
-rw-r--r-- | drivers/clk/renesas/r8a774a1-cpg-mssr.c | 2 | ||||
-rw-r--r-- | drivers/clk/renesas/r8a774c0-cpg-mssr.c | 2 | ||||
-rw-r--r-- | drivers/clk/renesas/r8a7795-cpg-mssr.c | 4 | ||||
-rw-r--r-- | drivers/clk/renesas/r8a7796-cpg-mssr.c | 2 | ||||
-rw-r--r-- | drivers/clk/renesas/r8a77965-cpg-mssr.c | 2 | ||||
-rw-r--r-- | drivers/clk/renesas/r8a77990-cpg-mssr.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/clk/renesas/r8a774a1-cpg-mssr.c b/drivers/clk/renesas/r8a774a1-cpg-mssr.c index bce0e6d6d02c..676e6a112090 100644 --- a/drivers/clk/renesas/r8a774a1-cpg-mssr.c +++ b/drivers/clk/renesas/r8a774a1-cpg-mssr.c | |||
@@ -167,7 +167,7 @@ static const struct mssr_mod_clk r8a774a1_mod_clks[] __initconst = { | |||
167 | DEF_MOD("vspi0", 631, R8A774A1_CLK_S0D1), | 167 | DEF_MOD("vspi0", 631, R8A774A1_CLK_S0D1), |
168 | DEF_MOD("ehci1", 702, R8A774A1_CLK_S3D2), | 168 | DEF_MOD("ehci1", 702, R8A774A1_CLK_S3D2), |
169 | DEF_MOD("ehci0", 703, R8A774A1_CLK_S3D2), | 169 | DEF_MOD("ehci0", 703, R8A774A1_CLK_S3D2), |
170 | DEF_MOD("hsusb", 704, R8A774A1_CLK_S3D4), | 170 | DEF_MOD("hsusb", 704, R8A774A1_CLK_S3D2), |
171 | DEF_MOD("csi20", 714, R8A774A1_CLK_CSI0), | 171 | DEF_MOD("csi20", 714, R8A774A1_CLK_CSI0), |
172 | DEF_MOD("csi40", 716, R8A774A1_CLK_CSI0), | 172 | DEF_MOD("csi40", 716, R8A774A1_CLK_CSI0), |
173 | DEF_MOD("du2", 722, R8A774A1_CLK_S2D1), | 173 | DEF_MOD("du2", 722, R8A774A1_CLK_S2D1), |
diff --git a/drivers/clk/renesas/r8a774c0-cpg-mssr.c b/drivers/clk/renesas/r8a774c0-cpg-mssr.c index d095787f7d85..c33d3b037081 100644 --- a/drivers/clk/renesas/r8a774c0-cpg-mssr.c +++ b/drivers/clk/renesas/r8a774c0-cpg-mssr.c | |||
@@ -179,7 +179,7 @@ static const struct mssr_mod_clk r8a774c0_mod_clks[] __initconst = { | |||
179 | DEF_MOD("vspi0", 631, R8A774C0_CLK_S0D1), | 179 | DEF_MOD("vspi0", 631, R8A774C0_CLK_S0D1), |
180 | 180 | ||
181 | DEF_MOD("ehci0", 703, R8A774C0_CLK_S3D2), | 181 | DEF_MOD("ehci0", 703, R8A774C0_CLK_S3D2), |
182 | DEF_MOD("hsusb", 704, R8A774C0_CLK_S3D4), | 182 | DEF_MOD("hsusb", 704, R8A774C0_CLK_S3D2), |
183 | DEF_MOD("csi40", 716, R8A774C0_CLK_CSI0), | 183 | DEF_MOD("csi40", 716, R8A774C0_CLK_CSI0), |
184 | DEF_MOD("du1", 723, R8A774C0_CLK_S1D1), | 184 | DEF_MOD("du1", 723, R8A774C0_CLK_S1D1), |
185 | DEF_MOD("du0", 724, R8A774C0_CLK_S1D1), | 185 | DEF_MOD("du0", 724, R8A774C0_CLK_S1D1), |
diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c index b9e42da38b72..5b658b086118 100644 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c | |||
@@ -199,8 +199,8 @@ static struct mssr_mod_clk r8a7795_mod_clks[] __initdata = { | |||
199 | DEF_MOD("ehci2", 701, R8A7795_CLK_S3D2), | 199 | DEF_MOD("ehci2", 701, R8A7795_CLK_S3D2), |
200 | DEF_MOD("ehci1", 702, R8A7795_CLK_S3D2), | 200 | DEF_MOD("ehci1", 702, R8A7795_CLK_S3D2), |
201 | DEF_MOD("ehci0", 703, R8A7795_CLK_S3D2), | 201 | DEF_MOD("ehci0", 703, R8A7795_CLK_S3D2), |
202 | DEF_MOD("hsusb", 704, R8A7795_CLK_S3D4), | 202 | DEF_MOD("hsusb", 704, R8A7795_CLK_S3D2), |
203 | DEF_MOD("hsusb3", 705, R8A7795_CLK_S3D4), | 203 | DEF_MOD("hsusb3", 705, R8A7795_CLK_S3D2), |
204 | DEF_MOD("csi21", 713, R8A7795_CLK_CSI0), /* ES1.x */ | 204 | DEF_MOD("csi21", 713, R8A7795_CLK_CSI0), /* ES1.x */ |
205 | DEF_MOD("csi20", 714, R8A7795_CLK_CSI0), | 205 | DEF_MOD("csi20", 714, R8A7795_CLK_CSI0), |
206 | DEF_MOD("csi41", 715, R8A7795_CLK_CSI0), | 206 | DEF_MOD("csi41", 715, R8A7795_CLK_CSI0), |
diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c index 97b58f131114..fa1c1ac14d5c 100644 --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c | |||
@@ -179,7 +179,7 @@ static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = { | |||
179 | DEF_MOD("vspi0", 631, R8A7796_CLK_S0D1), | 179 | DEF_MOD("vspi0", 631, R8A7796_CLK_S0D1), |
180 | DEF_MOD("ehci1", 702, R8A7796_CLK_S3D2), | 180 | DEF_MOD("ehci1", 702, R8A7796_CLK_S3D2), |
181 | DEF_MOD("ehci0", 703, R8A7796_CLK_S3D2), | 181 | DEF_MOD("ehci0", 703, R8A7796_CLK_S3D2), |
182 | DEF_MOD("hsusb", 704, R8A7796_CLK_S3D4), | 182 | DEF_MOD("hsusb", 704, R8A7796_CLK_S3D2), |
183 | DEF_MOD("csi20", 714, R8A7796_CLK_CSI0), | 183 | DEF_MOD("csi20", 714, R8A7796_CLK_CSI0), |
184 | DEF_MOD("csi40", 716, R8A7796_CLK_CSI0), | 184 | DEF_MOD("csi40", 716, R8A7796_CLK_CSI0), |
185 | DEF_MOD("du2", 722, R8A7796_CLK_S2D1), | 185 | DEF_MOD("du2", 722, R8A7796_CLK_S2D1), |
diff --git a/drivers/clk/renesas/r8a77965-cpg-mssr.c b/drivers/clk/renesas/r8a77965-cpg-mssr.c index ab25bd5f1371..48a9add7d4db 100644 --- a/drivers/clk/renesas/r8a77965-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77965-cpg-mssr.c | |||
@@ -177,7 +177,7 @@ static const struct mssr_mod_clk r8a77965_mod_clks[] __initconst = { | |||
177 | 177 | ||
178 | DEF_MOD("ehci1", 702, R8A77965_CLK_S3D2), | 178 | DEF_MOD("ehci1", 702, R8A77965_CLK_S3D2), |
179 | DEF_MOD("ehci0", 703, R8A77965_CLK_S3D2), | 179 | DEF_MOD("ehci0", 703, R8A77965_CLK_S3D2), |
180 | DEF_MOD("hsusb", 704, R8A77965_CLK_S3D4), | 180 | DEF_MOD("hsusb", 704, R8A77965_CLK_S3D2), |
181 | DEF_MOD("csi20", 714, R8A77965_CLK_CSI0), | 181 | DEF_MOD("csi20", 714, R8A77965_CLK_CSI0), |
182 | DEF_MOD("csi40", 716, R8A77965_CLK_CSI0), | 182 | DEF_MOD("csi40", 716, R8A77965_CLK_CSI0), |
183 | DEF_MOD("du3", 721, R8A77965_CLK_S2D1), | 183 | DEF_MOD("du3", 721, R8A77965_CLK_S2D1), |
diff --git a/drivers/clk/renesas/r8a77990-cpg-mssr.c b/drivers/clk/renesas/r8a77990-cpg-mssr.c index 3f22b8565648..3a88d2247cf5 100644 --- a/drivers/clk/renesas/r8a77990-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77990-cpg-mssr.c | |||
@@ -182,7 +182,7 @@ static const struct mssr_mod_clk r8a77990_mod_clks[] __initconst = { | |||
182 | DEF_MOD("vspi0", 631, R8A77990_CLK_S0D1), | 182 | DEF_MOD("vspi0", 631, R8A77990_CLK_S0D1), |
183 | 183 | ||
184 | DEF_MOD("ehci0", 703, R8A77990_CLK_S3D2), | 184 | DEF_MOD("ehci0", 703, R8A77990_CLK_S3D2), |
185 | DEF_MOD("hsusb", 704, R8A77990_CLK_S3D4), | 185 | DEF_MOD("hsusb", 704, R8A77990_CLK_S3D2), |
186 | DEF_MOD("csi40", 716, R8A77990_CLK_CSI0), | 186 | DEF_MOD("csi40", 716, R8A77990_CLK_CSI0), |
187 | DEF_MOD("du1", 723, R8A77990_CLK_S1D1), | 187 | DEF_MOD("du1", 723, R8A77990_CLK_S1D1), |
188 | DEF_MOD("du0", 724, R8A77990_CLK_S1D1), | 188 | DEF_MOD("du0", 724, R8A77990_CLK_S1D1), |