Hi, On Thu, Jul 30, 2015 at 04:25:12PM +0800, Chen-Yu Tsai wrote: > Hi Maxime, > > Could you merge the following branches into sunxi-next? > These are drivers for 4.3. > > MUSB patches from Felipe's next branch: > > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git > > up to > > d91de093d94e usb: musb: sunxi: Add support for musb controller in A33 SoC > > > USB PHY patches from Kishon's next branch: > > git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git > > up to > > 8665c18bece7 phy-sun4i-usb: Add support for monitoring vbus via a > power-supply > > > AXP152 patches from Lee's for-next branch: > > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git > > up to > > a50e5abe10c9 mfd: axp20x: Add axp152 support > > > Note a few patches for proper OTG support haven't been merged: > > ARM: dts: Add binding documentation for AXP20x pmic usb power supply > mfd: axp20x: Add missing registers, and mark more registers volatile > phy-sun4i-usb: Add missing EXPORT_SYMBOL for > sun4i_usb_phy_set_squelch_detect > mfd: axp20x: Add a cell for the usb power_supply part of the axp20x PMICs > power: Add an axp20x-usb-power driver > > > Crypto patches from Herbert's cryptodev tree: > > git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git > > up to > > bc3687982be0 MAINTAINERS: Add myself as maintainer of Allwinner > Security System
Merged and pushed everything, thanks! > Additionally some patches in net-next finish up the refactoring of > STMMAC (GMAC) drivers. If you're interested in getting everyone to > test them: > > git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git > > up to > > 9a9e9a1edee8 stmmac: dwmac-sunxi: turn setup callback into a probe > function I'm not sure about this one though. Usually, I've been taking only the new stuff, and not the various refactorings. If you really want it to be included, I'm fine with merging it though. > Last, I plan to add the new drivers to the defconfigs. OTG (musb) > will not be added as the host/gadget/otg setting must match the dts > setting, and that is per-board. IIRC a mismatch might result in a > oops. That seems quite bad. Doesn't the dual role option makes everything works for everyone? Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
signature.asc
Description: Digital signature
