| Message ID | 20211012110309.17d51c3e@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: build failure after merge of the arm-soc tree | expand |
On 12/10/2021 at 02:03, Stephen Rothwell wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > Hi all, > > After merging the arm-soc tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > Error: arch/arm/boot/dts/sama7g5.dtsi:167.3-7 syntax error > FATAL ERROR: Unable to parse input tree > > Caused by commit > > 9be4be3ed1ec ("Merge branch 'arm/dt' into for-next") > > I added the following patch for today: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Tue, 12 Oct 2021 10:37:29 +1100 > Subject: [PATCH] merge fix for missing semicolon > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> This patch is valid. When solving this merge conflict in at91-next here: https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git/commit/?id=dbbb39806c65b0ab3f330fc7a855bc13b20ad2ce I had following patch to have the nodes in alphabetical order: --- a/arch/arm/boot/dts/sama7g5.dtsi +++ b/arch/arm/boot/dts/sama7g5.dtsi @@@ -159,11 -137,22 +159,27 @@@ clocks = <&clk32k 0>; }; + adc: adc@e1000000 { + compatible = "microchip,sama7g5-adc"; + reg = <0xe1000000 0x200>; + interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&pmc PMC_TYPE_GCK 26>; + assigned-clocks = <&pmc PMC_TYPE_GCK 26>; + assigned-clock-rates = <100000000>; + clock-names = "adc_clk"; + dmas = <&dma0 AT91_XDMAC_DT_PERID(0)>; + dma-names = "rx"; + atmel,min-sample-rate-hz = <200000>; + atmel,max-sample-rate-hz = <20000000>; + atmel,startup-time-ms = <4>; + status = "disabled"; + }; + + chipid@e0020000 { + compatible = "microchip,sama7g5-chipid"; + reg = <0xe0020000 0x8>; + }; + sdmmc0: mmc@e1204000 { compatible = "microchip,sama7g5-sdhci", "microchip,sam9x60-sdhci"; reg = <0xe1204000 0x4000>; Sorry for not having mentioned this conflict in the pull-request. Best regards, Nicolas > --- > arch/arm/boot/dts/sama7g5.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/sama7g5.dtsi b/arch/arm/boot/dts/sama7g5.dtsi > index efcaa6ad7533..f98977f3980d 100644 > --- a/arch/arm/boot/dts/sama7g5.dtsi > +++ b/arch/arm/boot/dts/sama7g5.dtsi > @@ -162,7 +162,7 @@ ps_wdt: watchdog@e001d180 { > chipid@e0020000 { > compatible = "microchip,sama7g5-chipid"; > reg = <0xe0020000 0x8>; > - } > + }; > > adc: adc@e1000000 { > compatible = "microchip,sama7g5-adc"; > -- > 2.33.0 > > -- > Cheers, > Stephen Rothwell > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
On Tue, Oct 12, 2021 at 9:35 AM Nicolas Ferre <nicolas.ferre@microchip.com> wrote: > On 12/10/2021 at 02:03, Stephen Rothwell wrote: > > > > After merging the arm-soc tree, today's linux-next build (arm > > multi_v7_defconfig) failed like this: > > > > Error: arch/arm/boot/dts/sama7g5.dtsi:167.3-7 syntax error > > FATAL ERROR: Unable to parse input tree > > > > Caused by commit > > > > 9be4be3ed1ec ("Merge branch 'arm/dt' into for-next") Thank you for the report! I had verified the arm/dt branch by itself, but didn't recheck it after I merged it into the for-next branch. At least that one is easy to fix up as I don't send the combined branch to Linus, and the arm/dt branch does not have the problem. > I had following patch to have the nodes in alphabetical order: > ... > > Sorry for not having mentioned this conflict in the pull-request. No worries, I had assumed you had them sorted by unit-address, so I had them in the wrong order as well. Fixing up both issues in for-next now by redoing the merge. Arnd
On 12/10/2021 at 09:56, Arnd Bergmann wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > On Tue, Oct 12, 2021 at 9:35 AM Nicolas Ferre > <nicolas.ferre@microchip.com> wrote: >> On 12/10/2021 at 02:03, Stephen Rothwell wrote: >>> >>> After merging the arm-soc tree, today's linux-next build (arm >>> multi_v7_defconfig) failed like this: >>> >>> Error: arch/arm/boot/dts/sama7g5.dtsi:167.3-7 syntax error >>> FATAL ERROR: Unable to parse input tree >>> >>> Caused by commit >>> >>> 9be4be3ed1ec ("Merge branch 'arm/dt' into for-next") > > Thank you for the report! > > I had verified the arm/dt branch by itself, but didn't recheck it after I > merged it into the for-next branch. At least that one is easy to fix > up as I don't send the combined branch to Linus, and the arm/dt > branch does not have the problem. > >> I had following patch to have the nodes in alphabetical order: >> > ... >> >> Sorry for not having mentioned this conflict in the pull-request. > > No worries, > > I had assumed you had them sorted by unit-address, so I had them > in the wrong order as well. Fixing up both issues in for-next > now by redoing the merge. OMG, you're right, it's by unit-address: I'm removing my at91-next for now to not cause more confusion and merge conflicts. Not a big deal if you already re-did the merge. Best regards, Nicolas
diff --git a/arch/arm/boot/dts/sama7g5.dtsi b/arch/arm/boot/dts/sama7g5.dtsi index efcaa6ad7533..f98977f3980d 100644 --- a/arch/arm/boot/dts/sama7g5.dtsi +++ b/arch/arm/boot/dts/sama7g5.dtsi @@ -162,7 +162,7 @@ ps_wdt: watchdog@e001d180 { chipid@e0020000 { compatible = "microchip,sama7g5-chipid"; reg = <0xe0020000 0x8>; - } + }; adc: adc@e1000000 { compatible = "microchip,sama7g5-adc";
Hi all, After merging the arm-soc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: Error: arch/arm/boot/dts/sama7g5.dtsi:167.3-7 syntax error FATAL ERROR: Unable to parse input tree Caused by commit 9be4be3ed1ec ("Merge branch 'arm/dt' into for-next") I added the following patch for today: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 12 Oct 2021 10:37:29 +1100 Subject: [PATCH] merge fix for missing semicolon Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/arm/boot/dts/sama7g5.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)