diff options
author | Takeshi Kihara <takeshi.kihara.df@renesas.com> | 2018-09-28 03:33:06 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2019-04-02 04:08:35 -0400 |
commit | b9df2ea2b8d09ad850afe4d4a0403cb23d9e0c02 (patch) | |
tree | 29542673c4b3ecce38b1b87f6b02f77f2ec375fb | |
parent | 3c772f71a552d343a96868ed9a809f9047be94f5 (diff) |
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>
-rw-r--r-- | drivers/clk/renesas/r8a774a1-cpg-mssr.c | 4 | ||||
-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 | 4 | ||||
-rw-r--r-- | drivers/clk/renesas/r8a77965-cpg-mssr.c | 4 | ||||
-rw-r--r-- | drivers/clk/renesas/r8a77990-cpg-mssr.c | 2 | ||||
-rw-r--r-- | drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/drivers/clk/renesas/r8a774a1-cpg-mssr.c b/drivers/clk/renesas/r8a774a1-cpg-mssr.c index 13bf7260204f..76ed7d1bae36 100644 --- a/drivers/clk/renesas/r8a774a1-cpg-mssr.c +++ b/drivers/clk/renesas/r8a774a1-cpg-mssr.c | |||
@@ -143,8 +143,8 @@ static const struct mssr_mod_clk r8a774a1_mod_clks[] __initconst = { | |||
143 | DEF_MOD("rwdt", 402, R8A774A1_CLK_R), | 143 | DEF_MOD("rwdt", 402, R8A774A1_CLK_R), |
144 | DEF_MOD("intc-ex", 407, R8A774A1_CLK_CP), | 144 | DEF_MOD("intc-ex", 407, R8A774A1_CLK_CP), |
145 | DEF_MOD("intc-ap", 408, R8A774A1_CLK_S0D3), | 145 | DEF_MOD("intc-ap", 408, R8A774A1_CLK_S0D3), |
146 | DEF_MOD("audmac1", 501, R8A774A1_CLK_S0D3), | 146 | DEF_MOD("audmac1", 501, R8A774A1_CLK_S1D2), |
147 | DEF_MOD("audmac0", 502, R8A774A1_CLK_S0D3), | 147 | DEF_MOD("audmac0", 502, R8A774A1_CLK_S1D2), |
148 | DEF_MOD("hscif4", 516, R8A774A1_CLK_S3D1), | 148 | DEF_MOD("hscif4", 516, R8A774A1_CLK_S3D1), |
149 | DEF_MOD("hscif3", 517, R8A774A1_CLK_S3D1), | 149 | DEF_MOD("hscif3", 517, R8A774A1_CLK_S3D1), |
150 | DEF_MOD("hscif2", 518, R8A774A1_CLK_S3D1), | 150 | DEF_MOD("hscif2", 518, R8A774A1_CLK_S3D1), |
diff --git a/drivers/clk/renesas/r8a774c0-cpg-mssr.c b/drivers/clk/renesas/r8a774c0-cpg-mssr.c index c33d3b037081..f91e7a484753 100644 --- a/drivers/clk/renesas/r8a774c0-cpg-mssr.c +++ b/drivers/clk/renesas/r8a774c0-cpg-mssr.c | |||
@@ -158,7 +158,7 @@ static const struct mssr_mod_clk r8a774c0_mod_clks[] __initconst = { | |||
158 | DEF_MOD("intc-ex", 407, R8A774C0_CLK_CP), | 158 | DEF_MOD("intc-ex", 407, R8A774C0_CLK_CP), |
159 | DEF_MOD("intc-ap", 408, R8A774C0_CLK_S0D3), | 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 | DEF_MOD("hscif4", 516, R8A774C0_CLK_S3D1C), | 162 | DEF_MOD("hscif4", 516, R8A774C0_CLK_S3D1C), |
163 | DEF_MOD("hscif3", 517, R8A774C0_CLK_S3D1C), | 163 | DEF_MOD("hscif3", 517, R8A774C0_CLK_S3D1C), |
164 | DEF_MOD("hscif2", 518, R8A774C0_CLK_S3D1C), | 164 | DEF_MOD("hscif2", 518, R8A774C0_CLK_S3D1C), |
diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c index a576a42f1044..e5fa9f6c1ec4 100644 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c | |||
@@ -154,8 +154,8 @@ static struct mssr_mod_clk r8a7795_mod_clks[] __initdata = { | |||
154 | DEF_MOD("rwdt", 402, R8A7795_CLK_R), | 154 | DEF_MOD("rwdt", 402, R8A7795_CLK_R), |
155 | DEF_MOD("intc-ex", 407, R8A7795_CLK_CP), | 155 | DEF_MOD("intc-ex", 407, R8A7795_CLK_CP), |
156 | DEF_MOD("intc-ap", 408, R8A7795_CLK_S0D3), | 156 | DEF_MOD("intc-ap", 408, R8A7795_CLK_S0D3), |
157 | DEF_MOD("audmac1", 501, R8A7795_CLK_S0D3), | 157 | DEF_MOD("audmac1", 501, R8A7795_CLK_S1D2), |
158 | DEF_MOD("audmac0", 502, R8A7795_CLK_S0D3), | 158 | DEF_MOD("audmac0", 502, R8A7795_CLK_S1D2), |
159 | DEF_MOD("drif7", 508, R8A7795_CLK_S3D2), | 159 | DEF_MOD("drif7", 508, R8A7795_CLK_S3D2), |
160 | DEF_MOD("drif6", 509, R8A7795_CLK_S3D2), | 160 | DEF_MOD("drif6", 509, R8A7795_CLK_S3D2), |
161 | DEF_MOD("drif5", 510, R8A7795_CLK_S3D2), | 161 | DEF_MOD("drif5", 510, R8A7795_CLK_S3D2), |
diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c index 369092e8d893..73c69152c77b 100644 --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c | |||
@@ -147,8 +147,8 @@ static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = { | |||
147 | DEF_MOD("rwdt", 402, R8A7796_CLK_R), | 147 | DEF_MOD("rwdt", 402, R8A7796_CLK_R), |
148 | DEF_MOD("intc-ex", 407, R8A7796_CLK_CP), | 148 | DEF_MOD("intc-ex", 407, R8A7796_CLK_CP), |
149 | DEF_MOD("intc-ap", 408, R8A7796_CLK_S0D3), | 149 | DEF_MOD("intc-ap", 408, R8A7796_CLK_S0D3), |
150 | DEF_MOD("audmac1", 501, R8A7796_CLK_S0D3), | 150 | DEF_MOD("audmac1", 501, R8A7796_CLK_S1D2), |
151 | DEF_MOD("audmac0", 502, R8A7796_CLK_S0D3), | 151 | DEF_MOD("audmac0", 502, R8A7796_CLK_S1D2), |
152 | DEF_MOD("drif7", 508, R8A7796_CLK_S3D2), | 152 | DEF_MOD("drif7", 508, R8A7796_CLK_S3D2), |
153 | DEF_MOD("drif6", 509, R8A7796_CLK_S3D2), | 153 | DEF_MOD("drif6", 509, R8A7796_CLK_S3D2), |
154 | DEF_MOD("drif5", 510, R8A7796_CLK_S3D2), | 154 | DEF_MOD("drif5", 510, R8A7796_CLK_S3D2), |
diff --git a/drivers/clk/renesas/r8a77965-cpg-mssr.c b/drivers/clk/renesas/r8a77965-cpg-mssr.c index 623bbda2d24e..a0ce2ecb656d 100644 --- a/drivers/clk/renesas/r8a77965-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77965-cpg-mssr.c | |||
@@ -146,8 +146,8 @@ static const struct mssr_mod_clk r8a77965_mod_clks[] __initconst = { | |||
146 | DEF_MOD("intc-ex", 407, R8A77965_CLK_CP), | 146 | DEF_MOD("intc-ex", 407, R8A77965_CLK_CP), |
147 | DEF_MOD("intc-ap", 408, R8A77965_CLK_S0D3), | 147 | DEF_MOD("intc-ap", 408, R8A77965_CLK_S0D3), |
148 | 148 | ||
149 | DEF_MOD("audmac1", 501, R8A77965_CLK_S0D3), | 149 | DEF_MOD("audmac1", 501, R8A77965_CLK_S1D2), |
150 | DEF_MOD("audmac0", 502, R8A77965_CLK_S0D3), | 150 | DEF_MOD("audmac0", 502, R8A77965_CLK_S1D2), |
151 | DEF_MOD("drif7", 508, R8A77965_CLK_S3D2), | 151 | DEF_MOD("drif7", 508, R8A77965_CLK_S3D2), |
152 | DEF_MOD("drif6", 509, R8A77965_CLK_S3D2), | 152 | DEF_MOD("drif6", 509, R8A77965_CLK_S3D2), |
153 | DEF_MOD("drif5", 510, R8A77965_CLK_S3D2), | 153 | DEF_MOD("drif5", 510, R8A77965_CLK_S3D2), |
diff --git a/drivers/clk/renesas/r8a77990-cpg-mssr.c b/drivers/clk/renesas/r8a77990-cpg-mssr.c index 3a88d2247cf5..53973201a9f5 100644 --- a/drivers/clk/renesas/r8a77990-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77990-cpg-mssr.c | |||
@@ -153,7 +153,7 @@ static const struct mssr_mod_clk r8a77990_mod_clks[] __initconst = { | |||
153 | DEF_MOD("intc-ex", 407, R8A77990_CLK_CP), | 153 | DEF_MOD("intc-ex", 407, R8A77990_CLK_CP), |
154 | DEF_MOD("intc-ap", 408, R8A77990_CLK_S0D3), | 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 | DEF_MOD("drif7", 508, R8A77990_CLK_S3D2), | 157 | DEF_MOD("drif7", 508, R8A77990_CLK_S3D2), |
158 | DEF_MOD("drif6", 509, R8A77990_CLK_S3D2), | 158 | DEF_MOD("drif6", 509, R8A77990_CLK_S3D2), |
159 | DEF_MOD("drif5", 510, R8A77990_CLK_S3D2), | 159 | DEF_MOD("drif5", 510, R8A77990_CLK_S3D2), |
diff --git a/drivers/clk/renesas/r8a77995-cpg-mssr.c b/drivers/clk/renesas/r8a77995-cpg-mssr.c index eee3874865a9..68707277b17b 100644 --- a/drivers/clk/renesas/r8a77995-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77995-cpg-mssr.c | |||
@@ -133,7 +133,7 @@ static const struct mssr_mod_clk r8a77995_mod_clks[] __initconst = { | |||
133 | DEF_MOD("rwdt", 402, R8A77995_CLK_R), | 133 | DEF_MOD("rwdt", 402, R8A77995_CLK_R), |
134 | DEF_MOD("intc-ex", 407, R8A77995_CLK_CP), | 134 | DEF_MOD("intc-ex", 407, R8A77995_CLK_CP), |
135 | DEF_MOD("intc-ap", 408, R8A77995_CLK_S1D2), | 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 | DEF_MOD("hscif3", 517, R8A77995_CLK_S3D1C), | 137 | DEF_MOD("hscif3", 517, R8A77995_CLK_S3D1C), |
138 | DEF_MOD("hscif0", 520, R8A77995_CLK_S3D1C), | 138 | DEF_MOD("hscif0", 520, R8A77995_CLK_S3D1C), |
139 | DEF_MOD("thermal", 522, R8A77995_CLK_CP), | 139 | DEF_MOD("thermal", 522, R8A77995_CLK_CP), |