| Message ID | 20170311172527.16368-4-krzk@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/11/2017 09:25 AM, Krzysztof Kozlowski wrote: > The Exynos4412 has the same watchdog as newer SoCs (e.g. Exynos5250). > Just like the others, for working it requires additional steps in Power > Management Unit: unmasking the reset request and enabling the system > reset. Without these additional steps in PMU, the watchdog will not be > able to reset the system on expiration event. > > Change the compatible of Exynos4412 watchdog device node to > samsung,exynos5250-wdt which includes the additional PMU steps. > > This will also fix infinite watchdog interrupt in soft mode (lack of > interrupt clear) because it is also included in samsung,exynos5250-wdt. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Acked-by: Guenter Roeck <linux@roeck-us.net> I assume this patch will be pushed through some arm tree. Thanks, Guenter > --- > arch/arm/boot/dts/exynos4.dtsi | 9 --------- > arch/arm/boot/dts/exynos4210.dtsi | 9 +++++++++ > arch/arm/boot/dts/exynos4412.dtsi | 10 ++++++++++ > 3 files changed, 19 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi > index 18def1c774d5..71e2cdae6068 100644 > --- a/arch/arm/boot/dts/exynos4.dtsi > +++ b/arch/arm/boot/dts/exynos4.dtsi > @@ -283,15 +283,6 @@ > }; > }; > > - watchdog: watchdog@10060000 { > - compatible = "samsung,s3c2410-wdt"; > - reg = <0x10060000 0x100>; > - interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; > - clocks = <&clock CLK_WDT>; > - clock-names = "watchdog"; > - status = "disabled"; > - }; > - > rtc: rtc@10070000 { > compatible = "samsung,s3c6410-rtc"; > reg = <0x10070000 0x100>; > diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi > index f9408188f97f..8bff2253acca 100644 > --- a/arch/arm/boot/dts/exynos4210.dtsi > +++ b/arch/arm/boot/dts/exynos4210.dtsi > @@ -119,6 +119,15 @@ > }; > }; > > + watchdog: watchdog@10060000 { > + compatible = "samsung,s3c2410-wdt"; > + reg = <0x10060000 0x100>; > + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&clock CLK_WDT>; > + clock-names = "watchdog"; > + status = "disabled"; > + }; > + > clock: clock-controller@10030000 { > compatible = "samsung,exynos4210-clock"; > reg = <0x10030000 0x20000>; > diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi > index 235bbb69ad7c..6f47988a1ab5 100644 > --- a/arch/arm/boot/dts/exynos4412.dtsi > +++ b/arch/arm/boot/dts/exynos4412.dtsi > @@ -215,6 +215,16 @@ > }; > }; > > + watchdog: watchdog@10060000 { > + compatible = "samsung,exynos5250-wdt"; > + reg = <0x10060000 0x100>; > + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&clock CLK_WDT>; > + clock-names = "watchdog"; > + samsung,syscon-phandle = <&pmu_system_controller>; > + status = "disabled"; > + }; > + > adc: adc@126C0000 { > compatible = "samsung,exynos-adc-v1"; > reg = <0x126C0000 0x100>; >
On Sun, Mar 12, 2017 at 10:48 PM, Guenter Roeck <linux@roeck-us.net> wrote: > On 03/11/2017 09:25 AM, Krzysztof Kozlowski wrote: >> >> The Exynos4412 has the same watchdog as newer SoCs (e.g. Exynos5250). >> Just like the others, for working it requires additional steps in Power >> Management Unit: unmasking the reset request and enabling the system >> reset. Without these additional steps in PMU, the watchdog will not be >> able to reset the system on expiration event. >> >> Change the compatible of Exynos4412 watchdog device node to >> samsung,exynos5250-wdt which includes the additional PMU steps. >> >> This will also fix infinite watchdog interrupt in soft mode (lack of >> interrupt clear) because it is also included in samsung,exynos5250-wdt. >> >> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > Acked-by: Guenter Roeck <linux@roeck-us.net> > > I assume this patch will be pushed through some arm tree. Yes, I will take it through samsung-soc. Best regards, Krzysztof
Hi, On Saturday, March 11, 2017 07:25:22 PM Krzysztof Kozlowski wrote: > The Exynos4412 has the same watchdog as newer SoCs (e.g. Exynos5250). > Just like the others, for working it requires additional steps in Power > Management Unit: unmasking the reset request and enabling the system > reset. Without these additional steps in PMU, the watchdog will not be > able to reset the system on expiration event. > > Change the compatible of Exynos4412 watchdog device node to > samsung,exynos5250-wdt which includes the additional PMU steps. This is going to confuse people. How's about doing it cleanly (by adding samsung,exynos4412-wdt compatible and convert existing users to use instead)? > This will also fix infinite watchdog interrupt in soft mode (lack of > interrupt clear) because it is also included in samsung,exynos5250-wdt. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics
On Tue, Mar 14, 2017 at 3:03 PM, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> wrote: > > Hi, > > On Saturday, March 11, 2017 07:25:22 PM Krzysztof Kozlowski wrote: >> The Exynos4412 has the same watchdog as newer SoCs (e.g. Exynos5250). >> Just like the others, for working it requires additional steps in Power >> Management Unit: unmasking the reset request and enabling the system >> reset. Without these additional steps in PMU, the watchdog will not be >> able to reset the system on expiration event. >> >> Change the compatible of Exynos4412 watchdog device node to >> samsung,exynos5250-wdt which includes the additional PMU steps. > > This is going to confuse people. How's about doing it cleanly > (by adding samsung,exynos4412-wdt compatible and convert existing > users to use instead)? I don't find usage of 5250 in Exynos4412 DTS as confusing because since long time I do not threat these numbers as having any meaning (e.g. 3250 is newer...). Yes, we can duplicate the compatible for that purpose. Care to send a patch for this? Best regards, Krzysztof
On Tuesday, March 14, 2017 03:09:25 PM Krzysztof Kozlowski wrote: > On Tue, Mar 14, 2017 at 3:03 PM, Bartlomiej Zolnierkiewicz > <b.zolnierkie@samsung.com> wrote: > > > > Hi, > > > > On Saturday, March 11, 2017 07:25:22 PM Krzysztof Kozlowski wrote: > >> The Exynos4412 has the same watchdog as newer SoCs (e.g. Exynos5250). > >> Just like the others, for working it requires additional steps in Power > >> Management Unit: unmasking the reset request and enabling the system > >> reset. Without these additional steps in PMU, the watchdog will not be > >> able to reset the system on expiration event. > >> > >> Change the compatible of Exynos4412 watchdog device node to > >> samsung,exynos5250-wdt which includes the additional PMU steps. > > > > This is going to confuse people. How's about doing it cleanly > > (by adding samsung,exynos4412-wdt compatible and convert existing > > users to use instead)? > > I don't find usage of 5250 in Exynos4412 DTS as confusing because > since long time I do not threat these numbers as having any meaning > (e.g. 3250 is newer...). Yes, we can duplicate the compatible for that > purpose. Care to send a patch for this? I don't buy this argument. The point is not in the number itself but in the fact that you as developer know than 3250 is newer than 4412 (the same way as you know that 5250 is also newer than 4412). This convention is used for all Exynos bindings so please don't break it. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 18def1c774d5..71e2cdae6068 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -283,15 +283,6 @@ }; }; - watchdog: watchdog@10060000 { - compatible = "samsung,s3c2410-wdt"; - reg = <0x10060000 0x100>; - interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clock CLK_WDT>; - clock-names = "watchdog"; - status = "disabled"; - }; - rtc: rtc@10070000 { compatible = "samsung,s3c6410-rtc"; reg = <0x10070000 0x100>; diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index f9408188f97f..8bff2253acca 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -119,6 +119,15 @@ }; }; + watchdog: watchdog@10060000 { + compatible = "samsung,s3c2410-wdt"; + reg = <0x10060000 0x100>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clock CLK_WDT>; + clock-names = "watchdog"; + status = "disabled"; + }; + clock: clock-controller@10030000 { compatible = "samsung,exynos4210-clock"; reg = <0x10030000 0x20000>; diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index 235bbb69ad7c..6f47988a1ab5 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -215,6 +215,16 @@ }; }; + watchdog: watchdog@10060000 { + compatible = "samsung,exynos5250-wdt"; + reg = <0x10060000 0x100>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clock CLK_WDT>; + clock-names = "watchdog"; + samsung,syscon-phandle = <&pmu_system_controller>; + status = "disabled"; + }; + adc: adc@126C0000 { compatible = "samsung,exynos-adc-v1"; reg = <0x126C0000 0x100>;
The Exynos4412 has the same watchdog as newer SoCs (e.g. Exynos5250). Just like the others, for working it requires additional steps in Power Management Unit: unmasking the reset request and enabling the system reset. Without these additional steps in PMU, the watchdog will not be able to reset the system on expiration event. Change the compatible of Exynos4412 watchdog device node to samsung,exynos5250-wdt which includes the additional PMU steps. This will also fix infinite watchdog interrupt in soft mode (lack of interrupt clear) because it is also included in samsung,exynos5250-wdt. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- arch/arm/boot/dts/exynos4.dtsi | 9 --------- arch/arm/boot/dts/exynos4210.dtsi | 9 +++++++++ arch/arm/boot/dts/exynos4412.dtsi | 10 ++++++++++ 3 files changed, 19 insertions(+), 9 deletions(-)