Skip to content

phy-sun4i-usb: peripheral-mode + a31 otg workaround

Kishon Vijay Abraham I linux-arm-kernel 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest posting 2/20 of 2 patches 0 repliesNew
  2. v5 posting 1/20 of 2 patches 0 repliesSuperseded

Patches in v5 posting 2/2 No applies recorded yet

None of the 2 patches the cover letter announces are in this archive.

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v5 yet.

Read the v5 thread

Cover letter [PATCH v5 resend 0/2] phy-sun4i-usb: peripheral-mode + a31 otg workaround
Quoted 30 lines · Hans de Goede

Hi,

Quoted 8 lines · Kishon Vijay Abraham I

Hi,

Quoted 5 lines · Hans de Goede

Hi Kishon,

The "USB: Fix of_usb_get_dr_mode_by_phy with a shared phy block" patch on which this series depends is in usb-next now:

Quoted 6 lines
Quoted 4 lines

https://git.kernel.org/cgit/linux/kernel/git/gregkh/usb.git/commit/?h=usb-next&id=ce15ed4c5dfb3f7757e6611902aed5db253af977

Can you please merge this series?

This is not applying cleanly against linux-phy -next. Can you rebase and send?

I just tried to rebase, the problem is that your -next branch does not contain the fixes from your -fixes branch, specifically it is missing this commit:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/phy?id=5cf700ac9d50353dc5b8194a57c6f40bf1fc4424

Which is causing the conflict you're seeing when trying to merge the patches I send. I can send you fixed patches which apply cleanly to your linux-phy/next but those then will not merge properly with linus' tree.

Quoted 4 lines

So it is probably better to at least cherry-pick the commit I've linked to above into your -next, to avoid future merge problems. If you cherry-pick that commit then the patches I've send you should apply cleanly.

Ah okay.. I'll rebase my next onto my fixes. Thanks for letting me know this.

Thanks
Kishon

Read the cover letter in its thread