[v3] dt-bindings: arm: Convert Actions Semi bindings tojsonschema
diff mbox series

Message ID 20190517153223.7650-1-robh@kernel.org
State Under Review
Headers show
Series
  • [v3] dt-bindings: arm: Convert Actions Semi bindings tojsonschema
Related show

Checks

Context Check Description
robh/dt-meta-schema success
robh/checkpatch warning "total: 0 errors, 2 warnings, 46 lines checked"

Commit Message

Rob Herring May 17, 2019, 3:32 p.m. UTC
Convert Actions Semi SoC bindings to DT schema format using json-schema.

Cc: "Andreas Färber" <afaerber@suse.de>
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
v3:
- update MAINTAINERS

 .../devicetree/bindings/arm/actions.txt       | 56 -------------------
 .../devicetree/bindings/arm/actions.yaml      | 38 +++++++++++++
 MAINTAINERS                                   |  2 +-
 3 files changed, 39 insertions(+), 57 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/actions.txt
 create mode 100644 Documentation/devicetree/bindings/arm/actions.yaml

Comments

Rob Herring June 13, 2019, 10:44 p.m. UTC | #1
On Fri, May 17, 2019 at 10:32:23AM -0500, Rob Herring wrote:
> Convert Actions Semi SoC bindings to DT schema format using json-schema.
> 
> Cc: "Andreas Färber" <afaerber@suse.de>
> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> v3:
> - update MAINTAINERS
> 
>  .../devicetree/bindings/arm/actions.txt       | 56 -------------------
>  .../devicetree/bindings/arm/actions.yaml      | 38 +++++++++++++
>  MAINTAINERS                                   |  2 +-
>  3 files changed, 39 insertions(+), 57 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/arm/actions.txt
>  create mode 100644 Documentation/devicetree/bindings/arm/actions.yaml

Ping. Please apply or modify this how you'd prefer. I'm not going to 
keep respinning this.

Rob
Manivannan Sadhasivam June 14, 2019, 5:04 p.m. UTC | #2
On Thu, Jun 13, 2019 at 04:44:35PM -0600, Rob Herring wrote:
> On Fri, May 17, 2019 at 10:32:23AM -0500, Rob Herring wrote:
> > Convert Actions Semi SoC bindings to DT schema format using json-schema.
> > 
> > Cc: "Andreas Färber" <afaerber@suse.de>
> > Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> > Cc: Mark Rutland <mark.rutland@arm.com>
> > Cc: linux-arm-kernel@lists.infradead.org
> > Cc: devicetree@vger.kernel.org
> > Signed-off-by: Rob Herring <robh@kernel.org>
> > ---
> > v3:
> > - update MAINTAINERS
> > 
> >  .../devicetree/bindings/arm/actions.txt       | 56 -------------------
> >  .../devicetree/bindings/arm/actions.yaml      | 38 +++++++++++++
> >  MAINTAINERS                                   |  2 +-
> >  3 files changed, 39 insertions(+), 57 deletions(-)
> >  delete mode 100644 Documentation/devicetree/bindings/arm/actions.txt
> >  create mode 100644 Documentation/devicetree/bindings/arm/actions.yaml
> 
> Ping. Please apply or modify this how you'd prefer. I'm not going to 
> keep respinning this.
> 

Sorry for that Rob.

Andreas, are you going to take this patch? Else I'll pick it up (If you
want me to do the PR for next cycle)

Thanks,
Mani

> Rob
Andreas Färber June 14, 2019, 5:07 p.m. UTC | #3
Am 14.06.19 um 19:04 schrieb Manivannan Sadhasivam:
> On Thu, Jun 13, 2019 at 04:44:35PM -0600, Rob Herring wrote:
>> On Fri, May 17, 2019 at 10:32:23AM -0500, Rob Herring wrote:
>>> Convert Actions Semi SoC bindings to DT schema format using json-schema.
>>>
>>> Cc: "Andreas Färber" <afaerber@suse.de>
>>> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
>>> Cc: Mark Rutland <mark.rutland@arm.com>
>>> Cc: linux-arm-kernel@lists.infradead.org
>>> Cc: devicetree@vger.kernel.org
>>> Signed-off-by: Rob Herring <robh@kernel.org>
>>> ---
>>> v3:
>>> - update MAINTAINERS
>>>
>>>  .../devicetree/bindings/arm/actions.txt       | 56 -------------------
>>>  .../devicetree/bindings/arm/actions.yaml      | 38 +++++++++++++
>>>  MAINTAINERS                                   |  2 +-
>>>  3 files changed, 39 insertions(+), 57 deletions(-)
>>>  delete mode 100644 Documentation/devicetree/bindings/arm/actions.txt
>>>  create mode 100644 Documentation/devicetree/bindings/arm/actions.yaml
>>
>> Ping. Please apply or modify this how you'd prefer. I'm not going to 
>> keep respinning this.
>>
> 
> Sorry for that Rob.

Well, it was simply not clear whether we were supposed to or not. :)

> Andreas, are you going to take this patch? Else I'll pick it up (If you
> want me to do the PR for next cycle)

I had checked that all previous changes to the .txt file were by myself,
so I would prefer if we not license it under GPLv2-only but under the
same dual-license (MIT/GPLv2+) as the DTs. That modification would need
Rob's approval then.

