On Wed, Apr 18, 2018 at 03:37:29PM +0200, Geert Uytterhoeven wrote: > Hi Simon, > > On Tue, Mar 13, 2018 at 9:05 PM, Simon Horman <horms@xxxxxxxxxxxx> wrote: > > I understand that the watchdog driver has been accepted and that as things > > currently stand if it is enabled in the build it will be enabled in DT and > > a crash will result. From my POV that is a regression so I have decided > > to adopt the alternate plan proposed by Geert above: in short drop DT > > patches (to avoid enabling broken driver) and enqueue mach-shmobile > > patches (which don't make things any worse. > > > > Patch-by-patch things are as follows. > > > > Dropped from "[PATCH v5 00/26] Fix watchdog on Renesas R-Car Gen2 and RZ/G1": > > > > 979d28f29742 ARM: dts: r8a7743: Adjust SMP routine size > > 0b205f679f5d ARM: dts: r8a7745: Adjust SMP routine size > > 2ad21a1d78b3 ARM: dts: r8a7790: Adjust SMP routine size > > 82c978459c77 ARM: dts: r8a7791: Adjust SMP routine size > > d303698e6ff3 ARM: dts: r8a7792: Adjust SMP routine size > > d8b8b9a1e295 ARM: dts: r8a7793: Adjust SMP routine size > > 70b3ab369773 ARM: dts: r8a7794: Adjust SMP routine size > > > > ebf26cf1b1de ARM: dts: r8a7743: Add watchdog support to SoC dtsi > > 5a4566ab3777 ARM: dts: r8a7745: Add watchdog support to SoC dtsi > > acd58e2bb1e5 ARM: dts: r8a7790: Add watchdog support to SoC dtsi > > e3f89168e72f ARM: dts: r8a7791: Add watchdog support to SoC dtsi > > e76a6a69a1fc ARM: dts: r8a7794: Add watchdog support to SoC dtsi > > 242cc1ab7f7c ARM: dts: iwg20m: Add watchdog support to SoM dtsi > > 748ed07f6c7c ARM: dts: iwg22m: Add watchdog support to SoM dtsi > > > > > > Dropped from "[PATCH/RFC 00/11] ARM: dts: rcar-gen2: Enable watchdog support": > > > > c257202482e2 ARM: dts: r8a7792: Add RWDT node > > 01ec04dec8eb ARM: dts: r8a7793: Add RWDT node > > 8e6ebe4f2f94 ARM: dts: lager: Enable watchdog support > > f223ad0198f6 ARM: dts: koelsch: Enable watchdog support > > 1d14d2bb700d ARM: dts: porter: Enable watchdog support > > bf71652fc955 ARM: dts: blanche: Enable watchdog support > > 13a0b10aeea4 ARM: dts: wheat: Enable watchdog support > > 4e247bf110b8 ARM: dts: gose: Enable watchdog support > > 2dcbd24bbf5e ARM: dts: alt: Enable watchdog support > > 7f6844c900b4 ARM: dts: silk: Enable watchdog support > > > > And applied: > > > > [v5] ARM: shmobile: rcar-gen2: Add watchdog support > > [v5] ARM: shmobile: Add watchdog support > > > > In the case of the last patch above I removed the #ifdef from the header file. > > I guess the time is ripe to apply the DTS patches again, in the following order: > 1. SMP routine size adjustments, > 2. Watchdog support additions to dtsi, > 3. Watchdog enablement for dts? > > Thanks! Thanks, I have tentatively reapplied all of the above.
