[PATCH] dt-bindings: gpu: Convert aspeed-gfx bindings to yaml

[PATCH] dt-bindings: gpu: Convert aspeed-gfx bindings to yaml

[Joel Stanley]

Convert the bindings to yaml and add the ast2600 compatible string.

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 .../devicetree/bindings/gpu/aspeed,gfx.yaml   | 69 +++++++++++++++++++
 .../devicetree/bindings/gpu/aspeed-gfx.txt    | 41 -----------
 2 files changed, 69 insertions(+), 41 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/gpu/aspeed,gfx.yaml
 delete mode 100644 Documentation/devicetree/bindings/gpu/aspeed-gfx.txt

diff --git a/Documentation/devicetree/bindings/gpu/aspeed,gfx.yaml b/Documentation/devicetree/bindings/gpu/aspeed,gfx.yaml
new file mode 100644
index 000000000000..8ddc4fa6e8e4
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpu/aspeed,gfx.yaml
@@ -0,0 +1,69 @@
+# SPDX-License-Identifier: GPL-2.0-only
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/gpu/aspeed,gfx.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: ASPEED GFX display device
+
+maintainers:
+  - Joel Stanley <joel@jms.id.au>
+
+properties:
+  compatible:
+    items:
+      - enum:
+          - aspeed,ast2400-gfx
+          - aspeed,ast2500-gfx
+          - aspeed,ast2600-gfx
+      - const: syscon
+
+  reg:
+    minItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+
+  resets:
+    maxItems: 1
+
+  memory-region: true
+
+  syscon: true
+
+  reg-io-width: true
+
+required:
+  - reg
+  - compatible
+  - interrupts
+  - clocks
+  - resets
+  - memory-region
+  - syscon
+
+additionalProperties: false
+
+examples:
+  - |
+   #include <dt-bindings/clock/aspeed-clock.h>
+   gfx: display@1e6e6000 {
+       compatible = "aspeed,ast2500-gfx", "syscon";
+       reg = <0x1e6e6000 0x1000>;
+       reg-io-width = <4>;
+       clocks = <&syscon ASPEED_CLK_GATE_D1CLK>;
+       resets = <&syscon ASPEED_RESET_CRT1>;
+       interrupts = <0x19>;
+       syscon = <&syscon>;
+       memory-region = <&gfx_memory>;
+   };
+
+   gfx_memory: framebuffer {
+       size = <0x01000000>;
+       alignment = <0x01000000>;
+       compatible = "shared-dma-pool";
+       reusable;
+   };
diff --git a/Documentation/devicetree/bindings/gpu/aspeed-gfx.txt b/Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
deleted file mode 100644
index 958bdf962339..000000000000
--- a/Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Device tree configuration for the GFX display device on the ASPEED SoCs
-
-Required properties:
-  - compatible
-    * Must be one of the following:
-      + aspeed,ast2500-gfx
-      + aspeed,ast2400-gfx
-    * In addition, the ASPEED pinctrl bindings require the 'syscon' property to
-      be present
-
-  - reg: Physical base address and length of the GFX registers
-
-  - interrupts: interrupt number for the GFX device
-
-  - clocks: clock number used to generate the pixel clock
-
-  - resets: reset line that must be released to use the GFX device
-
-  - memory-region:
-    Phandle to a memory region to allocate from, as defined in
-    Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt
-
-
-Example:
-
-gfx: display@1e6e6000 {
-	compatible = "aspeed,ast2500-gfx", "syscon";
-	reg = <0x1e6e6000 0x1000>;
-	reg-io-width = <4>;
-	clocks = <&syscon ASPEED_CLK_GATE_D1CLK>;
-	resets = <&syscon ASPEED_RESET_CRT1>;
-	interrupts = <0x19>;
-	memory-region = <&gfx_memory>;
-};
-
-gfx_memory: framebuffer {
-	size = <0x01000000>;
-	alignment = <0x01000000>;
-	compatible = "shared-dma-pool";
-	reusable;
-};
-- 
2.34.1

Re: [PATCH] dt-bindings: gpu: Convert aspeed-gfx bindings to yaml

[Rob Herring]

On Wed, Mar 02, 2022 at 03:40:56PM +1030, Joel Stanley wrote:
> Convert the bindings to yaml and add the ast2600 compatible string.
> 
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
>  .../devicetree/bindings/gpu/aspeed,gfx.yaml   | 69 +++++++++++++++++++
>  .../devicetree/bindings/gpu/aspeed-gfx.txt    | 41 -----------
>  2 files changed, 69 insertions(+), 41 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/gpu/aspeed,gfx.yaml
>  delete mode 100644 Documentation/devicetree/bindings/gpu/aspeed-gfx.txt

