27c9d80f51
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
100 lines
2.8 KiB
Diff
100 lines
2.8 KiB
Diff
From 532b81ac600b6a70a1421f86503cb6d8543edf1b Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Tue, 17 Aug 2021 20:01:55 -0500
|
|
Subject: [PATCH 49/90] gpio: axp: Use DM_PMIC functions for register access
|
|
|
|
Now that the PMIC driver implements the DM_PMIC uclass, those functions
|
|
can be used instead of the platform-specific "pmic_bus" functions.
|
|
|
|
Since the driver still uses the single set of register definitions from
|
|
axpXXX.h (as selected by AXPxxx_POWER), it still depends on one of those
|
|
choices, and therefore also AXP_PMIC_BUS.
|
|
|
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
|
---
|
|
drivers/gpio/axp_gpio.c | 27 ++++++++++++---------------
|
|
1 file changed, 12 insertions(+), 15 deletions(-)
|
|
|
|
--- a/drivers/gpio/axp_gpio.c
|
|
+++ b/drivers/gpio/axp_gpio.c
|
|
@@ -6,11 +6,11 @@
|
|
*/
|
|
|
|
#include <common.h>
|
|
-#include <asm/arch/pmic_bus.h>
|
|
#include <asm/gpio.h>
|
|
#include <axp_pmic.h>
|
|
#include <dm.h>
|
|
#include <errno.h>
|
|
+#include <power/pmic.h>
|
|
|
|
#define AXP_GPIO_PREFIX "AXP0-"
|
|
#define AXP_GPIO_COUNT 4
|
|
@@ -40,7 +40,7 @@ static int axp_gpio_direction_input(stru
|
|
if (reg == 0)
|
|
return -EINVAL;
|
|
|
|
- return pmic_bus_write(reg, AXP_GPIO_CTRL_INPUT);
|
|
+ return pmic_reg_write(dev->parent, reg, AXP_GPIO_CTRL_INPUT);
|
|
}
|
|
|
|
static int axp_gpio_direction_output(struct udevice *dev, unsigned pin,
|
|
@@ -52,26 +52,27 @@ static int axp_gpio_direction_output(str
|
|
if (reg == 0)
|
|
return -EINVAL;
|
|
|
|
- return pmic_bus_write(reg, val ? AXP_GPIO_CTRL_OUTPUT_HIGH :
|
|
- AXP_GPIO_CTRL_OUTPUT_LOW);
|
|
+ return pmic_reg_write(dev->parent, reg,
|
|
+ val ? AXP_GPIO_CTRL_OUTPUT_HIGH :
|
|
+ AXP_GPIO_CTRL_OUTPUT_LOW);
|
|
}
|
|
|
|
static int axp_gpio_get_value(struct udevice *dev, unsigned pin)
|
|
{
|
|
- u8 reg, val, mask;
|
|
+ u8 reg, mask;
|
|
int ret;
|
|
|
|
reg = axp_get_gpio_ctrl_reg(pin);
|
|
if (reg == 0)
|
|
return -EINVAL;
|
|
|
|
- ret = pmic_bus_read(AXP_GPIO_STATE, &val);
|
|
- if (ret)
|
|
+ ret = pmic_reg_read(dev->parent, AXP_GPIO_STATE);
|
|
+ if (ret < 0)
|
|
return ret;
|
|
|
|
mask = 1 << (pin + AXP_GPIO_STATE_OFFSET);
|
|
|
|
- return (val & mask) ? 1 : 0;
|
|
+ return (ret & mask) ? 1 : 0;
|
|
}
|
|
|
|
static int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val)
|
|
@@ -82,8 +83,9 @@ static int axp_gpio_set_value(struct ude
|
|
if (reg == 0)
|
|
return -EINVAL;
|
|
|
|
- return pmic_bus_write(reg, val ? AXP_GPIO_CTRL_OUTPUT_HIGH :
|
|
- AXP_GPIO_CTRL_OUTPUT_LOW);
|
|
+ return pmic_reg_write(dev->parent, reg,
|
|
+ val ? AXP_GPIO_CTRL_OUTPUT_HIGH :
|
|
+ AXP_GPIO_CTRL_OUTPUT_LOW);
|
|
}
|
|
|
|
static const struct dm_gpio_ops axp_gpio_ops = {
|
|
@@ -96,11 +98,6 @@ static const struct dm_gpio_ops axp_gpio
|
|
static int axp_gpio_probe(struct udevice *dev)
|
|
{
|
|
struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
|
|
- int ret;
|
|
-
|
|
- ret = pmic_bus_init();
|
|
- if (ret)
|
|
- return ret;
|
|
|
|
/* Tell the uclass how many GPIOs we have */
|
|
uc_priv->bank_name = AXP_GPIO_PREFIX;
|