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

clk: uniphier: rename MIO clock to SD clock for Pro5, PXs2, LD20 SoCs

I made a mistake as for naming for this block. The MIO block is not
implemented for these 3 SoCs in the first place. The current naming
will be a trouble if an SoC with both MIO and SD-ctrl blocks appear
in the future.

This driver has just been merged in the previous merge window.
Rename it before the release.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

authored by

Masahiro Yamada and committed by
Stephen Boyd
5c6201e6 7d36b9c1

+17 -17
+8 -8
Documentation/devicetree/bindings/clock/uniphier-clock.txt
··· 24 24 reg = <0x61840000 0x4000>; 25 25 26 26 clock { 27 - compatible = "socionext,uniphier-ld20-clock"; 27 + compatible = "socionext,uniphier-ld11-clock"; 28 28 #clock-cells = <1>; 29 29 }; 30 30 ··· 43 43 21: USB3 ch1 PHY1 44 44 45 45 46 - Media I/O (MIO) clock 47 - --------------------- 46 + Media I/O (MIO) clock, SD clock 47 + ------------------------------- 48 48 49 49 Required properties: 50 50 - compatible: should be one of the following: ··· 52 52 "socionext,uniphier-ld4-mio-clock" - for LD4 SoC. 53 53 "socionext,uniphier-pro4-mio-clock" - for Pro4 SoC. 54 54 "socionext,uniphier-sld8-mio-clock" - for sLD8 SoC. 55 - "socionext,uniphier-pro5-mio-clock" - for Pro5 SoC. 56 - "socionext,uniphier-pxs2-mio-clock" - for PXs2/LD6b SoC. 55 + "socionext,uniphier-pro5-sd-clock" - for Pro5 SoC. 56 + "socionext,uniphier-pxs2-sd-clock" - for PXs2/LD6b SoC. 57 57 "socionext,uniphier-ld11-mio-clock" - for LD11 SoC. 58 - "socionext,uniphier-ld20-mio-clock" - for LD20 SoC. 58 + "socionext,uniphier-ld20-sd-clock" - for LD20 SoC. 59 59 - #clock-cells: should be 1. 60 60 61 61 Example: ··· 66 66 reg = <0x59810000 0x800>; 67 67 68 68 clock { 69 - compatible = "socionext,uniphier-ld20-mio-clock"; 69 + compatible = "socionext,uniphier-ld11-mio-clock"; 70 70 #clock-cells = <1>; 71 71 }; 72 72 ··· 112 112 reg = <0x59820000 0x200>; 113 113 114 114 clock { 115 - compatible = "socionext,uniphier-ld20-peri-clock"; 115 + compatible = "socionext,uniphier-ld11-peri-clock"; 116 116 #clock-cells = <1>; 117 117 }; 118 118
+7 -7
drivers/clk/uniphier/clk-uniphier-core.c
··· 142 142 .compatible = "socionext,uniphier-ld20-clock", 143 143 .data = uniphier_ld20_sys_clk_data, 144 144 }, 145 - /* Media I/O clock */ 145 + /* Media I/O clock, SD clock */ 146 146 { 147 147 .compatible = "socionext,uniphier-sld3-mio-clock", 148 148 .data = uniphier_sld3_mio_clk_data, ··· 160 160 .data = uniphier_sld3_mio_clk_data, 161 161 }, 162 162 { 163 - .compatible = "socionext,uniphier-pro5-mio-clock", 164 - .data = uniphier_pro5_mio_clk_data, 163 + .compatible = "socionext,uniphier-pro5-sd-clock", 164 + .data = uniphier_pro5_sd_clk_data, 165 165 }, 166 166 { 167 - .compatible = "socionext,uniphier-pxs2-mio-clock", 168 - .data = uniphier_pro5_mio_clk_data, 167 + .compatible = "socionext,uniphier-pxs2-sd-clock", 168 + .data = uniphier_pro5_sd_clk_data, 169 169 }, 170 170 { 171 171 .compatible = "socionext,uniphier-ld11-mio-clock", 172 172 .data = uniphier_sld3_mio_clk_data, 173 173 }, 174 174 { 175 - .compatible = "socionext,uniphier-ld20-mio-clock", 176 - .data = uniphier_pro5_mio_clk_data, 175 + .compatible = "socionext,uniphier-ld20-sd-clock", 176 + .data = uniphier_pro5_sd_clk_data, 177 177 }, 178 178 /* Peripheral clock */ 179 179 {
+1 -1
drivers/clk/uniphier/clk-uniphier-mio.c
··· 93 93 { /* sentinel */ } 94 94 }; 95 95 96 - const struct uniphier_clk_data uniphier_pro5_mio_clk_data[] = { 96 + const struct uniphier_clk_data uniphier_pro5_sd_clk_data[] = { 97 97 UNIPHIER_MIO_CLK_SD_FIXED, 98 98 UNIPHIER_MIO_CLK_SD(0, 0), 99 99 UNIPHIER_MIO_CLK_SD(1, 1),
+1 -1
drivers/clk/uniphier/clk-uniphier.h
··· 115 115 extern const struct uniphier_clk_data uniphier_ld11_sys_clk_data[]; 116 116 extern const struct uniphier_clk_data uniphier_ld20_sys_clk_data[]; 117 117 extern const struct uniphier_clk_data uniphier_sld3_mio_clk_data[]; 118 - extern const struct uniphier_clk_data uniphier_pro5_mio_clk_data[]; 118 + extern const struct uniphier_clk_data uniphier_pro5_sd_clk_data[]; 119 119 extern const struct uniphier_clk_data uniphier_ld4_peri_clk_data[]; 120 120 extern const struct uniphier_clk_data uniphier_pro4_peri_clk_data[]; 121 121