0047-gpio-axp-Consistently-use-the-axp_gpio-order.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. From 7e85c2d6516e47b537b27132d1946d1eab3b8923 Mon Sep 17 00:00:00 2001
  2. From: Samuel Holland <[email protected]>
  3. Date: Fri, 27 Aug 2021 17:39:36 -0500
  4. Subject: [PATCH 47/90] gpio: axp: Consistently use the "axp_gpio" order
  5. This is less confusing than half of the driver using "axp_gpio" and the
  6. other half using "gpio_axp".
  7. Signed-off-by: Samuel Holland <[email protected]>
  8. ---
  9. drivers/gpio/axp_gpio.c | 16 ++++++++--------
  10. 1 file changed, 8 insertions(+), 8 deletions(-)
  11. --- a/drivers/gpio/axp_gpio.c
  12. +++ b/drivers/gpio/axp_gpio.c
  13. @@ -89,14 +89,14 @@ static int axp_gpio_set_value(struct ude
  14. AXP_GPIO_CTRL_OUTPUT_LOW);
  15. }
  16. -static const struct dm_gpio_ops gpio_axp_ops = {
  17. +static const struct dm_gpio_ops axp_gpio_ops = {
  18. .direction_input = axp_gpio_direction_input,
  19. .direction_output = axp_gpio_direction_output,
  20. .get_value = axp_gpio_get_value,
  21. .set_value = axp_gpio_set_value,
  22. };
  23. -static int gpio_axp_probe(struct udevice *dev)
  24. +static int axp_gpio_probe(struct udevice *dev)
  25. {
  26. struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
  27. @@ -107,11 +107,11 @@ static int gpio_axp_probe(struct udevice
  28. return 0;
  29. }
  30. -U_BOOT_DRIVER(gpio_axp) = {
  31. - .name = "gpio_axp",
  32. - .id = UCLASS_GPIO,
  33. - .ops = &gpio_axp_ops,
  34. - .probe = gpio_axp_probe,
  35. +U_BOOT_DRIVER(axp_gpio) = {
  36. + .name = "axp_gpio",
  37. + .id = UCLASS_GPIO,
  38. + .probe = axp_gpio_probe,
  39. + .ops = &axp_gpio_ops,
  40. };
  41. int axp_gpio_init(void)
  42. @@ -124,7 +124,7 @@ int axp_gpio_init(void)
  43. return ret;
  44. /* There is no devicetree support for the axp yet, so bind directly */
  45. - ret = device_bind_driver(dm_root(), "gpio_axp", "AXP-gpio", &dev);
  46. + ret = device_bind_driver(dm_root(), "axp_gpio", "AXP-gpio", &dev);
  47. if (ret)
  48. return ret;