pinctrl: uniphier: rename function/array names

Make function/array names match the file names for consistency.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
index 8f7574e2aa86bf482695d4ad2faefa77d808ae3c..ca66dee957c6ac62fcd879ff7985ff35d9406850 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
@@ -9,7 +9,7 @@
 
 #include "pinctrl-uniphier.h"
 
-static const struct uniphier_pinctrl_pin ph1_ld4_pins[] = {
+static const struct uniphier_pinctrl_pin uniphier_ld4_pins[] = {
        UNIPHIER_PINCTRL_PIN(53, 0),
        UNIPHIER_PINCTRL_PIN(54, 0),
        UNIPHIER_PINCTRL_PIN(55, 0),
@@ -62,7 +62,7 @@ static const unsigned usb2_muxvals[] = {4, 4};
 static const unsigned usb2b_pins[] = {67, 68};
 static const unsigned usb2b_muxvals[] = {23, 23};
 
-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),
@@ -83,7 +83,7 @@ static const struct uniphier_pinctrl_group ph1_ld4_groups[] = {
        UNIPHIER_PINCTRL_GROUP(usb2b),
 };
 
-static const char * const ph1_ld4_functions[] = {
+static const char * const uniphier_ld4_functions[] = {
        "emmc",
        "i2c0",
        "i2c1",
@@ -100,30 +100,30 @@ static const char * const ph1_ld4_functions[] = {
        "usb2",
 };
 
-static struct uniphier_pinctrl_socdata ph1_ld4_pinctrl_socdata = {
-       .pins = ph1_ld4_pins,
-       .pins_count = ARRAY_SIZE(ph1_ld4_pins),
-       .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_pinctrl_socdata = {
+       .pins = uniphier_ld4_pins,
+       .pins_count = ARRAY_SIZE(uniphier_ld4_pins),
+       .groups = uniphier_ld4_groups,
+       .groups_count = ARRAY_SIZE(uniphier_ld4_groups),
+       .functions = uniphier_ld4_functions,
+       .functions_count = ARRAY_SIZE(uniphier_ld4_functions),
 };
 
-static int ph1_ld4_pinctrl_probe(struct udevice *dev)
+static int uniphier_ld4_pinctrl_probe(struct udevice *dev)
 {
-       return uniphier_pinctrl_probe(dev, &ph1_ld4_pinctrl_socdata);
+       return uniphier_pinctrl_probe(dev, &uniphier_ld4_pinctrl_socdata);
 }
 
-static const struct udevice_id ph1_ld4_pinctrl_match[] = {
+static const struct udevice_id uniphier_ld4_pinctrl_match[] = {
        { .compatible = "socionext,ph1-ld4-pinctrl" },
        { /* sentinel */ }
 };
 
-U_BOOT_DRIVER(ph1_ld4_pinctrl) = {
-       .name = "ph1-ld4-pinctrl",
+U_BOOT_DRIVER(uniphier_ld4_pinctrl) = {
+       .name = "uniphier-ld4-pinctrl",
        .id = UCLASS_PINCTRL,
-       .of_match = of_match_ptr(ph1_ld4_pinctrl_match),
-       .probe = ph1_ld4_pinctrl_probe,
+       .of_match = of_match_ptr(uniphier_ld4_pinctrl_match),
+       .probe = uniphier_ld4_pinctrl_probe,
        .remove = uniphier_pinctrl_remove,
        .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
        .ops = &uniphier_pinctrl_ops,

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
index 2a5d5f3ad412dff7a7c3c0112d436c5d021dfb57..0fd4dc421b61fc1aa8e4c706a8157a30d1d17767 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
@@ -9,7 +9,7 @@
 
 #include "pinctrl-uniphier.h"
 
-static const struct uniphier_pinctrl_pin ph1_ld6b_pins[] = {
+static const struct uniphier_pinctrl_pin uniphier_ld6b_pins[] = {
        UNIPHIER_PINCTRL_PIN(113, 0),
        UNIPHIER_PINCTRL_PIN(114, 0),
        UNIPHIER_PINCTRL_PIN(115, 0),
@@ -61,7 +61,7 @@ static const unsigned usb2_muxvals[] = {0, 0};
 static const unsigned usb3_pins[] = {62, 63};
 static const unsigned usb3_muxvals[] = {0, 0};
 
-static const struct uniphier_pinctrl_group ph1_ld6b_groups[] = {
+static const struct uniphier_pinctrl_group uniphier_ld6b_groups[] = {
        UNIPHIER_PINCTRL_GROUP(emmc),
        UNIPHIER_PINCTRL_GROUP(emmc_dat8),
        UNIPHIER_PINCTRL_GROUP(i2c0),
@@ -83,7 +83,7 @@ static const struct uniphier_pinctrl_group ph1_ld6b_groups[] = {
        UNIPHIER_PINCTRL_GROUP(usb3),
 };
 
-static const char * const ph1_ld6b_functions[] = {
+static const char * const uniphier_ld6b_functions[] = {
        "emmc",
        "i2c0",
        "i2c1",
@@ -100,30 +100,30 @@ static const char * const ph1_ld6b_functions[] = {
        "usb3",
 };
 
-static struct uniphier_pinctrl_socdata ph1_ld6b_pinctrl_socdata = {
-       .pins = ph1_ld6b_pins,
-       .pins_count = ARRAY_SIZE(ph1_ld6b_pins),
-       .groups = ph1_ld6b_groups,
-       .groups_count = ARRAY_SIZE(ph1_ld6b_groups),
-       .functions = ph1_ld6b_functions,
-       .functions_count = ARRAY_SIZE(ph1_ld6b_functions),
+static struct uniphier_pinctrl_socdata uniphier_ld6b_pinctrl_socdata = {
+       .pins = uniphier_ld6b_pins,
+       .pins_count = ARRAY_SIZE(uniphier_ld6b_pins),
+       .groups = uniphier_ld6b_groups,
+       .groups_count = ARRAY_SIZE(uniphier_ld6b_groups),
+       .functions = uniphier_ld6b_functions,
+       .functions_count = ARRAY_SIZE(uniphier_ld6b_functions),
 };
 
-static int ph1_ld6b_pinctrl_probe(struct udevice *dev)
+static int uniphier_ld6b_pinctrl_probe(struct udevice *dev)
 {
-       return uniphier_pinctrl_probe(dev, &ph1_ld6b_pinctrl_socdata);
+       return uniphier_pinctrl_probe(dev, &uniphier_ld6b_pinctrl_socdata);
 }
 
-static const struct udevice_id ph1_ld6b_pinctrl_match[] = {
+static const struct udevice_id uniphier_ld6b_pinctrl_match[] = {
        { .compatible = "socionext,ph1-ld6b-pinctrl" },
        { /* sentinel */ }
 };
 
-U_BOOT_DRIVER(ph1_ld6b_pinctrl) = {
-       .name = "ph1-ld6b-pinctrl",
+U_BOOT_DRIVER(uniphier_ld6b_pinctrl) = {
+       .name = "uniphier-ld6b-pinctrl",
        .id = UCLASS_PINCTRL,
-       .of_match = of_match_ptr(ph1_ld6b_pinctrl_match),
-       .probe = ph1_ld6b_pinctrl_probe,
+       .of_match = of_match_ptr(uniphier_ld6b_pinctrl_match),
+       .probe = uniphier_ld6b_pinctrl_probe,
        .remove = uniphier_pinctrl_remove,
        .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
        .ops = &uniphier_pinctrl_ops,

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
index 60fbbafe781268710eb14fb808cfe887ac42dbab..9ed7c74293690cf3f0e871344b5cae6c1816f044 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
@@ -9,7 +9,7 @@
 
 #include "pinctrl-uniphier.h"
 
-static const struct uniphier_pinctrl_pin ph1_pro4_pins[] = {
+static const struct uniphier_pinctrl_pin uniphier_pro4_pins[] = {
 };
 
 static const unsigned emmc_pins[] = {40, 41, 42, 43, 51, 52, 53};
@@ -54,7 +54,7 @@ static const unsigned usb2_muxvals[] = {0, 0};
 static const unsigned usb3_pins[] = {186, 187};
 static const unsigned usb3_muxvals[] = {0, 0};
 
-static const struct uniphier_pinctrl_group ph1_pro4_groups[] = {
+static const struct uniphier_pinctrl_group uniphier_pro4_groups[] = {
        UNIPHIER_PINCTRL_GROUP(emmc),
        UNIPHIER_PINCTRL_GROUP(emmc_dat8),
        UNIPHIER_PINCTRL_GROUP(i2c0),
@@ -76,7 +76,7 @@ static const struct uniphier_pinctrl_group ph1_pro4_groups[] = {
        UNIPHIER_PINCTRL_GROUP(usb3),
 };
 
-static const char * const ph1_pro4_functions[] = {
+static const char * const uniphier_pro4_functions[] = {
        "emmc",
        "i2c0",
        "i2c1",
@@ -96,31 +96,31 @@ static const char * const ph1_pro4_functions[] = {
        "usb3",
 };
 
-static struct uniphier_pinctrl_socdata ph1_pro4_pinctrl_socdata = {
-       .pins = ph1_pro4_pins,
-       .pins_count = ARRAY_SIZE(ph1_pro4_pins),
-       .groups = ph1_pro4_groups,
-       .groups_count = ARRAY_SIZE(ph1_pro4_groups),
-       .functions = ph1_pro4_functions,
-       .functions_count = ARRAY_SIZE(ph1_pro4_functions),
+static struct uniphier_pinctrl_socdata uniphier_pro4_pinctrl_socdata = {
+       .pins = uniphier_pro4_pins,
+       .pins_count = ARRAY_SIZE(uniphier_pro4_pins),
+       .groups = uniphier_pro4_groups,
+       .groups_count = ARRAY_SIZE(uniphier_pro4_groups),
+       .functions = uniphier_pro4_functions,
+       .functions_count = ARRAY_SIZE(uniphier_pro4_functions),
        .caps = UNIPHIER_PINCTRL_CAPS_DBGMUX_SEPARATE,
 };
 
-static int ph1_pro4_pinctrl_probe(struct udevice *dev)
+static int uniphier_pro4_pinctrl_probe(struct udevice *dev)
 {
-       return uniphier_pinctrl_probe(dev, &ph1_pro4_pinctrl_socdata);
+       return uniphier_pinctrl_probe(dev, &uniphier_pro4_pinctrl_socdata);
 }
 
-static const struct udevice_id ph1_pro4_pinctrl_match[] = {
+static const struct udevice_id uniphier_pro4_pinctrl_match[] = {
        { .compatible = "socionext,ph1-pro4-pinctrl" },
        { /* sentinel */ }
 };
 
-U_BOOT_DRIVER(ph1_pro4_pinctrl) = {
-       .name = "ph1-pro4-pinctrl",
+U_BOOT_DRIVER(uniphier_pro4_pinctrl) = {
+       .name = "uniphier-pro4-pinctrl",
        .id = UCLASS_PINCTRL,
-       .of_match = of_match_ptr(ph1_pro4_pinctrl_match),
-       .probe = ph1_pro4_pinctrl_probe,
+       .of_match = of_match_ptr(uniphier_pro4_pinctrl_match),
+       .probe = uniphier_pro4_pinctrl_probe,
        .remove = uniphier_pinctrl_remove,
        .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
        .ops = &uniphier_pinctrl_ops,

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
index 30c9b4d556cce7de0aea99003ba2800ff9bc5171..6597f1cf048987f2de881342050a0bb8ebb9fb75 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
@@ -9,7 +9,7 @@
 
 #include "pinctrl-uniphier.h"
 
-static const struct uniphier_pinctrl_pin ph1_pro5_pins[] = {
+static const struct uniphier_pinctrl_pin uniphier_pro5_pins[] = {
        UNIPHIER_PINCTRL_PIN(47, 0),
        UNIPHIER_PINCTRL_PIN(48, 0),
        UNIPHIER_PINCTRL_PIN(49, 0),
@@ -67,7 +67,7 @@ static const unsigned usb1_muxvals[] = {0, 0};
 static const unsigned usb2_pins[] = {128, 129};
 static const unsigned usb2_muxvals[] = {0, 0};
 
-static const struct uniphier_pinctrl_group ph1_pro5_groups[] = {
+static const struct uniphier_pinctrl_group uniphier_pro5_groups[] = {
        UNIPHIER_PINCTRL_GROUP(emmc),
        UNIPHIER_PINCTRL_GROUP(emmc_dat8),
        UNIPHIER_PINCTRL_GROUP(i2c0),
@@ -91,7 +91,7 @@ static const struct uniphier_pinctrl_group ph1_pro5_groups[] = {
        UNIPHIER_PINCTRL_GROUP(usb2),
 };
 
-static const char * const ph1_pro5_functions[] = {
+static const char * const uniphier_pro5_functions[] = {
        "emmc",
        "i2c0",
        "i2c1",
@@ -110,31 +110,31 @@ static const char * const ph1_pro5_functions[] = {
        "usb2",
 };
 
-static struct uniphier_pinctrl_socdata ph1_pro5_pinctrl_socdata = {
-       .pins = ph1_pro5_pins,
-       .pins_count = ARRAY_SIZE(ph1_pro5_pins),
-       .groups = ph1_pro5_groups,
-       .groups_count = ARRAY_SIZE(ph1_pro5_groups),
-       .functions = ph1_pro5_functions,
-       .functions_count = ARRAY_SIZE(ph1_pro5_functions),
+static struct uniphier_pinctrl_socdata uniphier_pro5_pinctrl_socdata = {
+       .pins = uniphier_pro5_pins,
+       .pins_count = ARRAY_SIZE(uniphier_pro5_pins),
+       .groups = uniphier_pro5_groups,
+       .groups_count = ARRAY_SIZE(uniphier_pro5_groups),
+       .functions = uniphier_pro5_functions,
+       .functions_count = ARRAY_SIZE(uniphier_pro5_functions),
        .caps = UNIPHIER_PINCTRL_CAPS_DBGMUX_SEPARATE,
 };
 
-static int ph1_pro5_pinctrl_probe(struct udevice *dev)
+static int uniphier_pro5_pinctrl_probe(struct udevice *dev)
 {
-       return uniphier_pinctrl_probe(dev, &ph1_pro5_pinctrl_socdata);
+       return uniphier_pinctrl_probe(dev, &uniphier_pro5_pinctrl_socdata);
 }
 
-static const struct udevice_id ph1_pro5_pinctrl_match[] = {
+static const struct udevice_id uniphier_pro5_pinctrl_match[] = {
        { .compatible = "socionext,ph1-pro5-pinctrl" },
        { /* sentinel */ }
 };
 
-U_BOOT_DRIVER(ph1_pro5_pinctrl) = {
-       .name = "ph1-pro5-pinctrl",
+U_BOOT_DRIVER(uniphier_pro5_pinctrl) = {
+       .name = "uniphier-pro5-pinctrl",
        .id = UCLASS_PINCTRL,
-       .of_match = of_match_ptr(ph1_pro5_pinctrl_match),
-       .probe = ph1_pro5_pinctrl_probe,
+       .of_match = of_match_ptr(uniphier_pro5_pinctrl_match),
+       .probe = uniphier_pro5_pinctrl_probe,
        .remove = uniphier_pinctrl_remove,
        .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
        .ops = &uniphier_pinctrl_ops,

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
index 976bb2f4a45ce4a9e93032c0b6128e8acb74ed9d..cfec877588686d57dfe403226ab9773c8fa1cd54 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
@@ -9,7 +9,7 @@
 
 #include "pinctrl-uniphier.h"
 
-static const struct uniphier_pinctrl_pin proxstream2_pins[] = {
+static const struct uniphier_pinctrl_pin uniphier_pxs2_pins[] = {
        UNIPHIER_PINCTRL_PIN(113, 0),
        UNIPHIER_PINCTRL_PIN(114, 0),
        UNIPHIER_PINCTRL_PIN(115, 0),
@@ -61,7 +61,7 @@ static const unsigned usb2_muxvals[] = {8, 8};
 static const unsigned usb3_pins[] = {62, 63};
 static const unsigned usb3_muxvals[] = {8, 8};
 
-static const struct uniphier_pinctrl_group proxstream2_groups[] = {
+static const struct uniphier_pinctrl_group uniphier_pxs2_groups[] = {
        UNIPHIER_PINCTRL_GROUP(emmc),
        UNIPHIER_PINCTRL_GROUP(emmc_dat8),
        UNIPHIER_PINCTRL_GROUP(i2c0),
@@ -85,7 +85,7 @@ static const struct uniphier_pinctrl_group proxstream2_groups[] = {
        UNIPHIER_PINCTRL_GROUP(usb3),
 };
 
-static const char * const proxstream2_functions[] = {
+static const char * const uniphier_pxs2_functions[] = {
        "emmc",
        "i2c0",
        "i2c1",
@@ -107,30 +107,30 @@ static const char * const proxstream2_functions[] = {
        "usb3",
 };
 
-static struct uniphier_pinctrl_socdata proxstream2_pinctrl_socdata = {
-       .pins = proxstream2_pins,
-       .pins_count = ARRAY_SIZE(proxstream2_pins),
-       .groups = proxstream2_groups,
-       .groups_count = ARRAY_SIZE(proxstream2_groups),
-       .functions = proxstream2_functions,
-       .functions_count = ARRAY_SIZE(proxstream2_functions),
+static struct uniphier_pinctrl_socdata uniphier_pxs2_pinctrl_socdata = {
+       .pins = uniphier_pxs2_pins,
+       .pins_count = ARRAY_SIZE(uniphier_pxs2_pins),
+       .groups = uniphier_pxs2_groups,
+       .groups_count = ARRAY_SIZE(uniphier_pxs2_groups),
+       .functions = uniphier_pxs2_functions,
+       .functions_count = ARRAY_SIZE(uniphier_pxs2_functions),
 };
 
-static int proxstream2_pinctrl_probe(struct udevice *dev)
+static int uniphier_pxs2_pinctrl_probe(struct udevice *dev)
 {
-       return uniphier_pinctrl_probe(dev, &proxstream2_pinctrl_socdata);
+       return uniphier_pinctrl_probe(dev, &uniphier_pxs2_pinctrl_socdata);
 }
 
-static const struct udevice_id proxstream2_pinctrl_match[] = {
+static const struct udevice_id uniphier_pxs2_pinctrl_match[] = {
        { .compatible = "socionext,proxstream2-pinctrl" },
        { /* sentinel */ }
 };
 
-U_BOOT_DRIVER(proxstream2_pinctrl) = {
-       .name = "proxstream2-pinctrl",
+U_BOOT_DRIVER(uniphier_pxs2_pinctrl) = {
+       .name = "uniphier-pxs2-pinctrl",
        .id = UCLASS_PINCTRL,
-       .of_match = of_match_ptr(proxstream2_pinctrl_match),
-       .probe = proxstream2_pinctrl_probe,
+       .of_match = of_match_ptr(uniphier_pxs2_pinctrl_match),
+       .probe = uniphier_pxs2_pinctrl_probe,
        .remove = uniphier_pinctrl_remove,
        .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
        .ops = &uniphier_pinctrl_ops,

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
index 6cbf21526cc705014f4a9ff1ef15a0ca824b52b7..5a733b3eb3ac043a683b6c896988e8b2070e0df7 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
@@ -9,7 +9,7 @@
 
 #include "pinctrl-uniphier.h"
 
-static const struct uniphier_pinctrl_pin ph1_sld8_pins[] = {
+static const struct uniphier_pinctrl_pin uniphier_sld8_pins[] = {
        UNIPHIER_PINCTRL_PIN(32, 8),
        UNIPHIER_PINCTRL_PIN(33, 8),
        UNIPHIER_PINCTRL_PIN(34, 8),
@@ -72,7 +72,7 @@ static const unsigned usb1_muxvals[] = {0, 0};
 static const unsigned usb2_pins[] = {114, 115};
 static const unsigned usb2_muxvals[] = {1, 1};
 
-static const struct uniphier_pinctrl_group ph1_sld8_groups[] = {
+static const struct uniphier_pinctrl_group uniphier_sld8_groups[] = {
        UNIPHIER_PINCTRL_GROUP(emmc),
        UNIPHIER_PINCTRL_GROUP(emmc_dat8),
        UNIPHIER_PINCTRL_GROUP(i2c0),
@@ -91,7 +91,7 @@ static const struct uniphier_pinctrl_group ph1_sld8_groups[] = {
        UNIPHIER_PINCTRL_GROUP(usb2),
 };
 
-static const char * const ph1_sld8_functions[] = {
+static const char * const uniphier_sld8_functions[] = {
        "emmc",
        "i2c0",
        "i2c1",
@@ -108,30 +108,30 @@ static const char * const ph1_sld8_functions[] = {
        "usb2",
 };
 
-static struct uniphier_pinctrl_socdata ph1_sld8_pinctrl_socdata = {
-       .pins = ph1_sld8_pins,
-       .pins_count = ARRAY_SIZE(ph1_sld8_pins),
-       .groups = ph1_sld8_groups,
-       .groups_count = ARRAY_SIZE(ph1_sld8_groups),
-       .functions = ph1_sld8_functions,
-       .functions_count = ARRAY_SIZE(ph1_sld8_functions),
+static struct uniphier_pinctrl_socdata uniphier_sld8_pinctrl_socdata = {
+       .pins = uniphier_sld8_pins,
+       .pins_count = ARRAY_SIZE(uniphier_sld8_pins),
+       .groups = uniphier_sld8_groups,
+       .groups_count = ARRAY_SIZE(uniphier_sld8_groups),
+       .functions = uniphier_sld8_functions,
+       .functions_count = ARRAY_SIZE(uniphier_sld8_functions),
 };
 
-static int ph1_sld8_pinctrl_probe(struct udevice *dev)
+static int uniphier_sld8_pinctrl_probe(struct udevice *dev)
 {
-       return uniphier_pinctrl_probe(dev, &ph1_sld8_pinctrl_socdata);
+       return uniphier_pinctrl_probe(dev, &uniphier_sld8_pinctrl_socdata);
 }
 
-static const struct udevice_id ph1_sld8_pinctrl_match[] = {
+static const struct udevice_id uniphier_sld8_pinctrl_match[] = {
        { .compatible = "socionext,ph1-sld8-pinctrl" },
        { /* sentinel */ }
 };
 
-U_BOOT_DRIVER(ph1_sld8_pinctrl) = {
-       .name = "ph1-sld8-pinctrl",
+U_BOOT_DRIVER(uniphier_sld8_pinctrl) = {
+       .name = "uniphier-sld8-pinctrl",
        .id = UCLASS_PINCTRL,
-       .of_match = of_match_ptr(ph1_sld8_pinctrl_match),
-       .probe = ph1_sld8_pinctrl_probe,
+       .of_match = of_match_ptr(uniphier_sld8_pinctrl_match),
+       .probe = uniphier_sld8_pinctrl_probe,
        .remove = uniphier_pinctrl_remove,
        .priv_auto_alloc_size = sizeof(struct uniphier_pinctrl_priv),
        .ops = &uniphier_pinctrl_ops,