Hi,

On 30-07-15 12:06, Chen-Yu Tsai wrote:
On Thu, Jul 30, 2015 at 5:51 PM, Maxime Ripard
<[email protected]> wrote:
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!

Thanks!

Thank you both for doing this, this should make the delta between sunxi-next
and my sunxi-wip quite a bit smaller and will allow me to double check
all otg bits got merged for 4.3.



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.

kernelci shows it's working (DHCP got IP) on next:

     
http://kernelci.org/boot/sun7i-a20-cubietruck/job/next/kernel/next-20150729/defconfig/sunxi_defconfig/lab/lab-tbaker/?_id=55b89dcd59b514508773b023

No need to merge it.

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?

My setup isn't good for testing OTG/gadget. That needs modules, due
to the way musb it hooked up. I can test how it reacts if compiled
as host with dts set to OTG. If it works out I guess we can set
USB_MUSB_HOST=y.

So the problem is actually two-fold.

   1. There might be a oops. (or something else... don't really
      remember specifics.)

That should be fixed now (it has been fixed in my sunxi-wip tree for
a while now).

   2. musb in OTG/gadget needs modules, or rather USB gadgets must be
      loaded/registered _before_ musb.

You mean _after_ I think. Maxime didn't you point me to a kernel patch
which fixes this making things work independent of init order, allowing
the gadget drivers to be builtin  ?

I did receive this note as a comment to a github commit:

"Should add CONFIG_EXTCON=y to arch/arm/configs/sunxi_defconfig otherwise 
CONFIG_PHY_SUN4I_USB doesn't get enabled properly."

I've but doing this on my todo list, feel free to beat me to it though :)

Regards,

Hans

--
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.

Reply via email to