diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-22 08:20:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-22 08:20:03 -0500 |
| commit | 80d307d1159b7edfc28b465e5a359c1dfb20566e (patch) | |
| tree | fc65889724eac5ec28d0229226ecd3edfb94a2e8 /drivers | |
| parent | f3c71c93d71dbc8994648b7f7b98210df2d0a0a6 (diff) | |
| parent | aa56cb374de8ae83f3280fdd6c280724228b86d7 (diff) | |
| download | blackbird-obmc-uboot-80d307d1159b7edfc28b465e5a359c1dfb20566e.tar.gz blackbird-obmc-uboot-80d307d1159b7edfc28b465e5a359c1dfb20566e.zip | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/usb/musb-new/sunxi.c | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 809f8f1180..1936e5f1fc 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -8,7 +8,8 @@ choice prompt "Select Sunxi PMIC Variant" depends on ARCH_SUNXI default AXP209_POWER if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I - default AXP221_POWER if MACH_SUN6I || MACH_SUN8I + default AXP221_POWER if MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 + default SUNXI_NO_PMIC if MACH_SUN8I_H3 config SUNXI_NO_PMIC boolean "board without a pmic" @@ -31,7 +32,7 @@ config AXP209_POWER config AXP221_POWER boolean "axp221 / axp223 pmic support" - depends on MACH_SUN6I || MACH_SUN8I + depends on MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 ---help--- Select this to enable support for the axp221/axp223 pmic found on most A23 and A31 boards. diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index a146c0861f..5eb8d19b74 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -166,6 +166,17 @@ static void USBC_ConfigFIFO_Base(void) } /****************************************************************************** + * Needed for the DFU polling magic + ******************************************************************************/ + +static u8 last_int_usb; + +bool dfu_usb_get_reset(void) +{ + return !!(last_int_usb & MUSB_INTR_RESET); +} + +/****************************************************************************** * MUSB Glue code ******************************************************************************/ @@ -176,6 +187,7 @@ static irqreturn_t sunxi_musb_interrupt(int irq, void *__hci) /* read and flush interrupts */ musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB); + last_int_usb = musb->int_usb; if (musb->int_usb) musb_writeb(musb->mregs, MUSB_INTRUSB, musb->int_usb); musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX); |
