pinctrl: uniphier: fix register offsets for drive strength control

[cascardo/linux.git] / drivers / pinctrl / uniphier / pinctrl-uniphier-ld4.c

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
index 4a0439c..ad193c7 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
@@ -19,9 +19,9 @@
 
 #include "pinctrl-uniphier.h"
 
-#define DRIVER_NAME "ph1-ld4-pinctrl"
+#define DRIVER_NAME "uniphier-ld4-pinctrl"
 
-static const struct pinctrl_pin_desc ph1_ld4_pins[] = {
+static const struct pinctrl_pin_desc uniphier_ld4_pins[] = {
        UNIPHIER_PINCTRL_PIN(0, "EA1", UNIPHIER_PIN_IECTRL_NONE,
                             8, UNIPHIER_PIN_DRV_4_8,
                             8, UNIPHIER_PIN_PULL_DOWN),
@@ -92,31 +92,31 @@ static const struct pinctrl_pin_desc ph1_ld4_pins[] = {
                             0, UNIPHIER_PIN_DRV_8_12_16_20,
                             146, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(23, "MMCCMD", UNIPHIER_PIN_IECTRL_NONE,
-                            4, UNIPHIER_PIN_DRV_8_12_16_20,
+                            1, UNIPHIER_PIN_DRV_8_12_16_20,
                             147, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(24, "MMCDAT0", UNIPHIER_PIN_IECTRL_NONE,
-                            8, UNIPHIER_PIN_DRV_8_12_16_20,
+                            2, UNIPHIER_PIN_DRV_8_12_16_20,
                             148, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(25, "MMCDAT1", UNIPHIER_PIN_IECTRL_NONE,
-                            12, UNIPHIER_PIN_DRV_8_12_16_20,
+                            3, UNIPHIER_PIN_DRV_8_12_16_20,
                             149, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(26, "MMCDAT2", UNIPHIER_PIN_IECTRL_NONE,
-                            16, UNIPHIER_PIN_DRV_8_12_16_20,
+                            4, UNIPHIER_PIN_DRV_8_12_16_20,
                             150, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(27, "MMCDAT3", UNIPHIER_PIN_IECTRL_NONE,
-                            20, UNIPHIER_PIN_DRV_8_12_16_20,
+                            5, UNIPHIER_PIN_DRV_8_12_16_20,
                             151, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(28, "MMCDAT4", UNIPHIER_PIN_IECTRL_NONE,
-                            24, UNIPHIER_PIN_DRV_8_12_16_20,
+                            6, UNIPHIER_PIN_DRV_8_12_16_20,
                             152, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(29, "MMCDAT5", UNIPHIER_PIN_IECTRL_NONE,
-                            28, UNIPHIER_PIN_DRV_8_12_16_20,
+                            7, UNIPHIER_PIN_DRV_8_12_16_20,
                             153, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(30, "MMCDAT6", UNIPHIER_PIN_IECTRL_NONE,
-                            32, UNIPHIER_PIN_DRV_8_12_16_20,
+                            8, UNIPHIER_PIN_DRV_8_12_16_20,
                             154, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(31, "MMCDAT7", UNIPHIER_PIN_IECTRL_NONE,
-                            36, UNIPHIER_PIN_DRV_8_12_16_20,
+                            9, UNIPHIER_PIN_DRV_8_12_16_20,
                             155, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(32, "RMII_RXD0", 6,
                             39, UNIPHIER_PIN_DRV_4_8,
@@ -155,22 +155,22 @@ static const struct pinctrl_pin_desc ph1_ld4_pins[] = {
                             50, UNIPHIER_PIN_DRV_4_8,
                             50, UNIPHIER_PIN_PULL_DOWN),
        UNIPHIER_PINCTRL_PIN(44, "SDCLK", UNIPHIER_PIN_IECTRL_NONE,
-                            40, UNIPHIER_PIN_DRV_8_12_16_20,
+                            10, UNIPHIER_PIN_DRV_8_12_16_20,
                             156, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(45, "SDCMD", UNIPHIER_PIN_IECTRL_NONE,
-                            44, UNIPHIER_PIN_DRV_8_12_16_20,
+                            11, UNIPHIER_PIN_DRV_8_12_16_20,
                             157, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(46, "SDDAT0", UNIPHIER_PIN_IECTRL_NONE,
-                            48, UNIPHIER_PIN_DRV_8_12_16_20,
+                            12, UNIPHIER_PIN_DRV_8_12_16_20,
                             158, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(47, "SDDAT1", UNIPHIER_PIN_IECTRL_NONE,
-                            52, UNIPHIER_PIN_DRV_8_12_16_20,
+                            13, UNIPHIER_PIN_DRV_8_12_16_20,
                             159, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(48, "SDDAT2", UNIPHIER_PIN_IECTRL_NONE,
-                            56, UNIPHIER_PIN_DRV_8_12_16_20,
+                            14, UNIPHIER_PIN_DRV_8_12_16_20,
                             160, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(49, "SDDAT3", UNIPHIER_PIN_IECTRL_NONE,
-                            60, UNIPHIER_PIN_DRV_8_12_16_20,
+                            15, UNIPHIER_PIN_DRV_8_12_16_20,
                             161, UNIPHIER_PIN_PULL_UP),
        UNIPHIER_PINCTRL_PIN(50, "SDCD", UNIPHIER_PIN_IECTRL_NONE,
                             51, UNIPHIER_PIN_DRV_4_8,
@@ -612,7 +612,7 @@ static const unsigned xirq_range1_muxvals[] = {
        0, 14,                                          /* XIRQ14-15 */
 };
 
-static const struct uniphier_pinctrl_group ph1_ld4_groups[] = {
+static const struct uniphier_pinctrl_group uniphier_ld4_groups[] = {
        UNIPHIER_PINCTRL_GROUP(emmc),
        UNIPHIER_PINCTRL_GROUP(emmc_dat8),
        UNIPHIER_PINCTRL_GROUP(i2c0),
@@ -828,7 +828,7 @@ static const char * const xirq_groups[] = {
        "xirq12", /* none*/ "xirq14", "xirq15",
 };
 
-static const struct uniphier_pinmux_function ph1_ld4_functions[] = {
+static const struct uniphier_pinmux_function uniphier_ld4_functions[] = {
        UNIPHIER_PINMUX_FUNCTION(emmc),
        UNIPHIER_PINMUX_FUNCTION(i2c0),
        UNIPHIER_PINMUX_FUNCTION(i2c1),
@@ -847,43 +847,43 @@ static const struct uniphier_pinmux_function ph1_ld4_functions[] = {
        UNIPHIER_PINMUX_FUNCTION(xirq),
 };
 
-static struct uniphier_pinctrl_socdata ph1_ld4_pindata = {
-       .groups = ph1_ld4_groups,
-       .groups_count = ARRAY_SIZE(ph1_ld4_groups),
-       .functions = ph1_ld4_functions,
-       .functions_count = ARRAY_SIZE(ph1_ld4_functions),
+static struct uniphier_pinctrl_socdata uniphier_ld4_pindata = {
+       .groups = uniphier_ld4_groups,
+       .groups_count = ARRAY_SIZE(uniphier_ld4_groups),
+       .functions = uniphier_ld4_functions,
+       .functions_count = ARRAY_SIZE(uniphier_ld4_functions),
        .mux_bits = 8,
        .reg_stride = 4,
        .load_pinctrl = false,
 };
 
-static struct pinctrl_desc ph1_ld4_pinctrl_desc = {
+static struct pinctrl_desc uniphier_ld4_pinctrl_desc = {
        .name = DRIVER_NAME,
-       .pins = ph1_ld4_pins,
-       .npins = ARRAY_SIZE(ph1_ld4_pins),
+       .pins = uniphier_ld4_pins,
+       .npins = ARRAY_SIZE(uniphier_ld4_pins),
        .owner = THIS_MODULE,
 };
 
-static int ph1_ld4_pinctrl_probe(struct platform_device *pdev)
+static int uniphier_ld4_pinctrl_probe(struct platform_device *pdev)
 {
-       return uniphier_pinctrl_probe(pdev, &ph1_ld4_pinctrl_desc,
-                                     &ph1_ld4_pindata);
+       return uniphier_pinctrl_probe(pdev, &uniphier_ld4_pinctrl_desc,
+                                     &uniphier_ld4_pindata);
 }
 
-static const struct of_device_id ph1_ld4_pinctrl_match[] = {
+static const struct of_device_id uniphier_ld4_pinctrl_match[] = {
        { .compatible = "socionext,ph1-ld4-pinctrl" },
        { /* sentinel */ }
 };
-MODULE_DEVICE_TABLE(of, ph1_ld4_pinctrl_match);
+MODULE_DEVICE_TABLE(of, uniphier_ld4_pinctrl_match);
 
-static struct platform_driver ph1_ld4_pinctrl_driver = {
-       .probe = ph1_ld4_pinctrl_probe,
+static struct platform_driver uniphier_ld4_pinctrl_driver = {
+       .probe = uniphier_ld4_pinctrl_probe,
        .driver = {
                .name = DRIVER_NAME,
-               .of_match_table = ph1_ld4_pinctrl_match,
+               .of_match_table = uniphier_ld4_pinctrl_match,
        },
 };
-module_platform_driver(ph1_ld4_pinctrl_driver);
+module_platform_driver(uniphier_ld4_pinctrl_driver);
 
 MODULE_AUTHOR("Masahiro Yamada <yamada.masahiro@socionext.com>");
 MODULE_DESCRIPTION("UniPhier PH1-LD4 pinctrl driver");