random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-04 05:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: Correct driver declaration for meson_axg_gpio

Browse Source 
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>
This commit is contained in:
Simon Glass 2024-06-23 14:30:26 -06:00 committed by Neil Armstrong
parent 93b6a52f5a
commit 96e1a156e9
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
View File

@ -179,7 +179,7 @@ static const struct dm_gpio_ops meson_axg_gpio_ops = {
.direction_output = meson_gpio_direction_output, .direction_output = meson_gpio_direction_output,
}; };
const struct driver meson_axg_gpio_driver = { U_BOOT_DRIVER(meson_axg_gpio) = {
.name = "meson-axg-gpio", .name = "meson-axg-gpio",
.id = UCLASS_GPIO, .id = UCLASS_GPIO,
.probe = meson_gpio_probe, .probe = meson_gpio_probe,

4
drivers/pinctrl/meson/pinctrl-meson-axg.c
View File

@ -939,7 +939,7 @@ struct meson_pinctrl_data meson_axg_periphs_pinctrl_data = {
.num_groups = ARRAY_SIZE(meson_axg_periphs_groups), .num_groups = ARRAY_SIZE(meson_axg_periphs_groups),
.num_funcs = ARRAY_SIZE(meson_axg_periphs_functions), .num_funcs = ARRAY_SIZE(meson_axg_periphs_functions),
.num_banks = ARRAY_SIZE(meson_axg_periphs_banks), .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, .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_groups = ARRAY_SIZE(meson_axg_aobus_groups),
.num_funcs = ARRAY_SIZE(meson_axg_aobus_functions), .num_funcs = ARRAY_SIZE(meson_axg_aobus_functions),
.num_banks = ARRAY_SIZE(meson_axg_aobus_banks), .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, .pmx_data = &meson_axg_aobus_pmx_banks_data,
}; };

2
drivers/pinctrl/meson/pinctrl-meson-axg.h
View File

@ -61,6 +61,6 @@ struct meson_pmx_axg_data {
} }
extern const struct pinctrl_ops meson_axg_pinctrl_ops; 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__ */ #endif /* __PINCTRL_MESON_AXG_H__ */

4
drivers/pinctrl/meson/pinctrl-meson-g12a.c
View File

@ -1253,7 +1253,7 @@ static struct meson_pinctrl_data meson_g12a_periphs_pinctrl_data = {
.num_groups = ARRAY_SIZE(meson_g12a_periphs_groups), .num_groups = ARRAY_SIZE(meson_g12a_periphs_groups),
.num_funcs = ARRAY_SIZE(meson_g12a_periphs_functions), .num_funcs = ARRAY_SIZE(meson_g12a_periphs_functions),
.num_banks = ARRAY_SIZE(meson_g12a_periphs_banks), .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, .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_groups = ARRAY_SIZE(meson_g12a_aobus_groups),
.num_funcs = ARRAY_SIZE(meson_g12a_aobus_functions), .num_funcs = ARRAY_SIZE(meson_g12a_aobus_functions),
.num_banks = ARRAY_SIZE(meson_g12a_aobus_banks), .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, .pmx_data = &meson_g12a_aobus_pmx_banks_data,
}; };