On Fri, Oct 29, 2021 at 7:01 AM Paul Cercueil [off-list ref] wrote:

Hi Rob,

Le jeu., oct. 28 2021 at 17:26:54 -0500, Rob Herring [off-list ref]
a écrit :

quoted

On Thu, Oct 28, 2021 at 6:46 AM Paul Cercueil [off-list ref]
wrote:

quoted

 Hi Rob,

 Le mar., oct. 26 2021 at 18:20:13 -0500, Rob Herring
[off-list ref]
 a écrit :
 > On Sat, Oct 16, 2021 at 02:33:21PM +0100, Paul Cercueil wrote:
 >>  Tidy up a bit the tree, by prefixing all
include/dt-bindings/clock/
 >> files
 >>  related to Ingenic SoCs with 'ingenic,'.
 >>
 >>  Signed-off-by: Paul Cercueil [off-list ref]
 >>  ---
 >>
 >>  Notes:
 >>      v2: Fix x1000-cgu.h and x1830-cgu.h incorrectly renamed to
 >>          x1000.h / x1830.h
 >>
 >>   Documentation/devicetree/bindings/clock/ingenic,cgu.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/display/ingenic,ipu.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/display/ingenic,lcd.yaml
| 4
 >> ++--
 >>   Documentation/devicetree/bindings/dma/ingenic,dma.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/i2c/ingenic,i2c.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml
| 2
 >> +-
 >>   .../devicetree/bindings/memory-controllers/ingenic,nemc.yaml
| 2
 >> +-
 >>   .../devicetree/bindings/mips/ingenic/ingenic,cpu.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/mmc/ingenic,mmc.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/mtd/ingenic,nand.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/net/ingenic,mac.yaml
| 2
 >> +-
 >>   .../devicetree/bindings/nvmem/ingenic,jz4780-efuse.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/phy/ingenic,phy-usb.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/remoteproc/ingenic,vpu.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/rng/ingenic,trng.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/rtc/ingenic,rtc.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/serial/ingenic,uart.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/sound/ingenic,aic.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/sound/ingenic,codec.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/timer/ingenic,sysost.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/timer/ingenic,tcu.yaml
| 2
 >> +-
 >>   Documentation/devicetree/bindings/usb/ingenic,musb.yaml
| 2
 >> +-
 >>   arch/mips/boot/dts/ingenic/jz4725b.dtsi
| 2
 >> +-
 >>   arch/mips/boot/dts/ingenic/jz4740.dtsi
| 2
 >> +-
 >>   arch/mips/boot/dts/ingenic/jz4770.dtsi
| 2
 >> +-
 >>   arch/mips/boot/dts/ingenic/jz4780.dtsi
| 2
 >> +-
 >>   arch/mips/boot/dts/ingenic/x1000.dtsi
| 2
 >> +-
 >>   arch/mips/boot/dts/ingenic/x1830.dtsi
| 2
 >> +-
 >>   drivers/clk/ingenic/jz4725b-cgu.c
| 2
 >> +-
 >>   drivers/clk/ingenic/jz4740-cgu.c
| 2
 >> +-
 >>   drivers/clk/ingenic/jz4760-cgu.c
| 2
 >> +-
 >>   drivers/clk/ingenic/jz4770-cgu.c
| 2
 >> +-
 >>   drivers/clk/ingenic/jz4780-cgu.c
| 2
 >> +-
 >>   drivers/clk/ingenic/x1000-cgu.c
| 2
 >> +-
 >>   drivers/clk/ingenic/x1830-cgu.c
| 2
 >> +-
 >>   .../clock/{jz4725b-cgu.h => ingenic,jz4725b-cgu.h}
| 0
 >>   .../dt-bindings/clock/{jz4740-cgu.h => ingenic,jz4740-cgu.h}
| 0
 >>   .../dt-bindings/clock/{jz4760-cgu.h => ingenic,jz4760-cgu.h}
| 0
 >>   .../dt-bindings/clock/{jz4770-cgu.h => ingenic,jz4770-cgu.h}
| 0
 >>   .../dt-bindings/clock/{jz4780-cgu.h => ingenic,jz4780-cgu.h}
| 0
 >>   .../dt-bindings/clock/{x1000-cgu.h => ingenic,x1000-cgu.h}
| 0
 >>   .../dt-bindings/clock/{x1830-cgu.h => ingenic,x1830-cgu.h}
| 0
 >>   42 files changed, 36 insertions(+), 36 deletions(-)
 >>   rename include/dt-bindings/clock/{jz4725b-cgu.h =>
 >> ingenic,jz4725b-cgu.h} (100%)
 >>   rename include/dt-bindings/clock/{jz4740-cgu.h =>
 >> ingenic,jz4740-cgu.h} (100%)
 >>   rename include/dt-bindings/clock/{jz4760-cgu.h =>
 >> ingenic,jz4760-cgu.h} (100%)
 >>   rename include/dt-bindings/clock/{jz4770-cgu.h =>
 >> ingenic,jz4770-cgu.h} (100%)
 >>   rename include/dt-bindings/clock/{jz4780-cgu.h =>
 >> ingenic,jz4780-cgu.h} (100%)
 >>   rename include/dt-bindings/clock/{x1000-cgu.h =>
 >> ingenic,x1000-cgu.h} (100%)
 >>   rename include/dt-bindings/clock/{x1830-cgu.h =>
 >> ingenic,x1830-cgu.h} (100%)
 >
 > Acked-by: Rob Herring [off-list ref]
 >
 > However, this will be a pain to merge if there are any new users
 > coming
 > in during the merge window. If not, then Stephen can just take
this.
 > If
 > there are, then at the end of the merge window is the best time.
For
 > that to work, you need to track when all dependent changes are
merged
 > and we need to agree who will pick this up. I usually have fixes
from
 > breakages in the merge window anyways.

 I get Cc'd on all ingenic-related patches, so far I don't see
anything
 that will cause a breakage. I think it would be okay to merge it now
 (we're at -rc7 after all).

Then can you apply this to linux-next and check it all works there.
Specifically, 'make dt_binding_check dtbs drivers/clk/' needs to work.
Or confirm you already did that.

I did it on Linus' master branch and it all worked.

But indeed, it does conflict on linux-next since
Documentation/devicetree/bindings/spi/ingenic,spi.yaml was added there.

Should I rebase the patchset on top of linux-next?

Yes, but no one can apply that until all the dependencies land in
Linus' tree yet we still want it in -rc1 so that there's not cross
tree dependencies in the next cycle. Or Mark can provide a stable
branch to Stephen. Like I said, it's a pain.

In any case, at this point Stephen needs to comment.

Rob