| Message ID | 1374658699-3961-4-git-send-email-l.krishna@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Leela, On 24 July 2013 15:08, Leela Krishna Amudala <l.krishna@samsung.com> wrote: > This patch adds support for specifying the pmu registers and masking bit > for watchdog to enable/disable and mask/unmask the watchdog reset request. > > Reviewed-by: Doug Anderson <dianders@chromium.org> > Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com> > --- > arch/arm/boot/dts/exynos5.dtsi | 2 +- > arch/arm/boot/dts/exynos5420.dtsi | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi > index f65e124..4d63b74 100644 > --- a/arch/arm/boot/dts/exynos5.dtsi > +++ b/arch/arm/boot/dts/exynos5.dtsi > @@ -104,7 +104,7 @@ > > watchdog { > compatible = "samsung,s3c2410-wdt"; > - reg = <0x101D0000 0x100>; > + reg = <0x101D0000 0x100>, <0x10040408 0x4>, <0x1004040c 0x4>; > interrupts = <0 42 0>; > status = "disabled"; > }; > diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi > index e1d2d20..ea5b49f 100644 > --- a/arch/arm/boot/dts/exynos5420.dtsi > +++ b/arch/arm/boot/dts/exynos5420.dtsi > @@ -150,5 +150,6 @@ > clocks = <&clock 316>; > clock-names = "watchdog"; > status = "okay"; > + reset-mask-bit = <0>; Why not add this hunk to the previous patch itself?
Hi Sachin, On Wed, Jul 24, 2013 at 3:16 PM, Sachin Kamat <sachin.kamat@linaro.org> wrote: > Hi Leela, > > On 24 July 2013 15:08, Leela Krishna Amudala <l.krishna@samsung.com> wrote: >> This patch adds support for specifying the pmu registers and masking bit >> for watchdog to enable/disable and mask/unmask the watchdog reset request. >> >> Reviewed-by: Doug Anderson <dianders@chromium.org> >> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com> >> --- >> arch/arm/boot/dts/exynos5.dtsi | 2 +- >> arch/arm/boot/dts/exynos5420.dtsi | 1 + >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi >> index f65e124..4d63b74 100644 >> --- a/arch/arm/boot/dts/exynos5.dtsi >> +++ b/arch/arm/boot/dts/exynos5.dtsi >> @@ -104,7 +104,7 @@ >> >> watchdog { >> compatible = "samsung,s3c2410-wdt"; >> - reg = <0x101D0000 0x100>; >> + reg = <0x101D0000 0x100>, <0x10040408 0x4>, <0x1004040c 0x4>; >> interrupts = <0 42 0>; >> status = "disabled"; >> }; >> diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi >> index e1d2d20..ea5b49f 100644 >> --- a/arch/arm/boot/dts/exynos5420.dtsi >> +++ b/arch/arm/boot/dts/exynos5420.dtsi >> @@ -150,5 +150,6 @@ >> clocks = <&clock 316>; >> clock-names = "watchdog"; >> status = "okay"; >> + reset-mask-bit = <0>; > > Why not add this hunk to the previous patch itself? > This particular property holds a bit number that has to be programmed in the PMU registers (mentioned in exynos5.dtsi). So I added this property along with those registers. Best Wishes, Leela krishna. > -- > With warm regards, > Sachin > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Leela, On 24 July 2013 16:24, Leela Krishna Amudala <l.krishna@samsung.com> wrote: > Hi Sachin, > > On Wed, Jul 24, 2013 at 3:16 PM, Sachin Kamat <sachin.kamat@linaro.org> wrote: >> Hi Leela, >> >> On 24 July 2013 15:08, Leela Krishna Amudala <l.krishna@samsung.com> wrote: >>> This patch adds support for specifying the pmu registers and masking bit >>> for watchdog to enable/disable and mask/unmask the watchdog reset request. >>> >>> Reviewed-by: Doug Anderson <dianders@chromium.org> >>> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com> >>> --- >>> arch/arm/boot/dts/exynos5.dtsi | 2 +- >>> arch/arm/boot/dts/exynos5420.dtsi | 1 + >>> 2 files changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi >>> index f65e124..4d63b74 100644 >>> --- a/arch/arm/boot/dts/exynos5.dtsi >>> +++ b/arch/arm/boot/dts/exynos5.dtsi >>> @@ -104,7 +104,7 @@ >>> >>> watchdog { >>> compatible = "samsung,s3c2410-wdt"; >>> - reg = <0x101D0000 0x100>; >>> + reg = <0x101D0000 0x100>, <0x10040408 0x4>, <0x1004040c 0x4>; >>> interrupts = <0 42 0>; >>> status = "disabled"; >>> }; >>> diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi >>> index e1d2d20..ea5b49f 100644 >>> --- a/arch/arm/boot/dts/exynos5420.dtsi >>> +++ b/arch/arm/boot/dts/exynos5420.dtsi >>> @@ -150,5 +150,6 @@ >>> clocks = <&clock 316>; >>> clock-names = "watchdog"; >>> status = "okay"; >>> + reset-mask-bit = <0>; >> >> Why not add this hunk to the previous patch itself? >> > > This particular property holds a bit number that has to be programmed > in the PMU registers (mentioned in exynos5.dtsi). > So I added this property along with those registers. In this case you can swap patches 2 and 3 i.e., add the PMU registers to exynos5.dtsi in patch 2 and then add the watchdog node along with reset-mask-bit in patch3.
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi index f65e124..4d63b74 100644 --- a/arch/arm/boot/dts/exynos5.dtsi +++ b/arch/arm/boot/dts/exynos5.dtsi @@ -104,7 +104,7 @@ watchdog { compatible = "samsung,s3c2410-wdt"; - reg = <0x101D0000 0x100>; + reg = <0x101D0000 0x100>, <0x10040408 0x4>, <0x1004040c 0x4>; interrupts = <0 42 0>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index e1d2d20..ea5b49f 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -150,5 +150,6 @@ clocks = <&clock 316>; clock-names = "watchdog"; status = "okay"; + reset-mask-bit = <0>; }; };