diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-10-03 15:18:33 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-10-20 18:40:27 +0200 |
| commit | 6944aff1ca91e8cf2c373193982cbb0417b4d4cc (patch) | |
| tree | 02549285ee6718f207188a977ac197a1cf5ac7c8 /arch/arm/cpu/armv7/sunxi | |
| parent | 401175220d169ba2bfe7fbb50d73ccc9c1d6a635 (diff) | |
| download | blackbird-obmc-uboot-6944aff1ca91e8cf2c373193982cbb0417b4d4cc.tar.gz blackbird-obmc-uboot-6944aff1ca91e8cf2c373193982cbb0417b4d4cc.zip | |
sunxi: power: Unify axp pmic function names
Stop prefixing the axp functions for setting voltages, etc. with the
model number, there ever is only one pmic driver built into u-boot,
this allows simplifying the callers.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch/arm/cpu/armv7/sunxi')
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/cpu_info.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/usb_phy.c | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/cpu_info.c b/arch/arm/cpu/armv7/sunxi/cpu_info.c index a276fad316..05fef3216d 100644 --- a/arch/arm/cpu/armv7/sunxi/cpu_info.c +++ b/arch/arm/cpu/armv7/sunxi/cpu_info.c @@ -10,7 +10,7 @@ #include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/clock.h> -#include <axp221.h> +#include <axp_pmic.h> #include <errno.h> #ifdef CONFIG_MACH_SUN6I @@ -82,7 +82,7 @@ int print_cpuinfo(void) int sunxi_get_sid(unsigned int *sid) { #ifdef CONFIG_AXP221_POWER - return axp221_get_sid(sid); + return axp_get_sid(sid); #elif defined SUNXI_SID_BASE int i; diff --git a/arch/arm/cpu/armv7/sunxi/usb_phy.c b/arch/arm/cpu/armv7/sunxi/usb_phy.c index b7ca5d423a..19bb5a1fe5 100644 --- a/arch/arm/cpu/armv7/sunxi/usb_phy.c +++ b/arch/arm/cpu/armv7/sunxi/usb_phy.c @@ -17,15 +17,6 @@ #include <asm/gpio.h> #include <asm/io.h> #include <errno.h> -#ifdef CONFIG_AXP152_POWER -#include <axp152.h> -#endif -#ifdef CONFIG_AXP209_POWER -#include <axp209.h> -#endif -#ifdef CONFIG_AXP221_POWER -#include <axp221.h> -#endif #define SUNXI_USB_PMU_IRQ_ENABLE 0x800 #ifdef CONFIG_MACH_SUN8I_A33 |
