| Message ID | 20230322052504.2629429-11-peng.fan@oss.nxp.com |
|---|---|
| State | New |
| Headers | show |
| Series | dt-bindings: usb: covert ci-hdrc-usb2/usbmisc-imx to yaml | expand |
On Thu, Apr 06, 2023 at 01:18:43AM +0000, Peng Fan wrote: > Hi Shawn, > > > Subject: Re: [PATCH V7 10/10] ARM64: dts: imx7ulp: update usb compatible > > > > On Wed, Mar 22, 2023 at 01:25:04PM +0800, Peng Fan (OSS) wrote: > > > From: Peng Fan <peng.fan@nxp.com> > > > > > > Per binding doc, update the compatible > > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > > > > ARM: dts: imx7ulp: ... > > > > Fixed it up and applied all DTS patches. > [Peng Fan] > > Thanks for the fix. But I think Greg already applied the patchset. Okay, I will drop them from my tree, but ... Greg, May I suggest a couple of things on the future process? - Could you leave i.MX DTS patches to me, so that we can avoid potential merge conflicts? - Would you update your patch robot to reply the applying message to all recipients, so that everyone knows the status? Shawn
On Thu, Apr 06, 2023 at 09:40:13AM +0800, Shawn Guo wrote: > On Thu, Apr 06, 2023 at 01:18:43AM +0000, Peng Fan wrote: > > Hi Shawn, > > > > > Subject: Re: [PATCH V7 10/10] ARM64: dts: imx7ulp: update usb compatible > > > > > > On Wed, Mar 22, 2023 at 01:25:04PM +0800, Peng Fan (OSS) wrote: > > > > From: Peng Fan <peng.fan@nxp.com> > > > > > > > > Per binding doc, update the compatible > > > > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > > > > > > ARM: dts: imx7ulp: ... > > > > > > Fixed it up and applied all DTS patches. > > [Peng Fan] > > > > Thanks for the fix. But I think Greg already applied the patchset. > > Okay, I will drop them from my tree, but ... > > Greg, > > May I suggest a couple of things on the future process? > > - Could you leave i.MX DTS patches to me, so that we can avoid potential > merge conflicts? How am I supposed to know this? Our tools take the whole patch series, not individual ones. If someone wants patches to go through different trees, then they need to submit them as different patch series, otherwise it makes no sense. > - Would you update your patch robot to reply the applying message to all > recipients, so that everyone knows the status? Can't really do that, it only responds to those that are on the patch signed-off-by list itself, as the other cc: metadata is gone after the patch is applied. thanks, greg k-h
On Wed, May 3, 2023 at 9:07 AM Shawn Guo <shawnguo@kernel.org> wrote: > > On Thu, Apr 20, 2023 at 10:10:58AM +0200, Greg KH wrote: > > On Thu, Apr 06, 2023 at 09:40:13AM +0800, Shawn Guo wrote: > > > On Thu, Apr 06, 2023 at 01:18:43AM +0000, Peng Fan wrote: > > > > Hi Shawn, > > > > > > > > > Subject: Re: [PATCH V7 10/10] ARM64: dts: imx7ulp: update usb compatible > > > > > > > > > > On Wed, Mar 22, 2023 at 01:25:04PM +0800, Peng Fan (OSS) wrote: > > > > > > From: Peng Fan <peng.fan@nxp.com> > > > > > > > > > > > > Per binding doc, update the compatible > > > > > > > > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > > > > > > > > > > ARM: dts: imx7ulp: ... > > > > > > > > > > Fixed it up and applied all DTS patches. > > > > [Peng Fan] > > > > > > > > Thanks for the fix. But I think Greg already applied the patchset. > > > > > > Okay, I will drop them from my tree, but ... > > > > > > Greg, > > > > > > May I suggest a couple of things on the future process? > > > > > > - Could you leave i.MX DTS patches to me, so that we can avoid potential > > > merge conflicts? > > > > How am I supposed to know this? > > Aren't we using patch prefix to tell the target subsystem? > > > Our tools take the whole patch series, > > not individual ones. If someone wants patches to go through different > > trees, then they need to submit them as different patch series, > > otherwise it makes no sense. > > It's a quite common practice that people send a series containing > multiple patches targeting different subsystems, as that's what > reviewers have been asking for sake of completeness. So we are asking > for two opposite things from what I can see. Never mind. I think I will just start pushing people to send DTS changes as separate patchset. Shawn
diff --git a/arch/arm/boot/dts/imx7ulp.dtsi b/arch/arm/boot/dts/imx7ulp.dtsi index 7f7d2d5122fb..f91bf719d4e2 100644 --- a/arch/arm/boot/dts/imx7ulp.dtsi +++ b/arch/arm/boot/dts/imx7ulp.dtsi @@ -189,7 +189,7 @@ tpm5: tpm@40260000 { }; usbotg1: usb@40330000 { - compatible = "fsl,imx7ulp-usb", "fsl,imx6ul-usb"; + compatible = "fsl,imx7ulp-usb", "fsl,imx6ul-usb", "fsl,imx27-usb"; reg = <0x40330000 0x200>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; clocks = <&pcc2 IMX7ULP_CLK_USB0>; @@ -202,7 +202,8 @@ usbotg1: usb@40330000 { }; usbmisc1: usbmisc@40330200 { - compatible = "fsl,imx7ulp-usbmisc", "fsl,imx7d-usbmisc"; + compatible = "fsl,imx7ulp-usbmisc", "fsl,imx7d-usbmisc", + "fsl,imx6q-usbmisc"; #index-cells = <1>; reg = <0x40330200 0x200>; };