meson: Correct driver declaration for meson_axg_gpio

This should use the driver macros so that the driver appears in the
linker list. Fix this.

Fixes: 8587839f19d ("pinctrl: meson: add axg support")
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20240623203033.1566505-8-sjg@chromium.org
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
index 52c726cf038e26b15f1558634ed3da0fc1c40863..15ebd574ef12d4bd9a8671958f66788bd8a7b4f2 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
@@ -179,7 +179,7 @@ static const struct dm_gpio_ops meson_axg_gpio_ops = {
        .direction_output = meson_gpio_direction_output,
 };
 
-const struct driver meson_axg_gpio_driver = {
+U_BOOT_DRIVER(meson_axg_gpio) = {
        .name   = "meson-axg-gpio",
        .id     = UCLASS_GPIO,
        .probe  = meson_gpio_probe,

diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
index 94e09cd3f8a2c64d99e0ab8abd7b3fca0ab5936a..ed3f92b2d75be94bcb187a826fb99a1905891f9c 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
@@ -939,7 +939,7 @@ struct meson_pinctrl_data meson_axg_periphs_pinctrl_data = {
        .num_groups     = ARRAY_SIZE(meson_axg_periphs_groups),
        .num_funcs      = ARRAY_SIZE(meson_axg_periphs_functions),
        .num_banks      = ARRAY_SIZE(meson_axg_periphs_banks),
-       .gpio_driver    = &meson_axg_gpio_driver,
+       .gpio_driver    = DM_DRIVER_REF(meson_axg_gpio),
        .pmx_data       = &meson_axg_periphs_pmx_banks_data,
 };
 
@@ -953,7 +953,7 @@ struct meson_pinctrl_data meson_axg_aobus_pinctrl_data = {
        .num_groups     = ARRAY_SIZE(meson_axg_aobus_groups),
        .num_funcs      = ARRAY_SIZE(meson_axg_aobus_functions),
        .num_banks      = ARRAY_SIZE(meson_axg_aobus_banks),
-       .gpio_driver    = &meson_axg_gpio_driver,
+       .gpio_driver    = DM_DRIVER_REF(meson_axg_gpio),
        .pmx_data       = &meson_axg_aobus_pmx_banks_data,
 };
 

diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.h b/drivers/pinctrl/meson/pinctrl-meson-axg.h
index c8d2b3af03639c796409fff56bcc25c2b183a6f6..a6581bab50058fd44272480313e8b92faeaa1af4 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.h
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.h
@@ -61,6 +61,6 @@ struct meson_pmx_axg_data {
        }
 
 extern const struct pinctrl_ops meson_axg_pinctrl_ops;
-extern const struct driver meson_axg_gpio_driver;
+extern U_BOOT_DRIVER(meson_axg_gpio);
 
 #endif /* __PINCTRL_MESON_AXG_H__ */

diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
index 24f47f825582b1094a203af34875b8c9ca1fd3d4..67114df6824ac4efbd0f5a324c2fa13dff0a302e 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
@@ -1253,7 +1253,7 @@ static struct meson_pinctrl_data meson_g12a_periphs_pinctrl_data = {
        .num_groups     = ARRAY_SIZE(meson_g12a_periphs_groups),
        .num_funcs      = ARRAY_SIZE(meson_g12a_periphs_functions),
        .num_banks      = ARRAY_SIZE(meson_g12a_periphs_banks),
-       .gpio_driver    = &meson_axg_gpio_driver,
+       .gpio_driver    = DM_DRIVER_REF(meson_axg_gpio),
        .pmx_data       = &meson_g12a_periphs_pmx_banks_data,
 };
 
@@ -1267,7 +1267,7 @@ static struct meson_pinctrl_data meson_g12a_aobus_pinctrl_data = {
        .num_groups     = ARRAY_SIZE(meson_g12a_aobus_groups),
        .num_funcs      = ARRAY_SIZE(meson_g12a_aobus_functions),
        .num_banks      = ARRAY_SIZE(meson_g12a_aobus_banks),
-       .gpio_driver    = &meson_axg_gpio_driver,
+       .gpio_driver    = DM_DRIVER_REF(meson_axg_gpio),
        .pmx_data       = &meson_g12a_aobus_pmx_banks_data,
 };