2016-03-23 22:08:59

by Matthew McClintock

Subject: [PATCH 06/17] watchdog: qcom: update device tree bindings

Update the compatible string to align with driver

CC: [email protected]
Signed-off-by: Matthew McClintock <[email protected]>
---
Documentation/devicetree/bindings/watchdog/qcom-wdt.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt b/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
index 4726924..60bb2f98 100644
--- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
@@ -4,9 +4,8 @@ Qualcomm Krait Processor Sub-system (KPSS) Watchdog
Required properties :
- compatible : shall contain only one of the following:

- "qcom,kpss-wdt-msm8960"
- "qcom,kpss-wdt-apq8064"
- "qcom,kpss-wdt-ipq8064"
+ "qcom,kpss-timer"
+ "qcom,scss-timer"

- reg : shall contain base register location and length
- clocks : shall contain the input clock
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

2016-03-23 22:26:07

by Stephen Boyd

Subject: Re: [PATCH 06/17] watchdog: qcom: update device tree bindings

On 03/23/2016 03:05 PM, Matthew McClintock wrote:
> Update the compatible string to align with driver
>
> CC: [email protected]
> Signed-off-by: Matthew McClintock <[email protected]>

I had a patch similar to this before
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-February/325235.html


> ---
> Documentation/devicetree/bindings/watchdog/qcom-wdt.txt | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt b/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
> index 4726924..60bb2f98 100644
> --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
> +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
> @@ -4,9 +4,8 @@ Qualcomm Krait Processor Sub-system (KPSS) Watchdog
> Required properties :
> - compatible : shall contain only one of the following:
>
> - "qcom,kpss-wdt-msm8960"
> - "qcom,kpss-wdt-apq8064"
> - "qcom,kpss-wdt-ipq8064"
> + "qcom,kpss-timer"
> + "qcom,scss-timer"
>
> - reg : shall contain base register location and length
> - clocks : shall contain the input clock

No example update?

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

2016-03-24 15:49:42

by Matthew McClintock

Subject: Re: [PATCH 06/17] watchdog: qcom: update device tree bindings

> On Mar 23, 2016, at 5:26 PM, Stephen Boyd <[email protected]> wrote:
>
> On 03/23/2016 03:05 PM, Matthew McClintock wrote:
>> Update the compatible string to align with driver
>>
>> CC: [email protected]
>> Signed-off-by: Matthew McClintock <[email protected]>
>
> I had a patch similar to this before
> http://lists.infradead.org/pipermail/linux-arm-kernel/2015-February/325235.html

Whoops, your patch looks better. Will drop this one.

-M

2016-03-25 14:13:22

by Rob Herring (Arm)

Subject: Re: [PATCH 06/17] watchdog: qcom: update device tree bindings

On Wed, Mar 23, 2016 at 05:05:01PM -0500, Matthew McClintock wrote:
> Update the compatible string to align with driver
>
> CC: [email protected]
> Signed-off-by: Matthew McClintock <[email protected]>
> ---
> Documentation/devicetree/bindings/watchdog/qcom-wdt.txt | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt b/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
> index 4726924..60bb2f98 100644
> --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
> +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
> @@ -4,9 +4,8 @@ Qualcomm Krait Processor Sub-system (KPSS) Watchdog
> Required properties :
> - compatible : shall contain only one of the following:
>
> - "qcom,kpss-wdt-msm8960"
> - "qcom,kpss-wdt-apq8064"
> - "qcom,kpss-wdt-ipq8064"
> + "qcom,kpss-timer"
> + "qcom,scss-timer"

Keep the SoC specific ones even if they are not used. The DTS should
have both strings.

Rob