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

reset: uniphier: rename MIO reset to SD reset 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>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>

+39 -39
+31 -31
Documentation/devicetree/bindings/reset/uniphier-reset.txt
··· 6 6 7 7 Required properties: 8 8 - compatible: should be one of the following: 9 - "socionext,uniphier-sld3-reset" - for PH1-sLD3 SoC. 10 - "socionext,uniphier-ld4-reset" - for PH1-LD4 SoC. 11 - "socionext,uniphier-pro4-reset" - for PH1-Pro4 SoC. 12 - "socionext,uniphier-sld8-reset" - for PH1-sLD8 SoC. 13 - "socionext,uniphier-pro5-reset" - for PH1-Pro5 SoC. 14 - "socionext,uniphier-pxs2-reset" - for ProXstream2/PH1-LD6b SoC. 15 - "socionext,uniphier-ld11-reset" - for PH1-LD11 SoC. 16 - "socionext,uniphier-ld20-reset" - for PH1-LD20 SoC. 9 + "socionext,uniphier-sld3-reset" - for sLD3 SoC. 10 + "socionext,uniphier-ld4-reset" - for LD4 SoC. 11 + "socionext,uniphier-pro4-reset" - for Pro4 SoC. 12 + "socionext,uniphier-sld8-reset" - for sLD8 SoC. 13 + "socionext,uniphier-pro5-reset" - for Pro5 SoC. 14 + "socionext,uniphier-pxs2-reset" - for PXs2/LD6b SoC. 15 + "socionext,uniphier-ld11-reset" - for LD11 SoC. 16 + "socionext,uniphier-ld20-reset" - for LD20 SoC. 17 17 - #reset-cells: should be 1. 18 18 19 19 Example: 20 20 21 21 sysctrl@61840000 { 22 - compatible = "socionext,uniphier-ld20-sysctrl", 22 + compatible = "socionext,uniphier-ld11-sysctrl", 23 23 "simple-mfd", "syscon"; 24 24 reg = <0x61840000 0x4000>; 25 25 26 26 reset { 27 - compatible = "socionext,uniphier-ld20-reset"; 27 + compatible = "socionext,uniphier-ld11-reset"; 28 28 #reset-cells = <1>; 29 29 }; 30 30 ··· 32 32 }; 33 33 34 34 35 - Media I/O (MIO) reset 36 - --------------------- 35 + Media I/O (MIO) reset, SD reset 36 + ------------------------------- 37 37 38 38 Required properties: 39 39 - compatible: should be one of the following: 40 - "socionext,uniphier-sld3-mio-reset" - for PH1-sLD3 SoC. 41 - "socionext,uniphier-ld4-mio-reset" - for PH1-LD4 SoC. 42 - "socionext,uniphier-pro4-mio-reset" - for PH1-Pro4 SoC. 43 - "socionext,uniphier-sld8-mio-reset" - for PH1-sLD8 SoC. 44 - "socionext,uniphier-pro5-mio-reset" - for PH1-Pro5 SoC. 45 - "socionext,uniphier-pxs2-mio-reset" - for ProXstream2/PH1-LD6b SoC. 46 - "socionext,uniphier-ld11-mio-reset" - for PH1-LD11 SoC. 47 - "socionext,uniphier-ld20-mio-reset" - for PH1-LD20 SoC. 40 + "socionext,uniphier-sld3-mio-reset" - for sLD3 SoC. 41 + "socionext,uniphier-ld4-mio-reset" - for LD4 SoC. 42 + "socionext,uniphier-pro4-mio-reset" - for Pro4 SoC. 43 + "socionext,uniphier-sld8-mio-reset" - for sLD8 SoC. 44 + "socionext,uniphier-pro5-sd-reset" - for Pro5 SoC. 45 + "socionext,uniphier-pxs2-sd-reset" - for PXs2/LD6b SoC. 46 + "socionext,uniphier-ld11-mio-reset" - for LD11 SoC. 47 + "socionext,uniphier-ld20-sd-reset" - for LD20 SoC. 48 48 - #reset-cells: should be 1. 49 49 50 50 Example: 51 51 52 52 mioctrl@59810000 { 53 - compatible = "socionext,uniphier-ld20-mioctrl", 53 + compatible = "socionext,uniphier-ld11-mioctrl", 54 54 "simple-mfd", "syscon"; 55 55 reg = <0x59810000 0x800>; 56 56 57 57 reset { 58 - compatible = "socionext,uniphier-ld20-mio-reset"; 58 + compatible = "socionext,uniphier-ld11-mio-reset"; 59 59 #reset-cells = <1>; 60 60 }; 61 61 ··· 68 68 69 69 Required properties: 70 70 - compatible: should be one of the following: 71 - "socionext,uniphier-ld4-peri-reset" - for PH1-LD4 SoC. 72 - "socionext,uniphier-pro4-peri-reset" - for PH1-Pro4 SoC. 73 - "socionext,uniphier-sld8-peri-reset" - for PH1-sLD8 SoC. 74 - "socionext,uniphier-pro5-peri-reset" - for PH1-Pro5 SoC. 75 - "socionext,uniphier-pxs2-peri-reset" - for ProXstream2/PH1-LD6b SoC. 76 - "socionext,uniphier-ld11-peri-reset" - for PH1-LD11 SoC. 77 - "socionext,uniphier-ld20-peri-reset" - for PH1-LD20 SoC. 71 + "socionext,uniphier-ld4-peri-reset" - for LD4 SoC. 72 + "socionext,uniphier-pro4-peri-reset" - for Pro4 SoC. 73 + "socionext,uniphier-sld8-peri-reset" - for sLD8 SoC. 74 + "socionext,uniphier-pro5-peri-reset" - for Pro5 SoC. 75 + "socionext,uniphier-pxs2-peri-reset" - for PXs2/LD6b SoC. 76 + "socionext,uniphier-ld11-peri-reset" - for LD11 SoC. 77 + "socionext,uniphier-ld20-peri-reset" - for LD20 SoC. 78 78 - #reset-cells: should be 1. 79 79 80 80 Example: 81 81 82 82 perictrl@59820000 { 83 - compatible = "socionext,uniphier-ld20-perictrl", 83 + compatible = "socionext,uniphier-ld11-perictrl", 84 84 "simple-mfd", "syscon"; 85 85 reg = <0x59820000 0x200>; 86 86 87 87 reset { 88 - compatible = "socionext,uniphier-ld20-peri-reset"; 88 + compatible = "socionext,uniphier-ld11-peri-reset"; 89 89 #reset-cells = <1>; 90 90 }; 91 91
+8 -8
drivers/reset/reset-uniphier.c
··· 154 154 UNIPHIER_RESET_END, 155 155 }; 156 156 157 - const struct uniphier_reset_data uniphier_pro5_mio_reset_data[] = { 157 + const struct uniphier_reset_data uniphier_pro5_sd_reset_data[] = { 158 158 UNIPHIER_MIO_RESET_SD(0, 0), 159 159 UNIPHIER_MIO_RESET_SD(1, 1), 160 160 UNIPHIER_MIO_RESET_EMMC_HW_RESET(6, 1), ··· 360 360 .compatible = "socionext,uniphier-ld20-reset", 361 361 .data = uniphier_ld20_sys_reset_data, 362 362 }, 363 - /* Media I/O reset */ 363 + /* Media I/O reset, SD reset */ 364 364 { 365 365 .compatible = "socionext,uniphier-sld3-mio-reset", 366 366 .data = uniphier_sld3_mio_reset_data, ··· 378 378 .data = uniphier_sld3_mio_reset_data, 379 379 }, 380 380 { 381 - .compatible = "socionext,uniphier-pro5-mio-reset", 382 - .data = uniphier_pro5_mio_reset_data, 381 + .compatible = "socionext,uniphier-pro5-sd-reset", 382 + .data = uniphier_pro5_sd_reset_data, 383 383 }, 384 384 { 385 - .compatible = "socionext,uniphier-pxs2-mio-reset", 386 - .data = uniphier_pro5_mio_reset_data, 385 + .compatible = "socionext,uniphier-pxs2-sd-reset", 386 + .data = uniphier_pro5_sd_reset_data, 387 387 }, 388 388 { 389 389 .compatible = "socionext,uniphier-ld11-mio-reset", 390 390 .data = uniphier_sld3_mio_reset_data, 391 391 }, 392 392 { 393 - .compatible = "socionext,uniphier-ld20-mio-reset", 394 - .data = uniphier_pro5_mio_reset_data, 393 + .compatible = "socionext,uniphier-ld20-sd-reset", 394 + .data = uniphier_pro5_sd_reset_data, 395 395 }, 396 396 /* Peripheral reset */ 397 397 {