diff options
| author | Takeshi Kihara <takeshi.kihara.df@renesas.com> | 2019-03-08 06:53:19 -0500 |
|---|---|---|
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2019-04-02 04:08:39 -0400 |
| commit | 3c14505c68ca6b3b4d5258886e238f2a81729f06 (patch) | |
| tree | 1d645e758beef2cfc6e784ff54d584bd0dc92e97 | |
| parent | b9df2ea2b8d09ad850afe4d4a0403cb23d9e0c02 (diff) | |
clk: renesas: rcar-gen3: Rename DRIF clocks
According to the R-Car Gen3 Hardware Manual Errata for Rev. 1.50 of Feb
12, 2019, the DRIF clocks have been renamed as follows:
DRIF0 to DRIF00
DRIF1 to DRIF01
DRIF2 to DRIF10
DRIF3 to DRIF11
DRIF4 to DRIF20
DRIF5 to DRIF21
DRIF6 to DRIF30
DRIF7 to DRIF31
Therefore, this patch renames the DRIF clocks from DRIFn to DRIFmm.
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | drivers/clk/renesas/r8a7795-cpg-mssr.c | 18 | ||||
| -rw-r--r-- | drivers/clk/renesas/r8a7796-cpg-mssr.c | 16 | ||||
| -rw-r--r-- | drivers/clk/renesas/r8a77965-cpg-mssr.c | 17 | ||||
| -rw-r--r-- | drivers/clk/renesas/r8a77990-cpg-mssr.c | 18 |
4 files changed, 35 insertions, 34 deletions
diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c index e5fa9f6c1ec4..9e9a6f2c31e8 100644 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * r8a7795 Clock Pulse Generator / Module Standby and Software Reset | 3 | * r8a7795 Clock Pulse Generator / Module Standby and Software Reset |
| 4 | * | 4 | * |
| 5 | * Copyright (C) 2015 Glider bvba | 5 | * Copyright (C) 2015 Glider bvba |
| 6 | * Copyright (C) 2018 Renesas Electronics Corp. | 6 | * Copyright (C) 2018-2019 Renesas Electronics Corp. |
| 7 | * | 7 | * |
| 8 | * Based on clk-rcar-gen3.c | 8 | * Based on clk-rcar-gen3.c |
| 9 | * | 9 | * |
| @@ -156,14 +156,14 @@ static struct mssr_mod_clk r8a7795_mod_clks[] __initdata = { | |||
| 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_S1D2), | 157 | DEF_MOD("audmac1", 501, R8A7795_CLK_S1D2), |
| 158 | DEF_MOD("audmac0", 502, R8A7795_CLK_S1D2), | 158 | DEF_MOD("audmac0", 502, R8A7795_CLK_S1D2), |
| 159 | DEF_MOD("drif7", 508, R8A7795_CLK_S3D2), | 159 | DEF_MOD("drif31", 508, R8A7795_CLK_S3D2), |
| 160 | DEF_MOD("drif6", 509, R8A7795_CLK_S3D2), | 160 | DEF_MOD("drif30", 509, R8A7795_CLK_S3D2), |
| 161 | DEF_MOD("drif5", 510, R8A7795_CLK_S3D2), | 161 | DEF_MOD("drif21", 510, R8A7795_CLK_S3D2), |
| 162 | DEF_MOD("drif4", 511, R8A7795_CLK_S3D2), | 162 | DEF_MOD("drif20", 511, R8A7795_CLK_S3D2), |
| 163 | DEF_MOD("drif3", 512, R8A7795_CLK_S3D2), | 163 | DEF_MOD("drif11", 512, R8A7795_CLK_S3D2), |
| 164 | DEF_MOD("drif2", 513, R8A7795_CLK_S3D2), | 164 | DEF_MOD("drif10", 513, R8A7795_CLK_S3D2), |
| 165 | DEF_MOD("drif1", 514, R8A7795_CLK_S3D2), | 165 | DEF_MOD("drif01", 514, R8A7795_CLK_S3D2), |
| 166 | DEF_MOD("drif0", 515, R8A7795_CLK_S3D2), | 166 | DEF_MOD("drif00", 515, R8A7795_CLK_S3D2), |
| 167 | DEF_MOD("hscif4", 516, R8A7795_CLK_S3D1), | 167 | DEF_MOD("hscif4", 516, R8A7795_CLK_S3D1), |
| 168 | DEF_MOD("hscif3", 517, R8A7795_CLK_S3D1), | 168 | DEF_MOD("hscif3", 517, R8A7795_CLK_S3D1), |
| 169 | DEF_MOD("hscif2", 518, R8A7795_CLK_S3D1), | 169 | DEF_MOD("hscif2", 518, R8A7795_CLK_S3D1), |
diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c index 73c69152c77b..d8e9af5d9ae9 100644 --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c | |||
| @@ -149,14 +149,14 @@ static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = { | |||
| 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_S1D2), | 150 | DEF_MOD("audmac1", 501, R8A7796_CLK_S1D2), |
| 151 | DEF_MOD("audmac0", 502, R8A7796_CLK_S1D2), | 151 | DEF_MOD("audmac0", 502, R8A7796_CLK_S1D2), |
| 152 | DEF_MOD("drif7", 508, R8A7796_CLK_S3D2), | 152 | DEF_MOD("drif31", 508, R8A7796_CLK_S3D2), |
| 153 | DEF_MOD("drif6", 509, R8A7796_CLK_S3D2), | 153 | DEF_MOD("drif30", 509, R8A7796_CLK_S3D2), |
| 154 | DEF_MOD("drif5", 510, R8A7796_CLK_S3D2), | 154 | DEF_MOD("drif21", 510, R8A7796_CLK_S3D2), |
| 155 | DEF_MOD("drif4", 511, R8A7796_CLK_S3D2), | 155 | DEF_MOD("drif20", 511, R8A7796_CLK_S3D2), |
| 156 | DEF_MOD("drif3", 512, R8A7796_CLK_S3D2), | 156 | DEF_MOD("drif11", 512, R8A7796_CLK_S3D2), |
| 157 | DEF_MOD("drif2", 513, R8A7796_CLK_S3D2), | 157 | DEF_MOD("drif10", 513, R8A7796_CLK_S3D2), |
| 158 | DEF_MOD("drif1", 514, R8A7796_CLK_S3D2), | 158 | DEF_MOD("drif01", 514, R8A7796_CLK_S3D2), |
| 159 | DEF_MOD("drif0", 515, R8A7796_CLK_S3D2), | 159 | DEF_MOD("drif00", 515, R8A7796_CLK_S3D2), |
| 160 | DEF_MOD("hscif4", 516, R8A7796_CLK_S3D1), | 160 | DEF_MOD("hscif4", 516, R8A7796_CLK_S3D1), |
| 161 | DEF_MOD("hscif3", 517, R8A7796_CLK_S3D1), | 161 | DEF_MOD("hscif3", 517, R8A7796_CLK_S3D1), |
| 162 | DEF_MOD("hscif2", 518, R8A7796_CLK_S3D1), | 162 | DEF_MOD("hscif2", 518, R8A7796_CLK_S3D1), |
diff --git a/drivers/clk/renesas/r8a77965-cpg-mssr.c b/drivers/clk/renesas/r8a77965-cpg-mssr.c index a0ce2ecb656d..8f87e314d949 100644 --- a/drivers/clk/renesas/r8a77965-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77965-cpg-mssr.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * r8a77965 Clock Pulse Generator / Module Standby and Software Reset | 3 | * r8a77965 Clock Pulse Generator / Module Standby and Software Reset |
| 4 | * | 4 | * |
| 5 | * Copyright (C) 2018 Jacopo Mondi <jacopo+renesas@jmondi.org> | 5 | * Copyright (C) 2018 Jacopo Mondi <jacopo+renesas@jmondi.org> |
| 6 | * Copyright (C) 2019 Renesas Electronics Corp. | ||
| 6 | * | 7 | * |
| 7 | * Based on r8a7795-cpg-mssr.c | 8 | * Based on r8a7795-cpg-mssr.c |
| 8 | * | 9 | * |
| @@ -148,14 +149,14 @@ static const struct mssr_mod_clk r8a77965_mod_clks[] __initconst = { | |||
| 148 | 149 | ||
| 149 | DEF_MOD("audmac1", 501, R8A77965_CLK_S1D2), | 150 | DEF_MOD("audmac1", 501, R8A77965_CLK_S1D2), |
| 150 | DEF_MOD("audmac0", 502, R8A77965_CLK_S1D2), | 151 | DEF_MOD("audmac0", 502, R8A77965_CLK_S1D2), |
| 151 | DEF_MOD("drif7", 508, R8A77965_CLK_S3D2), | 152 | DEF_MOD("drif31", 508, R8A77965_CLK_S3D2), |
| 152 | DEF_MOD("drif6", 509, R8A77965_CLK_S3D2), | 153 | DEF_MOD("drif30", 509, R8A77965_CLK_S3D2), |
| 153 | DEF_MOD("drif5", 510, R8A77965_CLK_S3D2), | 154 | DEF_MOD("drif21", 510, R8A77965_CLK_S3D2), |
| 154 | DEF_MOD("drif4", 511, R8A77965_CLK_S3D2), | 155 | DEF_MOD("drif20", 511, R8A77965_CLK_S3D2), |
| 155 | DEF_MOD("drif3", 512, R8A77965_CLK_S3D2), | 156 | DEF_MOD("drif11", 512, R8A77965_CLK_S3D2), |
| 156 | DEF_MOD("drif2", 513, R8A77965_CLK_S3D2), | 157 | DEF_MOD("drif10", 513, R8A77965_CLK_S3D2), |
| 157 | DEF_MOD("drif1", 514, R8A77965_CLK_S3D2), | 158 | DEF_MOD("drif01", 514, R8A77965_CLK_S3D2), |
| 158 | DEF_MOD("drif0", 515, R8A77965_CLK_S3D2), | 159 | DEF_MOD("drif00", 515, R8A77965_CLK_S3D2), |
| 159 | DEF_MOD("hscif4", 516, R8A77965_CLK_S3D1), | 160 | DEF_MOD("hscif4", 516, R8A77965_CLK_S3D1), |
| 160 | DEF_MOD("hscif3", 517, R8A77965_CLK_S3D1), | 161 | DEF_MOD("hscif3", 517, R8A77965_CLK_S3D1), |
| 161 | DEF_MOD("hscif2", 518, R8A77965_CLK_S3D1), | 162 | DEF_MOD("hscif2", 518, R8A77965_CLK_S3D1), |
diff --git a/drivers/clk/renesas/r8a77990-cpg-mssr.c b/drivers/clk/renesas/r8a77990-cpg-mssr.c index 53973201a9f5..9570404baa58 100644 --- a/drivers/clk/renesas/r8a77990-cpg-mssr.c +++ b/drivers/clk/renesas/r8a77990-cpg-mssr.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | /* | 2 | /* |
| 3 | * r8a77990 Clock Pulse Generator / Module Standby and Software Reset | 3 | * r8a77990 Clock Pulse Generator / Module Standby and Software Reset |
| 4 | * | 4 | * |
| 5 | * Copyright (C) 2018 Renesas Electronics Corp. | 5 | * Copyright (C) 2018-2019 Renesas Electronics Corp. |
| 6 | * | 6 | * |
| 7 | * Based on r8a7795-cpg-mssr.c | 7 | * Based on r8a7795-cpg-mssr.c |
| 8 | * | 8 | * |
| @@ -154,14 +154,14 @@ static const struct mssr_mod_clk r8a77990_mod_clks[] __initconst = { | |||
| 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_S1D2), | 156 | DEF_MOD("audmac0", 502, R8A77990_CLK_S1D2), |
| 157 | DEF_MOD("drif7", 508, R8A77990_CLK_S3D2), | 157 | DEF_MOD("drif31", 508, R8A77990_CLK_S3D2), |
| 158 | DEF_MOD("drif6", 509, R8A77990_CLK_S3D2), | 158 | DEF_MOD("drif30", 509, R8A77990_CLK_S3D2), |
| 159 | DEF_MOD("drif5", 510, R8A77990_CLK_S3D2), | 159 | DEF_MOD("drif21", 510, R8A77990_CLK_S3D2), |
| 160 | DEF_MOD("drif4", 511, R8A77990_CLK_S3D2), | 160 | DEF_MOD("drif20", 511, R8A77990_CLK_S3D2), |
| 161 | DEF_MOD("drif3", 512, R8A77990_CLK_S3D2), | 161 | DEF_MOD("drif11", 512, R8A77990_CLK_S3D2), |
| 162 | DEF_MOD("drif2", 513, R8A77990_CLK_S3D2), | 162 | DEF_MOD("drif10", 513, R8A77990_CLK_S3D2), |
| 163 | DEF_MOD("drif1", 514, R8A77990_CLK_S3D2), | 163 | DEF_MOD("drif01", 514, R8A77990_CLK_S3D2), |
| 164 | DEF_MOD("drif0", 515, R8A77990_CLK_S3D2), | 164 | DEF_MOD("drif00", 515, R8A77990_CLK_S3D2), |
| 165 | DEF_MOD("hscif4", 516, R8A77990_CLK_S3D1C), | 165 | DEF_MOD("hscif4", 516, R8A77990_CLK_S3D1C), |
| 166 | DEF_MOD("hscif3", 517, R8A77990_CLK_S3D1C), | 166 | DEF_MOD("hscif3", 517, R8A77990_CLK_S3D1C), |
| 167 | DEF_MOD("hscif2", 518, R8A77990_CLK_S3D1C), | 167 | DEF_MOD("hscif2", 518, R8A77990_CLK_S3D1C), |