On Mon, Apr 13, 2020 at 05:26:27PM +0200, Paul Cercueil wrote: > If N fields of X cells should be provided, then that's what the > devicetree should represent, instead of having one single field of > (N*X) cells. > > Signed-off-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx> > --- > arch/mips/boot/dts/ingenic/jz4740.dtsi | 19 +++++++++---------- > arch/mips/boot/dts/ingenic/jz4770.dtsi | 12 +++++------- > arch/mips/boot/dts/ingenic/jz4780.dtsi | 24 +++++++++++------------- > arch/mips/boot/dts/ingenic/x1000.dtsi | 9 ++++----- > 4 files changed, 29 insertions(+), 35 deletions(-) applied to mips-next. Please check if my resolution of the conflict in arch/mips/boot/dts/ingenic/jz4780.dtsi is correct. Thomas. -- Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]