Applied, thanks.

Re: [PATCH] dt-bindings: gpu: Convert aspeed-gfx bindings to yaml

[Rob Herring]

On Wed, Mar 2, 2022 at 12:01 PM Rob Herring <robh@kernel.org> wrote:
>
> On Wed, Mar 02, 2022 at 03:40:56PM +1030, Joel Stanley wrote:
> > Convert the bindings to yaml and add the ast2600 compatible string.
> >
> > Signed-off-by: Joel Stanley <joel@jms.id.au>
> > ---
> >  .../devicetree/bindings/gpu/aspeed,gfx.yaml   | 69 +++++++++++++++++++
> >  .../devicetree/bindings/gpu/aspeed-gfx.txt    | 41 -----------
> >  2 files changed, 69 insertions(+), 41 deletions(-)
> >  create mode 100644 Documentation/devicetree/bindings/gpu/aspeed,gfx.yaml
> >  delete mode 100644 Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
>
> Applied, thanks.

Uggg, now dropped...

What's Documentation/devicetree/bindings/mfd/aspeed-gfx.txt and also
the example in Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml?
Please sort those out.

Rob

Re: [PATCH] dt-bindings: gpu: Convert aspeed-gfx bindings to yaml

[Joel Stanley]

On Thu, 3 Mar 2022 at 19:34, Rob Herring <robh@kernel.org> wrote:
>
> On Wed, Mar 2, 2022 at 12:01 PM Rob Herring <robh@kernel.org> wrote:
> >
> > On Wed, Mar 02, 2022 at 03:40:56PM +1030, Joel Stanley wrote:
> > > Convert the bindings to yaml and add the ast2600 compatible string.
> > >
> > > Signed-off-by: Joel Stanley <joel@jms.id.au>
> > > ---
> > >  .../devicetree/bindings/gpu/aspeed,gfx.yaml   | 69 +++++++++++++++++++
> > >  .../devicetree/bindings/gpu/aspeed-gfx.txt    | 41 -----------
> > >  2 files changed, 69 insertions(+), 41 deletions(-)
> > >  create mode 100644 Documentation/devicetree/bindings/gpu/aspeed,gfx.yaml
> > >  delete mode 100644 Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
> >
> > Applied, thanks.
>
> Uggg, now dropped...
>
> What's Documentation/devicetree/bindings/mfd/aspeed-gfx.txt and also
> the example in Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml?
> Please sort those out.

I think the aspeed-gfx.txt can be deleted. And the example in the
pinctrl bindings needs to be updated with the required properties.

Andrew, can you clarify what's going on with those other files?

Re: [PATCH] dt-bindings: gpu: Convert aspeed-gfx bindings to yaml

[Andrew Jeffery]

On Fri, 4 Mar 2022, at 08:05, Joel Stanley wrote:
> On Thu, 3 Mar 2022 at 19:34, Rob Herring <robh@kernel.org> wrote:
>>
>> On Wed, Mar 2, 2022 at 12:01 PM Rob Herring <robh@kernel.org> wrote:
>> >
>> > On Wed, Mar 02, 2022 at 03:40:56PM +1030, Joel Stanley wrote:
>> > > Convert the bindings to yaml and add the ast2600 compatible string.
>> > >
>> > > Signed-off-by: Joel Stanley <joel@jms.id.au>
>> > > ---
>> > >  .../devicetree/bindings/gpu/aspeed,gfx.yaml   | 69 +++++++++++++++++++
>> > >  .../devicetree/bindings/gpu/aspeed-gfx.txt    | 41 -----------
>> > >  2 files changed, 69 insertions(+), 41 deletions(-)
>> > >  create mode 100644 Documentation/devicetree/bindings/gpu/aspeed,gfx.yaml
>> > >  delete mode 100644 Documentation/devicetree/bindings/gpu/aspeed-gfx.txt
>> >
>> > Applied, thanks.
>>
>> Uggg, now dropped...
>>
>> What's Documentation/devicetree/bindings/mfd/aspeed-gfx.txt and also
>> the example in Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml?
>> Please sort those out.
>
> I think the aspeed-gfx.txt can be deleted. And the example in the
> pinctrl bindings needs to be updated with the required properties.
>
> Andrew, can you clarify what's going on with those other files?

Looks like you'll just need to paste your example from 
aspeed,gfx.yaml into the pinctrl yamls to replace the existing gfx 
nodes.

Andrew