| Message ID | cover.1461558315.git.horms+renesas@verge.net.au |
|---|---|
| State | New |
| Headers | show |
On Monday 25 April 2016 14:27:31 Simon Horman wrote: > Renesas ARM Based SoC DT Updates for v4.7 > > * Configure NMI key as wakeup source in DT of kzm9g board > * Add SDHI support to DT of gose board > * Add support of UHS-I SDR-50 for SDHI to DT of r8a7790 SoC > * Correct interrupt type for ARM TWD in DT of r8a7779 and sh73a0 SoCs > * Add IIC support to DT of r8a7794 SoC > * Add CAN support to DT of r8a7793 and r8a7794 SoCs > * Add SCIF2 support to r8a7790 device tree > * Use CAN, JPU and USB3.0 fallback compatibility string > in DT of r8a7791 and r8a7790 SoCs > Pulled into next/dt, thanks! Arnd
Hi Arnd, On Mon, Apr 25, 2016 at 11:02 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Monday 25 April 2016 14:27:31 Simon Horman wrote: >> Renesas ARM Based SoC DT Updates for v4.7 >> >> * Configure NMI key as wakeup source in DT of kzm9g board >> * Add SDHI support to DT of gose board >> * Add support of UHS-I SDR-50 for SDHI to DT of r8a7790 SoC >> * Correct interrupt type for ARM TWD in DT of r8a7779 and sh73a0 SoCs >> * Add IIC support to DT of r8a7794 SoC >> * Add CAN support to DT of r8a7793 and r8a7794 SoCs >> * Add SCIF2 support to r8a7790 device tree >> * Use CAN, JPU and USB3.0 fallback compatibility string >> in DT of r8a7791 and r8a7790 SoCs > > Pulled into next/dt, thanks! Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into for-next") accidentally re-added the line clock-output-names = "can_clk"; to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary clock-output-names properties") before. It seems the same wrong conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge branch 'fixes' into for-next"). While this won't cause failures, can you please remove the offending line? Thanks! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Tuesday 26 April 2016 09:30:45 Geert Uytterhoeven wrote: > > Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into > for-next") accidentally re-added the line > > clock-output-names = "can_clk"; > > to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit > f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary > clock-output-names properties") before. It seems the same wrong > conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge > branch 'fixes' into for-next"). > > While this won't cause failures, can you please remove the offending > line? > I've merged renesas-fixes-for-v4.6 into next/dt now to resolve the conflict there, otherwise Linus would have to do the same resolution during the merge window. Thanks for letting us know. If you want to verify my new resolution, please look at next/dt, which is the more important branch. Arnd
Hi Arnd, On Tue, Apr 26, 2016 at 10:12 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Tuesday 26 April 2016 09:30:45 Geert Uytterhoeven wrote: >> Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into >> for-next") accidentally re-added the line >> >> clock-output-names = "can_clk"; >> >> to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit >> f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary >> clock-output-names properties") before. It seems the same wrong >> conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge >> branch 'fixes' into for-next"). >> >> While this won't cause failures, can you please remove the offending >> line? > > I've merged renesas-fixes-for-v4.6 into next/dt now to resolve > the conflict there, otherwise Linus would have to do the same resolution > during the merge window. > > Thanks for letting us know. If you want to verify my new resolution, > please look at next/dt, which is the more important branch. Thanks, but unfortunately your new merge resolution is incorrect, as it revived the line status = "disabled"; for the pcie_bus node. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Tuesday 26 April 2016 10:32:39 Geert Uytterhoeven wrote: > Hi Arnd, > > On Tue, Apr 26, 2016 at 10:12 AM, Arnd Bergmann <arnd@arndb.de> wrote: > > On Tuesday 26 April 2016 09:30:45 Geert Uytterhoeven wrote: > >> Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into > >> for-next") accidentally re-added the line > >> > >> clock-output-names = "can_clk"; > >> > >> to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit > >> f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary > >> clock-output-names properties") before. It seems the same wrong > >> conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge > >> branch 'fixes' into for-next"). > >> > >> While this won't cause failures, can you please remove the offending > >> line? > > > > I've merged renesas-fixes-for-v4.6 into next/dt now to resolve > > the conflict there, otherwise Linus would have to do the same resolution > > during the merge window. > > > > Thanks for letting us know. If you want to verify my new resolution, > > please look at next/dt, which is the more important branch. > > Thanks, but unfortunately your new merge resolution is incorrect, as it revived > the line > > status = "disabled"; > > for the pcie_bus node. > I've done the merge once more, noticed my mistake (vimdiff syntax coloring was slightly misleading) and fixed it. Arnd
Hi Arnd, On Tue, Apr 26, 2016 at 12:41 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Tuesday 26 April 2016 10:32:39 Geert Uytterhoeven wrote: >> On Tue, Apr 26, 2016 at 10:12 AM, Arnd Bergmann <arnd@arndb.de> wrote: >> > On Tuesday 26 April 2016 09:30:45 Geert Uytterhoeven wrote: >> >> Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into >> >> for-next") accidentally re-added the line >> >> >> >> clock-output-names = "can_clk"; >> >> >> >> to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit >> >> f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary >> >> clock-output-names properties") before. It seems the same wrong >> >> conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge >> >> branch 'fixes' into for-next"). >> >> >> >> While this won't cause failures, can you please remove the offending >> >> line? >> > >> > I've merged renesas-fixes-for-v4.6 into next/dt now to resolve >> > the conflict there, otherwise Linus would have to do the same resolution >> > during the merge window. >> > >> > Thanks for letting us know. If you want to verify my new resolution, >> > please look at next/dt, which is the more important branch. >> >> Thanks, but unfortunately your new merge resolution is incorrect, as it revived >> the line >> >> status = "disabled"; >> >> for the pcie_bus node. > > I've done the merge once more, noticed my mistake (vimdiff syntax > coloring was slightly misleading) and fixed it. Thanks, that looks correct now! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Olof, Hi Kevin, Hi Arnd, Please consider these Renesas ARM based SoC DT updates for v4.7. This pull request is based on "[GIT PULL] Renesas ARM Based SoC Cleanup for v4.7", tagged as renesas-cleanup-for-v4.7, which you have previously pulled. The reason for that base is to avoid conflicts. The differences between v1 of this pull request are: * Dropped changes to reference both DMA controllers pending further discussion * Added: - Configire NMI key as wakeup source in DT of kzm9g board - Add SDHI support to DT of gose board - Add support of UHS-I SDR-50 for SDHI to DT of r8a7790 SoC The following changes since commit 000025cfbb9e8bafd0a1fa84d8d83526d24bde42: ARM: dts: sh73a0: Remove unnecessary clock-output-names properties (2016-03-28 08:56:11 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v4.7 for you to fetch changes up to 6f92cb2f454c26d9bdada902e22af4bc361a5202: ARM: dts: gose: Enable SDHI controllers (2016-04-25 14:10:11 +1000) ---------------------------------------------------------------- Renesas ARM Based SoC DT Updates for v4.7 * Configure NMI key as wakeup source in DT of kzm9g board * Add SDHI support to DT of gose board * Add support of UHS-I SDR-50 for SDHI to DT of r8a7790 SoC * Correct interrupt type for ARM TWD in DT of r8a7779 and sh73a0 SoCs * Add IIC support to DT of r8a7794 SoC * Add CAN support to DT of r8a7793 and r8a7794 SoCs * Add SCIF2 support to r8a7790 device tree * Use CAN, JPU and USB3.0 fallback compatibility string in DT of r8a7791 and r8a7790 SoCs ---------------------------------------------------------------- Ben Hutchings (1): ARM: dts: r8a7790: Set maximum frequencies for SDHI clocks Geert Uytterhoeven (5): ARM: dts: r8a7790: Add SCIF2 clock ARM: dts: r8a7790: Add SCIF2 device node ARM: dts: sh73a0: Correct interrupt type for ARM TWD ARM: dts: r8a7779: Correct interrupt type for ARM TWD ARM: dts: kzm9g: Configure NMI key as wake-up source Simon Horman (12): ARM: dts: r8a7790: use fallback jpu compatibility string ARM: dts: r8a7791: use fallback jpu compatibility string ARM: dts: r8a7791: use fallback can compatibility string ARM: dts: r8a7790: use fallback can compatibility string ARM: dts: r8a7794: add CAN clocks to device tree ARM: dts: r8a7794: add CAN nodes to device tree ARM: dts: r8a7793: add CAN clocks to device tree ARM: dts: r8a7793: add CAN nodes to device tree ARM: dts: r8a7794: add IIC clocks ARM: dts: r8a7794: Add IIC nodes ARM: dts: r8a7790: Use USB3.0 fallback compatibility string ARM: dts: r8a7791: Use USB3.0 fallback compatibility string Ulrich Hecht (2): ARM: dts: r8a7793: Add SDHI controllers ARM: dts: gose: Enable SDHI controllers Wolfram Sang (2): ARM: dts: r8a7790: lager: Enable UHS-I SDR-50 ARM: dts: r8a7790: fix max-frequency for SDHI arch/arm/boot/dts/r8a7779.dtsi | 2 +- arch/arm/boot/dts/r8a7790-lager.dts | 22 +++++- arch/arm/boot/dts/r8a7790.dtsi | 32 ++++++-- arch/arm/boot/dts/r8a7791.dtsi | 8 +- arch/arm/boot/dts/r8a7793-gose.dts | 119 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/r8a7793.dtsi | 82 +++++++++++++++++++- arch/arm/boot/dts/r8a7794.dtsi | 92 ++++++++++++++++++++--- arch/arm/boot/dts/sh73a0-kzm9g.dts | 7 ++ arch/arm/boot/dts/sh73a0.dtsi | 2 +- include/dt-bindings/clock/r8a7790-clock.h | 1 + include/dt-bindings/clock/r8a7794-clock.h | 5 ++ 11 files changed, 343 insertions(+), 29 deletions(-)