Regards,
Andreas
Rob Herring June 14, 2019, 7:33 p.m. UTC | #4
On Fri, Jun 14, 2019 at 11:07 AM Andreas Färber <afaerber@suse.de> wrote:
>
> Am 14.06.19 um 19:04 schrieb Manivannan Sadhasivam:
> > On Thu, Jun 13, 2019 at 04:44:35PM -0600, Rob Herring wrote:
> >> On Fri, May 17, 2019 at 10:32:23AM -0500, Rob Herring wrote:
> >>> Convert Actions Semi SoC bindings to DT schema format using json-schema.
> >>>
> >>> Cc: "Andreas Färber" <afaerber@suse.de>
> >>> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> >>> Cc: Mark Rutland <mark.rutland@arm.com>
> >>> Cc: linux-arm-kernel@lists.infradead.org
> >>> Cc: devicetree@vger.kernel.org
> >>> Signed-off-by: Rob Herring <robh@kernel.org>
> >>> ---
> >>> v3:
> >>> - update MAINTAINERS
> >>>
> >>>  .../devicetree/bindings/arm/actions.txt       | 56 -------------------
> >>>  .../devicetree/bindings/arm/actions.yaml      | 38 +++++++++++++
> >>>  MAINTAINERS                                   |  2 +-
> >>>  3 files changed, 39 insertions(+), 57 deletions(-)
> >>>  delete mode 100644 Documentation/devicetree/bindings/arm/actions.txt
> >>>  create mode 100644 Documentation/devicetree/bindings/arm/actions.yaml
> >>
> >> Ping. Please apply or modify this how you'd prefer. I'm not going to
> >> keep respinning this.
> >>
> >
> > Sorry for that Rob.
>
> Well, it was simply not clear whether we were supposed to or not. :)

I thought 'To' you and a single patch should be clear enough.

> > Andreas, are you going to take this patch? Else I'll pick it up (If you
> > want me to do the PR for next cycle)
>
> I had checked that all previous changes to the .txt file were by myself,
> so I would prefer if we not license it under GPLv2-only but under the
> same dual-license (MIT/GPLv2+) as the DTs. That modification would need
> Rob's approval then.

That's fine and dual license is preferred. Can you adjust that when
applying. Note that the preference for schema is (GPL-2.0 OR
BSD-2-Clause), but MIT/GPLv2+ is fine by me.

Rob

Patch
diff mbox series

diff --git a/Documentation/devicetree/bindings/arm/actions.txt b/Documentation/devicetree/bindings/arm/actions.txt
deleted file mode 100644
index d54f33c4e0da..000000000000
--- a/Documentation/devicetree/bindings/arm/actions.txt
+++ /dev/null
@@ -1,56 +0,0 @@ 
-Actions Semi platforms device tree bindings
--------------------------------------------
-
-
-S500 SoC
-========
-
-Required root node properties:
-
- - compatible :  must contain "actions,s500"
-
-
-Modules:
-
-Root node property compatible must contain, depending on module:
-
- - LeMaker Guitar: "lemaker,guitar"
-
-
-Boards:
-
-Root node property compatible must contain, depending on board:
-
- - Allo.com Sparky: "allo,sparky"
- - Cubietech CubieBoard6: "cubietech,cubieboard6"
- - LeMaker Guitar Base Board rev. B: "lemaker,guitar-bb-rev-b", "lemaker,guitar"
-
-
-S700 SoC
-========
-
-Required root node properties:
-
-- compatible :  must contain "actions,s700"
-
-
-Boards:
-
-Root node property compatible must contain, depending on board:
-
- - Cubietech CubieBoard7: "cubietech,cubieboard7"
-
-
-S900 SoC
-========
-
-Required root node properties:
-
-- compatible :  must contain "actions,s900"
-
-
-Boards:
-
-Root node property compatible must contain, depending on board:
-
- - uCRobotics Bubblegum-96: "ucrobotics,bubblegum-96"
diff --git a/Documentation/devicetree/bindings/arm/actions.yaml b/Documentation/devicetree/bindings/arm/actions.yaml
new file mode 100644
index 000000000000..60abd371e474
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/actions.yaml
@@ -0,0 +1,38 @@ 
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/actions.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Actions Semi platforms device tree bindings
+
+maintainers:
+  - Andreas Färber <afaerber@suse.de>
+  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+
+properties:
+  compatible:
+    oneOf:
+      # The Actions Semi S500 is a quad-core ARM Cortex-A9 SoC.
+      - items:
+          - enum:
+              - allo,sparky # Allo.com Sparky
+              - cubietech,cubieboard6 # Cubietech CubieBoard6
+          - const: actions,s500
+      - items:
+          - enum:
+              - lemaker,guitar-bb-rev-b # LeMaker Guitar Base Board rev. B
+          - const: lemaker,guitar
+          - const: actions,s500
+
+      # The Actions Semi S700 is a quad-core ARM Cortex-A53 SoC.
+      - items:
+          - enum:
+              - cubietech,cubieboard7 # Cubietech CubieBoard7
+          - const: actions,s700
+
+      # The Actions Semi S900 is a quad-core ARM Cortex-A53 SoC.
+      - items:
+          - enum:
+              - ucrobotics,bubblegum-96 # uCRobotics Bubblegum-96
+          - const: actions,s900
diff --git a/MAINTAINERS b/MAINTAINERS
index 005902ea1450..be8c3564804c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1338,7 +1338,7 @@  F:	drivers/pinctrl/actions/*
 F:	drivers/soc/actions/
 F:	include/dt-bindings/power/owl-*
 F:	include/linux/soc/actions/
-F:	Documentation/devicetree/bindings/arm/actions.txt
+F:	Documentation/devicetree/bindings/arm/actions.yaml
 F:	Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
 F:	Documentation/devicetree/bindings/dma/owl-dma.txt
 F:	Documentation/devicetree/bindings/i2c/i2c-owl.txt