Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gpio: axp/sunxi: Remove virtual VBUS detection GPIO

Browse source 
Now that this functionality is modeled using the device tree and
regulator uclass, the named GPIO is not referenced anywhere. Remove it.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Samuel Holland 2023-01-22 17:46:22 -06:00 committed by Andre Przywara
parent 7d5b17cca6
commit 09cbd3858f
7 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/include/asm/arch-sunxi/gpio.h
View file

@ -209,7 +209,6 @@ enum sunxi_gpio_number {
/* Virtual AXP0 GPIOs */ /* Virtual AXP0 GPIOs */
#define SUNXI_GPIO_AXP0_PREFIX "AXP0-" #define SUNXI_GPIO_AXP0_PREFIX "AXP0-"
#define SUNXI_GPIO_AXP0_VBUS_DETECT 4
#define SUNXI_GPIO_AXP0_VBUS_ENABLE 5 #define SUNXI_GPIO_AXP0_VBUS_ENABLE 5
#define SUNXI_GPIO_AXP0_GPIO_COUNT 6 #define SUNXI_GPIO_AXP0_GPIO_COUNT 6

21
drivers/gpio/axp_gpio.c
View file

@ -36,18 +36,11 @@ static int axp_gpio_direction_input(struct udevice *dev, unsigned pin)
{ {
u8 reg; u8 reg;
switch (pin) { reg = axp_get_gpio_ctrl_reg(pin);
#ifndef CONFIG_AXP152_POWER /* NA on axp152 */ if (reg == 0)
case SUNXI_GPIO_AXP0_VBUS_DETECT: return -EINVAL;
return 0;
#endif
default:
reg = axp_get_gpio_ctrl_reg(pin);
if (reg == 0)
return -EINVAL;
return pmic_bus_write(reg, AXP_GPIO_CTRL_INPUT); return pmic_bus_write(reg, AXP_GPIO_CTRL_INPUT);
}
} }
static int axp_gpio_direction_output(struct udevice *dev, unsigned pin, static int axp_gpio_direction_output(struct udevice *dev, unsigned pin,
@ -83,12 +76,6 @@ static int axp_gpio_get_value(struct udevice *dev, unsigned pin)
int ret; int ret;
switch (pin) { switch (pin) {
#ifndef CONFIG_AXP152_POWER /* NA on axp152 */
case SUNXI_GPIO_AXP0_VBUS_DETECT:
ret = pmic_bus_read(AXP_POWER_STATUS, &val);
mask = AXP_POWER_STATUS_VBUS_PRESENT;
break;
#endif
#ifdef AXP_MISC_CTRL_N_VBUSEN_FUNC #ifdef AXP_MISC_CTRL_N_VBUSEN_FUNC
/* Only available on later PMICs */ /* Only available on later PMICs */
case SUNXI_GPIO_AXP0_VBUS_ENABLE: case SUNXI_GPIO_AXP0_VBUS_ENABLE:

6
drivers/gpio/sunxi_gpio.c
View file

@ -117,11 +117,7 @@ int sunxi_name_to_gpio(const char *name)
#if !defined CONFIG_SPL_BUILD && defined CONFIG_AXP_GPIO #if !defined CONFIG_SPL_BUILD && defined CONFIG_AXP_GPIO
char lookup[8]; char lookup[8];
if (strcasecmp(name, "AXP0-VBUS-DETECT") == 0) { if (strcasecmp(name, "AXP0-VBUS-ENABLE") == 0) {
sprintf(lookup, SUNXI_GPIO_AXP0_PREFIX "%d",
SUNXI_GPIO_AXP0_VBUS_DETECT);
name = lookup;
} else if (strcasecmp(name, "AXP0-VBUS-ENABLE") == 0) {
sprintf(lookup, SUNXI_GPIO_AXP0_PREFIX "%d", sprintf(lookup, SUNXI_GPIO_AXP0_PREFIX "%d",
SUNXI_GPIO_AXP0_VBUS_ENABLE); SUNXI_GPIO_AXP0_VBUS_ENABLE);
name = lookup; name = lookup;

1
include/axp209.h
View file

@ -77,7 +77,6 @@ enum axp209_reg {
#ifdef CONFIG_AXP209_POWER #ifdef CONFIG_AXP209_POWER
#define AXP_POWER_STATUS 0x00 #define AXP_POWER_STATUS 0x00
#define AXP_POWER_STATUS_ALDO_IN BIT(0) #define AXP_POWER_STATUS_ALDO_IN BIT(0)
#define AXP_POWER_STATUS_VBUS_PRESENT BIT(5)
#define AXP_GPIO0_CTRL 0x90 #define AXP_GPIO0_CTRL 0x90
#define AXP_GPIO1_CTRL 0x92 #define AXP_GPIO1_CTRL 0x92
#define AXP_GPIO2_CTRL 0x93 #define AXP_GPIO2_CTRL 0x93

1
include/axp221.h
View file

@ -53,7 +53,6 @@
#ifdef CONFIG_AXP221_POWER #ifdef CONFIG_AXP221_POWER
#define AXP_POWER_STATUS 0x00 #define AXP_POWER_STATUS 0x00
#define AXP_POWER_STATUS_ALDO_IN BIT(0) #define AXP_POWER_STATUS_ALDO_IN BIT(0)
#define AXP_POWER_STATUS_VBUS_PRESENT BIT(5)
#define AXP_VBUS_IPSOUT 0x30 #define AXP_VBUS_IPSOUT 0x30
#define AXP_VBUS_IPSOUT_DRIVEBUS (1 << 2) #define AXP_VBUS_IPSOUT_DRIVEBUS (1 << 2)
#define AXP_MISC_CTRL 0x8f #define AXP_MISC_CTRL 0x8f

1
include/axp809.h
View file

@ -47,7 +47,6 @@
#ifdef CONFIG_AXP809_POWER #ifdef CONFIG_AXP809_POWER
#define AXP_POWER_STATUS 0x00 #define AXP_POWER_STATUS 0x00
#define AXP_POWER_STATUS_ALDO_IN BIT(0) #define AXP_POWER_STATUS_ALDO_IN BIT(0)
#define AXP_POWER_STATUS_VBUS_PRESENT BIT(5)
#define AXP_VBUS_IPSOUT 0x30 #define AXP_VBUS_IPSOUT 0x30
#define AXP_VBUS_IPSOUT_DRIVEBUS (1 << 2) #define AXP_VBUS_IPSOUT_DRIVEBUS (1 << 2)
#define AXP_MISC_CTRL 0x8f #define AXP_MISC_CTRL 0x8f

1
include/axp818.h
View file

@ -61,7 +61,6 @@
#ifdef CONFIG_AXP818_POWER #ifdef CONFIG_AXP818_POWER
#define AXP_POWER_STATUS 0x00 #define AXP_POWER_STATUS 0x00
#define AXP_POWER_STATUS_ALDO_IN BIT(0) #define AXP_POWER_STATUS_ALDO_IN BIT(0)
#define AXP_POWER_STATUS_VBUS_PRESENT BIT(5)
#define AXP_VBUS_IPSOUT 0x30 #define AXP_VBUS_IPSOUT 0x30
#define AXP_VBUS_IPSOUT_DRIVEBUS (1 << 2) #define AXP_VBUS_IPSOUT_DRIVEBUS (1 << 2)
#define AXP_MISC_CTRL 0x8f #define AXP_MISC_CTRL 0x8f