Le lundi 23 mars 2015 à 17:21 +0100, Hans de Goede a écrit :
Hi,
Thanks for the patches, I had to make this fixup (squashed) to fix vbus detect to work on axp221:
-------------------------- drivers/gpio/sunxi_gpio.c -------------------------- index 6296092..670af0c 100644 @@ -21,6 +21,9 @@ #ifdef CONFIG_AXP209_POWER #include <axp209.h> #endif +#ifdef CONFIG_AXP221_POWER +#include <axp221.h> +#endif
DECLARE_GLOBAL_DATA_PTR;
Other then that + adding a small blurb with some info on the Ainol AW1 board this set has been merged as is.
Oh you're right, I forgot that one!
The entire set has been queued up in u-boot-sunxi/next for upstream merging.
Thanks a lot!
Regards,
Hans
On 22-03-15 18:07, Paul Kocialkowski wrote:
Signed-off-by: Paul Kocialkowski contact@paulk.fr
arch/arm/include/asm/arch-sunxi/gpio.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h index f2c247d..a66e45c 100644 --- a/arch/arm/include/asm/arch-sunxi/gpio.h +++ b/arch/arm/include/asm/arch-sunxi/gpio.h @@ -84,7 +84,7 @@ struct sunxi_gpio_reg { #define GPIO_CFG_INDEX(pin) (((pin) & 0x1f) >> 3) #define GPIO_CFG_OFFSET(pin) ((((pin) & 0x1f) & 0x7) << 2)
-#define GPIO_DRV_INDEX(pin) (((pin) & 0x1f) >> 4) +#define GPIO_DRV_INDEX(pin) (((pin) & 0x1f) >> 4) #define GPIO_DRV_OFFSET(pin) ((((pin) & 0x1f) & 0xf) << 1)
#define GPIO_PULL_INDEX(pin) (((pin) & 0x1f) >> 4) @@ -194,7 +194,7 @@ enum sunxi_gpio_number { #define SUN8I_GPL3_R_UART_RX 2
#define SUN9I_GPN0_R_RSB_SCK 3 -#define SUN9I_GPN1_R_RSB_SDA 3 +#define SUN9I_GPN1_R_RSB_SDA 3
/* GPIO pin pull-up/down config */ #define SUNXI_GPIO_PULL_DISABLE 0