* [PATCHv2 0/2] Convert QCOM watchdog timer bindings to YAML
@ 2020-02-01 15:29 Sai Prakash Ranjan
2020-02-01 15:29 ` [PATCHv2 1/2] dt-bindings: watchdog: " Sai Prakash Ranjan
2020-02-01 15:29 ` [PATCHv2 2/2] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150 Sai Prakash Ranjan
0 siblings, 2 replies; 12+ messages in thread
From: Sai Prakash Ranjan @ 2020-02-01 15:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Rob Herring, Guenter Roeck, devicetree
Cc: Sai Prakash Ranjan, linux-arm-msm, linux-kernel,
Douglas Anderson, Matthias Kaehlcke, Stephen Boyd,
linux-arm-kernel
This series converts QCOM watchdog timer bindings to YAML. Also
it adds the missing SoC-specific compatible for QCS404, SC7180,
SDM845 and SM8150 SoCs.
v1: https://lore.kernel.org/lkml/cover.1576211720.git.saiprakash.ranjan@codeaurora.org/
Changes since v1:
As per Rob's suggestion:
* Replaced oneOf+const with enum.
* Removed timeout-sec and included watchdog.yaml.
* Removed repeated use of const:qcom,kpss-wdt and made use of enum.
Sai Prakash Ranjan (2):
dt-bindings: watchdog: Convert QCOM watchdog timer bindings to YAML
dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845,
SM8150
.../devicetree/bindings/watchdog/qcom-wdt.txt | 28 -----------
.../bindings/watchdog/qcom-wdt.yaml | 49 +++++++++++++++++++
2 files changed, 49 insertions(+), 28 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
create mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCHv2 1/2] dt-bindings: watchdog: Convert QCOM watchdog timer bindings to YAML
2020-02-01 15:29 [PATCHv2 0/2] Convert QCOM watchdog timer bindings to YAML Sai Prakash Ranjan
@ 2020-02-01 15:29 ` Sai Prakash Ranjan
2020-02-02 4:41 ` Stephen Boyd
` (2 more replies)
2020-02-01 15:29 ` [PATCHv2 2/2] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150 Sai Prakash Ranjan
1 sibling, 3 replies; 12+ messages in thread
From: Sai Prakash Ranjan @ 2020-02-01 15:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Rob Herring, Guenter Roeck, devicetree
Cc: Sai Prakash Ranjan, linux-arm-msm, linux-kernel,
Douglas Anderson, Matthias Kaehlcke, Stephen Boyd,
linux-arm-kernel
Convert QCOM watchdog timer bindings to DT schema format using
json-schema.
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
---
.../devicetree/bindings/watchdog/qcom-wdt.txt | 28 ------------
.../bindings/watchdog/qcom-wdt.yaml | 44 +++++++++++++++++++
2 files changed, 44 insertions(+), 28 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
create mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt b/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
deleted file mode 100644
index 41aeaa2ff0f8..000000000000
--- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-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-wdt-ipq4019"
- "qcom,kpss-timer"
- "qcom,scss-timer"
- "qcom,kpss-wdt"
-
-- reg : shall contain base register location and length
-- clocks : shall contain the input clock
-
-Optional properties :
-- timeout-sec : shall contain the default watchdog timeout in seconds,
- if unset, the default timeout is 30 seconds
-
-Example:
- watchdog@208a038 {
- compatible = "qcom,kpss-wdt-ipq8064";
- reg = <0x0208a038 0x40>;
- clocks = <&sleep_clk>;
- timeout-sec = <10>;
- };
diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
new file mode 100644
index 000000000000..5448cc537a03
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
@@ -0,0 +1,44 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/watchdog/qcom-wdt.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm Krait Processor Sub-system (KPSS) Watchdog timer
+
+maintainers:
+ - Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
+
+allOf:
+ - $ref: watchdog.yaml#
+
+properties:
+ compatible:
+ enum:
+ - qcom,kpss-timer
+ - qcom,kpss-wdt
+ - qcom,kpss-wdt-apq8064
+ - qcom,kpss-wdt-ipq4019
+ - qcom,kpss-wdt-ipq8064
+ - qcom,kpss-wdt-msm8960
+ - qcom,scss-timer
+
+ reg:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+ - clocks
+
+examples:
+ - |
+ watchdog@208a038 {
+ compatible = "qcom,kpss-wdt-ipq8064";
+ reg = <0x0208a038 0x40>;
+ clocks = <&sleep_clk>;
+ timeout-sec = <10>;
+ };
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCHv2 2/2] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150
2020-02-01 15:29 [PATCHv2 0/2] Convert QCOM watchdog timer bindings to YAML Sai Prakash Ranjan
2020-02-01 15:29 ` [PATCHv2 1/2] dt-bindings: watchdog: " Sai Prakash Ranjan
@ 2020-02-01 15:29 ` Sai Prakash Ranjan
2020-02-02 4:41 ` Stephen Boyd
2020-02-06 18:38 ` Rob Herring
1 sibling, 2 replies; 12+ messages in thread
From: Sai Prakash Ranjan @ 2020-02-01 15:29 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Rob Herring, Guenter Roeck, devicetree
Cc: Sai Prakash Ranjan, linux-arm-msm, linux-kernel,
Douglas Anderson, Matthias Kaehlcke, Stephen Boyd,
linux-arm-kernel
Add missing compatible for watchdog timer on QCS404,
SC7180, SDM845 and SM8150 SoCs.
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
---
.../bindings/watchdog/qcom-wdt.yaml | 21 ++++++++++++-------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
index 5448cc537a03..7180c64f54fb 100644
--- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
@@ -14,14 +14,19 @@ allOf:
properties:
compatible:
- enum:
- - qcom,kpss-timer
- - qcom,kpss-wdt
- - qcom,kpss-wdt-apq8064
- - qcom,kpss-wdt-ipq4019
- - qcom,kpss-wdt-ipq8064
- - qcom,kpss-wdt-msm8960
- - qcom,scss-timer
+ items:
+ - enum:
+ - qcom,apss-wdt-qcs404
+ - qcom,apss-wdt-sc7180
+ - qcom,apss-wdt-sdm845
+ - qcom,apss-wdt-sm8150
+ - qcom,kpss-timer
+ - qcom,kpss-wdt-apq8064
+ - qcom,kpss-wdt-ipq4019
+ - qcom,kpss-wdt-ipq8064
+ - qcom,kpss-wdt-msm8960
+ - qcom,scss-timer
+ - const: qcom,kpss-wdt
reg:
maxItems: 1
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCHv2 2/2] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150
2020-02-01 15:29 ` [PATCHv2 2/2] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150 Sai Prakash Ranjan
@ 2020-02-02 4:41 ` Stephen Boyd
2020-02-06 18:38 ` Rob Herring
1 sibling, 0 replies; 12+ messages in thread
From: Stephen Boyd @ 2020-02-02 4:41 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Guenter Roeck, Rob Herring,
Sai Prakash Ranjan, devicetree
Cc: Sai Prakash Ranjan, linux-arm-msm, Douglas Anderson,
linux-kernel, Matthias Kaehlcke, linux-arm-kernel
Quoting Sai Prakash Ranjan (2020-02-01 07:29:49)
> Add missing compatible for watchdog timer on QCS404,
> SC7180, SDM845 and SM8150 SoCs.
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
> ---
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCHv2 1/2] dt-bindings: watchdog: Convert QCOM watchdog timer bindings to YAML
2020-02-01 15:29 ` [PATCHv2 1/2] dt-bindings: watchdog: " Sai Prakash Ranjan
@ 2020-02-02 4:41 ` Stephen Boyd
2020-02-02 4:43 ` Stephen Boyd
2020-02-06 18:39 ` Rob Herring
2 siblings, 0 replies; 12+ messages in thread
From: Stephen Boyd @ 2020-02-02 4:41 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Guenter Roeck, Rob Herring,
Sai Prakash Ranjan, devicetree
Cc: Sai Prakash Ranjan, linux-arm-msm, Douglas Anderson,
linux-kernel, Matthias Kaehlcke, linux-arm-kernel
Quoting Sai Prakash Ranjan (2020-02-01 07:29:48)
> Convert QCOM watchdog timer bindings to DT schema format using
> json-schema.
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
> ---
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCHv2 1/2] dt-bindings: watchdog: Convert QCOM watchdog timer bindings to YAML
2020-02-01 15:29 ` [PATCHv2 1/2] dt-bindings: watchdog: " Sai Prakash Ranjan
2020-02-02 4:41 ` Stephen Boyd
@ 2020-02-02 4:43 ` Stephen Boyd
2020-02-02 5:07 ` Sai Prakash Ranjan
2020-02-06 18:39 ` Rob Herring
2 siblings, 1 reply; 12+ messages in thread
From: Stephen Boyd @ 2020-02-02 4:43 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Guenter Roeck, Rob Herring,
Sai Prakash Ranjan, devicetree
Cc: Sai Prakash Ranjan, linux-arm-msm, Douglas Anderson,
linux-kernel, Matthias Kaehlcke, linux-arm-kernel
Quoting Sai Prakash Ranjan (2020-02-01 07:29:48)
> diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> new file mode 100644
> index 000000000000..5448cc537a03
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> @@ -0,0 +1,44 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/watchdog/qcom-wdt.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Qualcomm Krait Processor Sub-system (KPSS) Watchdog timer
> +
> +maintainers:
> + - Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
> +
> +allOf:
> + - $ref: watchdog.yaml#
> +
> +properties:
> + compatible:
> + enum:
> + - qcom,kpss-timer
> + - qcom,kpss-wdt
> + - qcom,kpss-wdt-apq8064
> + - qcom,kpss-wdt-ipq4019
> + - qcom,kpss-wdt-ipq8064
> + - qcom,kpss-wdt-msm8960
> + - qcom,scss-timer
> +
> + reg:
> + maxItems: 1
> +
> + clocks:
> + maxItems: 1
By the way, I would expect the watchdog to have an interrupt property.
Not sure why it isn't described in the existing binding.
> +
> +required:
> + - compatible
> + - reg
> + - clocks
> +
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCHv2 1/2] dt-bindings: watchdog: Convert QCOM watchdog timer bindings to YAML
2020-02-02 4:43 ` Stephen Boyd
@ 2020-02-02 5:07 ` Sai Prakash Ranjan
0 siblings, 0 replies; 12+ messages in thread
From: Sai Prakash Ranjan @ 2020-02-02 5:07 UTC (permalink / raw)
To: Stephen Boyd
Cc: devicetree, linux-kernel, Andy Gross, Douglas Anderson,
Rob Herring, linux-arm-kernel, linux-arm-msm, Bjorn Andersson,
Matthias Kaehlcke, Guenter Roeck
On 2020-02-02 10:13, Stephen Boyd wrote:
> Quoting Sai Prakash Ranjan (2020-02-01 07:29:48)
>> diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
>> b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
>> new file mode 100644
>> index 000000000000..5448cc537a03
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
>> @@ -0,0 +1,44 @@
>> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/watchdog/qcom-wdt.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: Qualcomm Krait Processor Sub-system (KPSS) Watchdog timer
>> +
>> +maintainers:
>> + - Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
>> +
>> +allOf:
>> + - $ref: watchdog.yaml#
>> +
>> +properties:
>> + compatible:
>> + enum:
>> + - qcom,kpss-timer
>> + - qcom,kpss-wdt
>> + - qcom,kpss-wdt-apq8064
>> + - qcom,kpss-wdt-ipq4019
>> + - qcom,kpss-wdt-ipq8064
>> + - qcom,kpss-wdt-msm8960
>> + - qcom,scss-timer
>> +
>> + reg:
>> + maxItems: 1
>> +
>> + clocks:
>> + maxItems: 1
>
> By the way, I would expect the watchdog to have an interrupt property.
> Not sure why it isn't described in the existing binding.
>
Yes it should be an optional property now that bark interrupt support
has been added. I will add that in a separate patch.
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a
member
of Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCHv2 2/2] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150
2020-02-01 15:29 ` [PATCHv2 2/2] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150 Sai Prakash Ranjan
2020-02-02 4:41 ` Stephen Boyd
@ 2020-02-06 18:38 ` Rob Herring
2020-02-07 6:10 ` Sai Prakash Ranjan
1 sibling, 1 reply; 12+ messages in thread
From: Rob Herring @ 2020-02-06 18:38 UTC (permalink / raw)
To: Sai Prakash Ranjan
Cc: devicetree, linux-kernel, Douglas Anderson, Stephen Boyd,
Andy Gross, linux-arm-kernel, linux-arm-msm, Bjorn Andersson,
Matthias Kaehlcke, Guenter Roeck
On Sat, Feb 01, 2020 at 08:59:49PM +0530, Sai Prakash Ranjan wrote:
> Add missing compatible for watchdog timer on QCS404,
> SC7180, SDM845 and SM8150 SoCs.
That's not what the commit does. You are changing what's valid.
One string was valid, now 2 are required.
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
> ---
> .../bindings/watchdog/qcom-wdt.yaml | 21 ++++++++++++-------
> 1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> index 5448cc537a03..7180c64f54fb 100644
> --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> @@ -14,14 +14,19 @@ allOf:
>
> properties:
> compatible:
> - enum:
> - - qcom,kpss-timer
> - - qcom,kpss-wdt
> - - qcom,kpss-wdt-apq8064
> - - qcom,kpss-wdt-ipq4019
> - - qcom,kpss-wdt-ipq8064
> - - qcom,kpss-wdt-msm8960
> - - qcom,scss-timer
> + items:
> + - enum:
> + - qcom,apss-wdt-qcs404
> + - qcom,apss-wdt-sc7180
> + - qcom,apss-wdt-sdm845
> + - qcom,apss-wdt-sm8150
> + - qcom,kpss-timer
> + - qcom,kpss-wdt-apq8064
> + - qcom,kpss-wdt-ipq4019
> + - qcom,kpss-wdt-ipq8064
> + - qcom,kpss-wdt-msm8960
> + - qcom,scss-timer
> + - const: qcom,kpss-wdt
>
> reg:
> maxItems: 1
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCHv2 1/2] dt-bindings: watchdog: Convert QCOM watchdog timer bindings to YAML
2020-02-01 15:29 ` [PATCHv2 1/2] dt-bindings: watchdog: " Sai Prakash Ranjan
2020-02-02 4:41 ` Stephen Boyd
2020-02-02 4:43 ` Stephen Boyd
@ 2020-02-06 18:39 ` Rob Herring
2 siblings, 0 replies; 12+ messages in thread
From: Rob Herring @ 2020-02-06 18:39 UTC (permalink / raw)
To: Sai Prakash Ranjan
Cc: devicetree, Sai Prakash Ranjan, linux-kernel, Douglas Anderson,
Stephen Boyd, Andy Gross, linux-arm-kernel, linux-arm-msm,
Bjorn Andersson, Matthias Kaehlcke, Guenter Roeck
On Sat, 1 Feb 2020 20:59:48 +0530, Sai Prakash Ranjan wrote:
> Convert QCOM watchdog timer bindings to DT schema format using
> json-schema.
>
> Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
> ---
> .../devicetree/bindings/watchdog/qcom-wdt.txt | 28 ------------
> .../bindings/watchdog/qcom-wdt.yaml | 44 +++++++++++++++++++
> 2 files changed, 44 insertions(+), 28 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.txt
> create mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
>
Reviewed-by: Rob Herring <robh@kernel.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCHv2 2/2] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150
2020-02-06 18:38 ` Rob Herring
@ 2020-02-07 6:10 ` Sai Prakash Ranjan
2020-02-11 18:24 ` Rob Herring
0 siblings, 1 reply; 12+ messages in thread
From: Sai Prakash Ranjan @ 2020-02-07 6:10 UTC (permalink / raw)
To: Rob Herring
Cc: devicetree, devicetree-owner, linux-kernel, Douglas Anderson,
Stephen Boyd, Andy Gross, linux-arm-kernel, linux-arm-msm,
Bjorn Andersson, Matthias Kaehlcke, Guenter Roeck
Hi Rob,
On 2020-02-07 00:08, Rob Herring wrote:
> On Sat, Feb 01, 2020 at 08:59:49PM +0530, Sai Prakash Ranjan wrote:
>> Add missing compatible for watchdog timer on QCS404,
>> SC7180, SDM845 and SM8150 SoCs.
>
> That's not what the commit does. You are changing what's valid.
>
> One string was valid, now 2 are required.
>
Does this look good?
diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
index 46d6aad5786a..3378244b67cd 100644
--- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
@@ -14,19 +14,22 @@ allOf:
properties:
compatible:
- items:
+ oneOf:
- enum:
- qcom,apss-wdt-qcs404
- qcom,apss-wdt-sc7180
- qcom,apss-wdt-sdm845
- qcom,apss-wdt-sm8150
- - qcom,kpss-timer
- - qcom,kpss-wdt
- qcom,kpss-wdt-apq8064
- qcom,kpss-wdt-ipq4019
- qcom,kpss-wdt-ipq8064
- qcom,kpss-wdt-msm8960
+ - qcom,kpss-timer
+ - qcom,kpss-wdt
- qcom,scss-timer
+ - const: qcom,kpss-timer
+ - const: qcom,kpss-wdt
+ - const: qcom,scss-timer
reg:
maxItems: 1
Thanks,
Sai
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a
member
of Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCHv2 2/2] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150
2020-02-07 6:10 ` Sai Prakash Ranjan
@ 2020-02-11 18:24 ` Rob Herring
2020-02-11 21:57 ` Sai Prakash Ranjan
0 siblings, 1 reply; 12+ messages in thread
From: Rob Herring @ 2020-02-11 18:24 UTC (permalink / raw)
To: Sai Prakash Ranjan
Cc: devicetree, devicetree-owner, linux-kernel, Douglas Anderson,
Stephen Boyd, Andy Gross,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
linux-arm-msm, Bjorn Andersson, Matthias Kaehlcke, Guenter Roeck
On Fri, Feb 7, 2020 at 12:10 AM Sai Prakash Ranjan
<saiprakash.ranjan@codeaurora.org> wrote:
>
> Hi Rob,
>
> On 2020-02-07 00:08, Rob Herring wrote:
> > On Sat, Feb 01, 2020 at 08:59:49PM +0530, Sai Prakash Ranjan wrote:
> >> Add missing compatible for watchdog timer on QCS404,
> >> SC7180, SDM845 and SM8150 SoCs.
> >
> > That's not what the commit does. You are changing what's valid.
> >
> > One string was valid, now 2 are required.
> >
>
> Does this look good?
No. First of all, what's the base for the diff? It's not what you
originally had nor incremental on top of this patch.
Second, a value of 'qcom,kpss-timer' or 'qcom,kpss-wdt' or
'qcom,scss-timer' will fail validation because 2 clauses of 'oneOf'
will be true.
>
> diff --git a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> index 46d6aad5786a..3378244b67cd 100644
> --- a/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml
> @@ -14,19 +14,22 @@ allOf:
>
> properties:
> compatible:
> - items:
> + oneOf:
> - enum:
> - qcom,apss-wdt-qcs404
> - qcom,apss-wdt-sc7180
> - qcom,apss-wdt-sdm845
> - qcom,apss-wdt-sm8150
> - - qcom,kpss-timer
> - - qcom,kpss-wdt
> - qcom,kpss-wdt-apq8064
> - qcom,kpss-wdt-ipq4019
> - qcom,kpss-wdt-ipq8064
> - qcom,kpss-wdt-msm8960
> + - qcom,kpss-timer
> + - qcom,kpss-wdt
> - qcom,scss-timer
> + - const: qcom,kpss-timer
> + - const: qcom,kpss-wdt
> + - const: qcom,scss-timer
>
> reg:
> maxItems: 1
>
> Thanks,
> Sai
>
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a
> member
> of Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCHv2 2/2] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150
2020-02-11 18:24 ` Rob Herring
@ 2020-02-11 21:57 ` Sai Prakash Ranjan
0 siblings, 0 replies; 12+ messages in thread
From: Sai Prakash Ranjan @ 2020-02-11 21:57 UTC (permalink / raw)
To: Rob Herring
Cc: devicetree, devicetree-owner, linux-kernel, Douglas Anderson,
Stephen Boyd, Andy Gross,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
linux-arm-msm, Bjorn Andersson, Matthias Kaehlcke, Guenter Roeck
On 2020-02-11 23:54, Rob Herring wrote:
> On Fri, Feb 7, 2020 at 12:10 AM Sai Prakash Ranjan
> <saiprakash.ranjan@codeaurora.org> wrote:
>>
>> Hi Rob,
>>
>> On 2020-02-07 00:08, Rob Herring wrote:
>> > On Sat, Feb 01, 2020 at 08:59:49PM +0530, Sai Prakash Ranjan wrote:
>> >> Add missing compatible for watchdog timer on QCS404,
>> >> SC7180, SDM845 and SM8150 SoCs.
>> >
>> > That's not what the commit does. You are changing what's valid.
>> >
>> > One string was valid, now 2 are required.
>> >
>>
>> Does this look good?
>
> No. First of all, what's the base for the diff? It's not what you
> originally had nor incremental on top of this patch.
>
It was an incremental on top of this patch.
> Second, a value of 'qcom,kpss-timer' or 'qcom,kpss-wdt' or
> 'qcom,scss-timer' will fail validation because 2 clauses of 'oneOf'
> will be true.
>
I will just remove oneOf and add the missing compatibles to the enum.
Thanks,
Sai
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a
member
of Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-02-11 21:57 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-01 15:29 [PATCHv2 0/2] Convert QCOM watchdog timer bindings to YAML Sai Prakash Ranjan
2020-02-01 15:29 ` [PATCHv2 1/2] dt-bindings: watchdog: " Sai Prakash Ranjan
2020-02-02 4:41 ` Stephen Boyd
2020-02-02 4:43 ` Stephen Boyd
2020-02-02 5:07 ` Sai Prakash Ranjan
2020-02-06 18:39 ` Rob Herring
2020-02-01 15:29 ` [PATCHv2 2/2] dt-bindings: watchdog: Add compatible for QCS404, SC7180, SDM845, SM8150 Sai Prakash Ranjan
2020-02-02 4:41 ` Stephen Boyd
2020-02-06 18:38 ` Rob Herring
2020-02-07 6:10 ` Sai Prakash Ranjan
2020-02-11 18:24 ` Rob Herring
2020-02-11 21:57 ` Sai Prakash Ranjan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).