[PATCH 0/1] clocksource: sp804: add support for Hisilicon sp804 timer

[PATCH 0/1] clocksource: sp804: add support for Hisilicon sp804 timer

[Zhen Lei]

This patch is one of the series:
https://patchwork.ozlabs.org/project/devicetree-bindings/cover/20200918132237.3552-1-thunder.leizhen@huawei.com/

All are applied by Daniel Lezcano, except this one.

This patch is come from:
https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20200918132237.3552-10-thunder.leizhen@huawei.com/

But one modification was added:
1. "arm,sp804.yaml" contains "select" property, it requires compatible must
   contain "arm,sp804", so the nodes with compatible "hisilicon,sp804" are
   skipped and are not checked by "arm,sp804.yaml". Add "oneOf" into "select"
   to require one of them.

 select:
   properties:
     compatible:
       contains:
-        const: arm,sp804
+        oneOf:
+          - const: arm,sp804
+          - const: hisilicon,sp804
   required:
     - compatible


Zhen Lei (1):
  dt-bindings: sp804: add support for Hisilicon sp804 timer

 Documentation/devicetree/bindings/timer/arm,sp804.yaml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

-- 
1.8.3

[PATCH 1/1] dt-bindings: sp804: add support for Hisilicon sp804 timer

[Zhen Lei]

Some Hisilicon SoCs, such as Hi1212, use the Hisilicon extended sp804
timer.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
 Documentation/devicetree/bindings/timer/arm,sp804.yaml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/timer/arm,sp804.yaml b/Documentation/devicetree/bindings/timer/arm,sp804.yaml
index ba0945cf799ee0b..e35d3053250a557 100644
--- a/Documentation/devicetree/bindings/timer/arm,sp804.yaml
+++ b/Documentation/devicetree/bindings/timer/arm,sp804.yaml
@@ -15,19 +15,26 @@ description: |+
   free-running mode. The input clock is shared, but can be gated and prescaled
   independently for each timer.
 
+  There is a viriant of Arm SP804: Hisilicon 64-bit SP804 timer. Some Hisilicon
+  SoCs, such as Hi1212, should use the dedicated compatible: "hisilicon,sp804".
+
 # Need a custom select here or 'arm,primecell' will match on lots of nodes
 select:
   properties:
     compatible:
       contains:
-        const: arm,sp804
+        oneOf:
+          - const: arm,sp804
+          - const: hisilicon,sp804
   required:
     - compatible
 
 properties:
   compatible:
     items:
-      - const: arm,sp804
+      - enum:
+        - arm,sp804
+        - hisilicon,sp804
       - const: arm,primecell
 
   interrupts:
-- 
1.8.3

Re: [PATCH 1/1] dt-bindings: sp804: add support for Hisilicon sp804 timer

[Rob Herring]

On Sat, 19 Sep 2020 20:44:12 +0800, Zhen Lei wrote:
> Some Hisilicon SoCs, such as Hi1212, use the Hisilicon extended sp804
> timer.
> 
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
> ---
>  Documentation/devicetree/bindings/timer/arm,sp804.yaml | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 

Applied, thanks!