Skip to contentSkip to conversation

soc: amlogic: switch bindings to yaml and adjust some dtbs's

PATCH Applied Heiner Kallweit 8 participants 46 messages Jan 23, 2023 – Jun 22, 2023

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

cover soc: amlogic: switch bindings to yaml and adjust some dtbs's

At first adjust some existing dtbs's so that they pass dtbs_check after switching bindings to yaml.

Then switch further Amlogic Meson bindings to yaml. Tested with make targets dt_binding_check and dtbs_check.

Heiner Kallweit (8):
arm64: dts: meson-gx: Remove invalid pwm compatible
arm64: dts: amlogic: Fix non-compliant SD/SDIO node names
arm64: dts: meson-gx: Set only one compatible string for mmc
arm64: dts: amlogic: Remove invalid compatible string
amlogic,meson-gpio-intc
dt-bindings: rtc: Add Amlogic Meson vrtc controller binding
dt-bindings: pwm: Add Amlogic Meson PWM binding
dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt
controller binding
dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding

 .../amlogic,meson-gpio-intc.txt               |  38 ------
 .../amlogic,meson-gpio-intc.yaml              |  72 +++++++++++
 .../pinctrl/amlogic,meson-pinctrl.yaml        | 121 ++++++++++++++++++
 .../bindings/pinctrl/meson,pinctrl.txt        |  94 --------------
 .../devicetree/bindings/pwm/pwm-amlogic.yaml  |  61 +++++++++
 .../devicetree/bindings/pwm/pwm-meson.txt     |  29 -----
 .../bindings/rtc/amlogic,meson-vrtc.yaml      |  50 ++++++++
 .../bindings/rtc/rtc-meson-vrtc.txt           |  22 ----
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi    |   5 +-
 .../boot/dts/amlogic/meson-g12-common.dtsi    |   7 +-
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi     |  15 +--
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi   |   3 +-
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi    |   3 +-
 arch/arm64/boot/dts/amlogic/meson-s4.dtsi     |   3 +-
 arch/arm64/boot/dts/amlogic/meson-sm1.dtsi    |   3 +-
 15 files changed, 320 insertions(+), 206 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml
 create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
 delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt
 create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml
 delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt
Signature · 1 line
2.39.1
#1 lore raw

PATCH 1/8 arm64: dts: meson-gx: Remove invalid pwm compatible

amlogic,meson-gx-pwm isn't a valid compatible string, so remove it. See drivers/pwm/pwm-meson.c.

---
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +4 -4
index a79a35e84..75d35dcfe 100644
@@ -328,14 +328,14 @@ i2c_A: i2c@8500 {
 			};
 
 			pwm_ab: pwm@8550 {
-				compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";
+				compatible = "amlogic,meson-gxbb-pwm";
 				reg = <0x0 0x08550 0x0 0x10>;
 				#pwm-cells = <3>;
 				status = "disabled";
 			};
 
 			pwm_cd: pwm@8650 {
-				compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";
+				compatible = "amlogic,meson-gxbb-pwm";
 				reg = <0x0 0x08650 0x0 0x10>;
 				#pwm-cells = <3>;
 				status = "disabled";
@@ -350,7 +350,7 @@ saradc: adc@8680 {
 			};
 
 			pwm_ef: pwm@86c0 {
-				compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";
+				compatible = "amlogic,meson-gxbb-pwm";
 				reg = <0x0 0x086c0 0x0 0x10>;
 				#pwm-cells = <3>;
 				status = "disabled";
@@ -497,7 +497,7 @@ i2c_AO: i2c@500 {
 			};
 
 			pwm_AO_ab: pwm@550 {
-				compatible = "amlogic,meson-gx-ao-pwm", "amlogic,meson-gxbb-ao-pwm";
+				compatible = "amlogic,meson-gxbb-ao-pwm";
 				reg = <0x0 0x00550 0x0 0x10>;
 				#pwm-cells = <3>;
 				status = "disabled";
Signature · 1 line
2.39.1
#2 lore raw

PATCH 2/8 arm64: dts: amlogic: Fix non-compliant SD/SDIO node names

In reply to Heiner Kallweit

mmc-controller.yaml defines "^mmc(@.*)?$" as node name pattern. In preparation of adding schema-based validation fix the node name in two affected files.

---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi        | 2 +-
 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +1 -1
index 1648e67af..ed895fb32 100644
@@ -1883,7 +1883,7 @@ apb: bus@ffe00000 {
 			#size-cells = <2>;
 			ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x200000>;
 
-			sd_emmc_b: sd@5000 {
+			sd_emmc_b: mmc@5000 {
 				compatible = "amlogic,meson-axg-mmc";
 				reg = <0x0 0x5000 0x0 0x800>;
 				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +2 -2
index 1a931d5c2..80d82f739 100644
@@ -2321,7 +2321,7 @@ uart_A: serial@24000 {
 			};
 		};
 
-		sd_emmc_a: sd@ffe03000 {
+		sd_emmc_a: mmc@ffe03000 {
 			compatible = "amlogic,meson-axg-mmc";
 			reg = <0x0 0xffe03000 0x0 0x800>;
 			interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>;
@@ -2333,7 +2333,7 @@ sd_emmc_a: sd@ffe03000 {
 			resets = <&reset RESET_SD_EMMC_A>;
 		};
 
-		sd_emmc_b: sd@ffe05000 {
+		sd_emmc_b: mmc@ffe05000 {
 			compatible = "amlogic,meson-axg-mmc";
 			reg = <0x0 0xffe05000 0x0 0x800>;
 			interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;
Signature · 1 line
2.39.1
maintainer Reviewed-by on v1 2/8
#3 lore raw

Re: [PATCH 2/8] arm64: dts: amlogic: Fix non-compliant SD/SDIO node names

Le 23/01/2023 à 22:24, Heiner Kallweit a écrit :

Quoted 37 lines

mmc-controller.yaml defines "^mmc(@.*)?$" as node name pattern. In preparation of adding schema-based validation fix the node name in two affected files.

---
  arch/arm64/boot/dts/amlogic/meson-axg.dtsi        | 2 +-
  arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +1 -1
index 1648e67af..ed895fb32 100644
@@ -1883,7 +1883,7 @@ apb: bus@ffe00000 {
  			#size-cells = <2>;
  			ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x200000>;
 
-			sd_emmc_b: sd@5000 {
+			sd_emmc_b: mmc@5000 {
  				compatible = "amlogic,meson-axg-mmc";
  				reg = <0x0 0x5000 0x0 0x800>;
  				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +1 -1
index 1a931d5c2..80d82f739 100644
@@ -2321,7 +2321,7 @@ uart_A: serial@24000 {
  			};
  		};
 
-		sd_emmc_a: sd@ffe03000 {
+		sd_emmc_a: mmc@ffe03000 {
  			compatible = "amlogic,meson-axg-mmc";
  			reg = <0x0 0xffe03000 0x0 0x800>;
  			interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>;

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi sd_emmc_a: sd@ffe03000 { · line 2339

Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +1 -1
@@ -2333,7 +2333,7 @@ sd_emmc_a: sd@ffe03000 {
  			resets = <&reset RESET_SD_EMMC_A>;
  		};
 
-		sd_emmc_b: sd@ffe05000 {
+		sd_emmc_b: mmc@ffe05000 {
  			compatible = "amlogic,meson-axg-mmc";
  			reg = <0x0 0xffe05000 0x0 0x800>;
  			interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;
#4 lore raw

PATCH 3/8 arm64: dts: meson-gx: Set only one compatible string for mmc

In reply to Heiner Kallweit

In preparation of schema-based validation use one compatible string only. Both are aliases anyway.

---
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +3 -3
index 75d35dcfe..c0a311da4 100644
@@ -601,21 +601,21 @@ apb: apb@d0000000 {
 			ranges = <0x0 0x0 0x0 0xd0000000 0x0 0x200000>;
 
 			sd_emmc_a: mmc@70000 {
-				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
+				compatible = "amlogic,meson-gx-mmc";
 				reg = <0x0 0x70000 0x0 0x800>;
 				interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;
 				status = "disabled";
 			};
 
 			sd_emmc_b: mmc@72000 {
-				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
+				compatible = "amlogic,meson-gx-mmc";
 				reg = <0x0 0x72000 0x0 0x800>;
 				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
 				status = "disabled";
 			};
 
 			sd_emmc_c: mmc@74000 {
-				compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
+				compatible = "amlogic,meson-gx-mmc";
 				reg = <0x0 0x74000 0x0 0x800>;
 				interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
 				status = "disabled";
Signature · 1 line
2.39.1
#5 lore raw

PATCH 4/8 arm64: dts: amlogic: Remove invalid compatible string amlogic,meson-gpio-intc

In reply to Heiner Kallweit

Remove invalid compatible string amlogic,meson-gpio-intc. See drivers/irqchip/irq-meson-gpio.c

---
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi        | 3 +--
 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 3 +--
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi         | 1 -
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi       | 3 +--
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi        | 3 +--
 arch/arm64/boot/dts/amlogic/meson-s4.dtsi         | 3 +--
 arch/arm64/boot/dts/amlogic/meson-sm1.dtsi        | 3 +--
 7 files changed, 6 insertions(+), 13 deletions(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +1 -2
index ed895fb32..4ee4d0089 100644
@@ -1761,8 +1761,7 @@ reset: reset-controller@1004 {
 			};
 
 			gpio_intc: interrupt-controller@f080 {
-				compatible = "amlogic,meson-axg-gpio-intc",
-					     "amlogic,meson-gpio-intc";
+				compatible = "amlogic,meson-axg-gpio-intc";
 				reg = <0x0 0xf080 0x0 0x10>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +1 -2
index 80d82f739..9bf81e51e 100644
@@ -2179,8 +2179,7 @@ reset: reset-controller@1004 {
 			};
 
 			gpio_intc: interrupt-controller@f080 {
-				compatible = "amlogic,meson-g12a-gpio-intc",
-					     "amlogic,meson-gpio-intc";
+				compatible = "amlogic,meson-g12a-gpio-intc";
 				reg = <0x0 0xf080 0x0 0x10>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +0 -1
index c0a311da4..86865daf7 100644
@@ -278,7 +278,6 @@ cbus: bus@c1100000 {
 			ranges = <0x0 0x0 0x0 0xc1100000 0x0 0x100000>;
 
 			gpio_intc: interrupt-controller@9880 {
-				compatible = "amlogic,meson-gpio-intc";
 				reg = <0x0 0x9880 0x0 0x10>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +1 -2
index 923d2d8bb..8d8fdad6a 100644
@@ -300,8 +300,7 @@ &ethmac {
 };
 
 &gpio_intc {
-	compatible = "amlogic,meson-gpio-intc",
-		     "amlogic,meson-gxbb-gpio-intc";
+	compatible = "amlogic,meson-gxbb-gpio-intc";
 	status = "okay";
 };
 
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +1 -2
index 04e9d0f1b..5a8f47313 100644
@@ -312,8 +312,7 @@ &clkc_AO {
 };
 
 &gpio_intc {
-	compatible = "amlogic,meson-gpio-intc",
-		     "amlogic,meson-gxl-gpio-intc";
+	compatible = "amlogic,meson-gxl-gpio-intc";
 	status = "okay";
 };
 
arch/arm64/boot/dts/amlogic/meson-s4.dtsi +1 -2
index ad50cba42..6b74a6995 100644
@@ -109,8 +109,7 @@ gpio: bank@4000 {
 			};
 
 			gpio_intc: interrupt-controller@4080 {
-				compatible = "amlogic,meson-s4-gpio-intc",
-					     "amlogic,meson-gpio-intc";
+				compatible = "amlogic,meson-s4-gpio-intc";
 				reg = <0x0 0x4080 0x0 0x20>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +1 -2
index 617d322af..733a5d578 100644
@@ -513,8 +513,7 @@ &ethmac {
 };
 
 &gpio_intc {
-	compatible = "amlogic,meson-sm1-gpio-intc",
-		     "amlogic,meson-gpio-intc";
+	compatible = "amlogic,meson-sm1-gpio-intc";
 };
 
 &pcie {
Signature · 1 line
2.39.1
#6 lore raw

PATCH 5/8 dt-bindings: rtc: Add Amlogic Meson vrtc controller binding

In reply to Heiner Kallweit

Add Amlogic Meson vrtc controller binding. Tested with make targets dt_binding_check and dtbs_check.

---
 .../bindings/rtc/amlogic,meson-vrtc.yaml      | 50 +++++++++++++++++++
 .../bindings/rtc/rtc-meson-vrtc.txt           | 22 --------
 2 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml
 delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt
Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml new file +50 -0
new file mode 100644
index 000000000..26a70b3ce
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/rtc/amlogic,meson-vrtc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Virtual RTC (VRTC)
+
+maintainers:
+  - Neil Armstrong <[email protected]>
+
+description: |
+  This is a Linux interface to an RTC managed by firmware, hence it's
+  virtual from a Linux perspective.  The interface is 1 register where
+  an alarm time (in seconds) is to be written.
+  The alarm register is a simple scratch register shared between the
+  application processors (AP) and the secure co-processor (SCP.)  When
+  the AP suspends, the SCP will use the value of this register to
+  program an always-on timer before going sleep. When the timer expires,
+  the SCP will wake up and will then wake the AP.
+
+allOf:
+  - $ref: rtc.yaml#
+
+properties:
+  compatible:
+    enum:
+      - amlogic,meson-vrtc
+
+  reg:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    bus@ff800000 {
+      reg = <0x0 0xff800000 0x0 0x100000>;
+      #address-cells = <2>;
+      #size-cells = <2>;
+
+      rtc@a8 {
+        compatible = "amlogic,meson-vrtc";
+        reg = <0x0 0x000a8 0x0 0x4>;
+      };
+    };
Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt deleted +0 -22
deleted file mode 100644
index c014f54a9..000000000
@@ -1,22 +0,0 @@
-* Amlogic Virtual RTC (VRTC)
-
-This is a Linux interface to an RTC managed by firmware, hence it's
-virtual from a Linux perspective.  The interface is 1 register where
-an alarm time (in seconds) is to be written.
-
-Required properties:
-- compatible: should be "amlogic,meson-vrtc"
-- reg: physical address for the alarm register
-
-The alarm register is a simple scratch register shared between the
-application processors (AP) and the secure co-processor (SCP.)  When
-the AP suspends, the SCP will use the value of this register to
-program an always-on timer before going sleep. When the timer expires,
-the SCP will wake up and will then wake the AP.
-
-Example:
-
-	vrtc: rtc@0a8 {
-		compatible = "amlogic,meson-vrtc";
-		reg = <0x0 0x000a8 0x0 0x4>;
-	};
Signature · 1 line
2.39.1
maintainer
#7 lore raw

Re: [PATCH 5/8] dt-bindings: rtc: Add Amlogic Meson vrtc controller binding

Quoted 1 line · Heiner Kallweit

Add Amlogic Meson vrtc controller binding.

You are not adding, you are converting.

Quoted 1 line

Tested with make targets dt_binding_check and dtbs_check.

That's assumed...

Quoted 53 lines
---
 .../bindings/rtc/amlogic,meson-vrtc.yaml      | 50 +++++++++++++++++++
 .../bindings/rtc/rtc-meson-vrtc.txt           | 22 --------
 2 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml
 delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt
Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml new file +38 -0
new file mode 100644
index 000000000..26a70b3ce
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/rtc/amlogic,meson-vrtc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Virtual RTC (VRTC)
+
+maintainers:
+  - Neil Armstrong <[email protected]>
+
+description: |
+  This is a Linux interface to an RTC managed by firmware, hence it's
+  virtual from a Linux perspective.  The interface is 1 register where
+  an alarm time (in seconds) is to be written.
+  The alarm register is a simple scratch register shared between the
+  application processors (AP) and the secure co-processor (SCP.)  When
+  the AP suspends, the SCP will use the value of this register to
+  program an always-on timer before going sleep. When the timer expires,
+  the SCP will wake up and will then wake the AP.
+
+allOf:
+  - $ref: rtc.yaml#
+
+properties:
+  compatible:
+    enum:
+      - amlogic,meson-vrtc
+
+  reg:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+

Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml line 48

Quoted 10 lines
Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml new file +10 -0
+examples:
+  - |
+    bus@ff800000 {
+      reg = <0x0 0xff800000 0x0 0x100000>;
+      #address-cells = <2>;
+      #size-cells = <2>;
+
+      rtc@a8 {
+        compatible = "amlogic,meson-vrtc";
+        reg = <0x0 0x000a8 0x0 0x4>;

Just use 1 address/size cell here and then you don't need the bus node (which has an error in it (no ranges)).

Rob

#8 lore raw

PATCH 6/8 dt-bindings: pwm: Add Amlogic Meson PWM binding

In reply to Heiner Kallweit

Add Amlogic Meson PWM binding.
Tested with make targets dt_binding_check and dtbs_check.

---
 .../devicetree/bindings/pwm/pwm-amlogic.yaml  | 61 +++++++++++++++++++
 .../devicetree/bindings/pwm/pwm-meson.txt     | 29 ---------
 2 files changed, 61 insertions(+), 29 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
 delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +61 -0
new file mode 100644
index 000000000..443ff4e5b
@@ -0,0 +1,61 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pwm/pwm-amlogic.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic PWM
+
+maintainers:
+  - Heiner Kallweit <[email protected]>
+
+allOf:
+  - $ref: pwm.yaml#
+
+properties:
+  compatible:
+    enum:
+      - amlogic,meson8b-pwm
+      - amlogic,meson-gxbb-pwm
+      - amlogic,meson-gxbb-ao-pwm
+      - amlogic,meson-axg-ee-pwm
+      - amlogic,meson-axg-ao-pwm
+      - amlogic,meson-g12a-ee-pwm
+      - amlogic,meson-g12a-ao-pwm-ab
+      - amlogic,meson-g12a-ao-pwm-cd
+      - amlogic,meson-s4-pwm
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    $ref: /schemas/types.yaml#/definitions/phandle-array
+
+  clock-names:
+    minItems: 1
+    maxItems: 2
+
+  "#pwm-cells":
+    const: 3
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    apb@fe000000 {
+      reg = <0x0 0xfe000000 0x0 0x480000>;
+      #address-cells = <2>;
+      #size-cells = <2>;
+
+      pwm@8550 {
+        compatible = "amlogic,meson-gxbb-pwm";
+        reg = <0x0 0x08550 0x0 0x10>;
+        clocks = <&xtal>, <&xtal>;
+        clock-names = "clkin0", "clkin1";
+        #pwm-cells = <3>;
+      };
+    };
Documentation/devicetree/bindings/pwm/pwm-meson.txt deleted +0 -29
deleted file mode 100644
index bd02b0a14..000000000
@@ -1,29 +0,0 @@
-Amlogic Meson PWM Controller
-============================
-
-Required properties:
-- compatible: Shall contain "amlogic,meson8b-pwm"
-                         or "amlogic,meson-gxbb-pwm"
-                         or "amlogic,meson-gxbb-ao-pwm"
-                         or "amlogic,meson-axg-ee-pwm"
-                         or "amlogic,meson-axg-ao-pwm"
-                         or "amlogic,meson-g12a-ee-pwm"
-                         or "amlogic,meson-g12a-ao-pwm-ab"
-                         or "amlogic,meson-g12a-ao-pwm-cd"
-- #pwm-cells: Should be 3. See pwm.yaml in this directory for a description of
-  the cells format.
-
-Optional properties:
-- clocks: Could contain one or two parents clocks phandle for each of the two
-  PWM channels.
-- clock-names: Could contain at least the "clkin0" and/or "clkin1" names.
-
-Example:
-
-	pwm_ab: pwm@8550 {
-		compatible = "amlogic,meson-gxbb-pwm";
-		reg = <0x0 0x08550 0x0 0x10>;
-		#pwm-cells = <3>;
-		clocks = <&xtal>, <&xtal>;
-		clock-names = "clkin0", "clkin1";
-	}
Signature · 1 line
2.39.1
maintainer
#9 lore raw

Re: [PATCH 6/8] dt-bindings: pwm: Add Amlogic Meson PWM binding

Quoted 11 lines · Heiner Kallweit

Add Amlogic Meson PWM binding.
Tested with make targets dt_binding_check and dtbs_check.

---
 .../devicetree/bindings/pwm/pwm-amlogic.yaml  | 61 +++++++++++++++++++
 .../devicetree/bindings/pwm/pwm-meson.txt     | 29 ---------
 2 files changed, 61 insertions(+), 29 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
 delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt

Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings.

Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future.

Full log is available here: https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]

pwm@550: compatible:0: 'amlogic,meson-gx-ao-pwm' is not one of ['amlogic,meson8b-pwm', 'amlogic,meson-gxbb-pwm', 'amlogic,meson-gxbb-ao-pwm', 'amlogic,meson-axg-ee-pwm', 'amlogic,meson-axg-ao-pwm', 'amlogic,meson-g12a-ee-pwm', 'amlogic,meson-g12a-ao-pwm-ab', 'amlogic,meson-g12a-ao-pwm-cd', 'amlogic,meson-s4-pwm']

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb

pwm@550: compatible: ['amlogic,meson-gx-ao-pwm', 'amlogic,meson-gxbb-ao-pwm'] is too long

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb

pwm@8550: compatible:0: 'amlogic,meson8-pwm' is not one of ['amlogic,meson8b-pwm', 'amlogic,meson-gxbb-pwm', 'amlogic,meson-gxbb-ao-pwm', 'amlogic,meson-axg-ee-pwm', 'amlogic,meson-axg-ao-pwm', 'amlogic,meson-g12a-ee-pwm', 'amlogic,meson-g12a-ao-pwm-ab', 'amlogic,meson-g12a-ao-pwm-cd', 'amlogic,meson-s4-pwm']
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pwm@8550: compatible:0: 'amlogic,meson-gx-pwm' is not one of ['amlogic,meson8b-pwm', 'amlogic,meson-gxbb-pwm', 'amlogic,meson-gxbb-ao-pwm', 'amlogic,meson-axg-ee-pwm', 'amlogic,meson-axg-ao-pwm', 'amlogic,meson-g12a-ee-pwm', 'amlogic,meson-g12a-ao-pwm-ab', 'amlogic,meson-g12a-ao-pwm-cd', 'amlogic,meson-s4-pwm']

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb

pwm@8550: compatible: ['amlogic,meson8-pwm', 'amlogic,meson8b-pwm'] is too long
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pwm@8550: compatible: ['amlogic,meson-gx-pwm', 'amlogic,meson-gxbb-pwm'] is too long

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb

pwm@8650: compatible:0: 'amlogic,meson8-pwm' is not one of ['amlogic,meson8b-pwm', 'amlogic,meson-gxbb-pwm', 'amlogic,meson-gxbb-ao-pwm', 'amlogic,meson-axg-ee-pwm', 'amlogic,meson-axg-ao-pwm', 'amlogic,meson-g12a-ee-pwm', 'amlogic,meson-g12a-ao-pwm-ab', 'amlogic,meson-g12a-ao-pwm-cd', 'amlogic,meson-s4-pwm']
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pwm@8650: compatible:0: 'amlogic,meson-gx-pwm' is not one of ['amlogic,meson8b-pwm', 'amlogic,meson-gxbb-pwm', 'amlogic,meson-gxbb-ao-pwm', 'amlogic,meson-axg-ee-pwm', 'amlogic,meson-axg-ao-pwm', 'amlogic,meson-g12a-ee-pwm', 'amlogic,meson-g12a-ao-pwm-ab', 'amlogic,meson-g12a-ao-pwm-cd', 'amlogic,meson-s4-pwm']

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb

pwm@8650: compatible: ['amlogic,meson8-pwm', 'amlogic,meson8b-pwm'] is too long
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pwm@8650: compatible: ['amlogic,meson-gx-pwm', 'amlogic,meson-gxbb-pwm'] is too long

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb

pwm@86c0: compatible:0: 'amlogic,meson8-pwm' is not one of ['amlogic,meson8b-pwm', 'amlogic,meson-gxbb-pwm', 'amlogic,meson-gxbb-ao-pwm', 'amlogic,meson-axg-ee-pwm', 'amlogic,meson-axg-ao-pwm', 'amlogic,meson-g12a-ee-pwm', 'amlogic,meson-g12a-ao-pwm-ab', 'amlogic,meson-g12a-ao-pwm-cd', 'amlogic,meson-s4-pwm']
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pwm@86c0: compatible:0: 'amlogic,meson-gx-pwm' is not one of ['amlogic,meson8b-pwm', 'amlogic,meson-gxbb-pwm', 'amlogic,meson-gxbb-ao-pwm', 'amlogic,meson-axg-ee-pwm', 'amlogic,meson-axg-ao-pwm', 'amlogic,meson-g12a-ee-pwm', 'amlogic,meson-g12a-ao-pwm-ab', 'amlogic,meson-g12a-ao-pwm-cd', 'amlogic,meson-s4-pwm']

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb

pwm@86c0: compatible: ['amlogic,meson8-pwm', 'amlogic,meson8b-pwm'] is too long
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pwm@86c0: compatible: ['amlogic,meson-gx-pwm', 'amlogic,meson-gxbb-pwm'] is too long

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic

maintainer
#10 lore raw

Re: [PATCH 6/8] dt-bindings: pwm: Add Amlogic Meson PWM binding

In reply to Heiner Kallweit
Quoted 39 lines · Heiner Kallweit

Add Amlogic Meson PWM binding.
Tested with make targets dt_binding_check and dtbs_check.

---
 .../devicetree/bindings/pwm/pwm-amlogic.yaml  | 61 +++++++++++++++++++
 .../devicetree/bindings/pwm/pwm-meson.txt     | 29 ---------
 2 files changed, 61 insertions(+), 29 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
 delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +22 -0
new file mode 100644
index 000000000..443ff4e5b
@@ -0,0 +1,61 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pwm/pwm-amlogic.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic PWM
+
+maintainers:
+  - Heiner Kallweit <[email protected]>
+
+allOf:
+  - $ref: pwm.yaml#
+
+properties:
+  compatible:
+    enum:
+      - amlogic,meson8b-pwm
+      - amlogic,meson-gxbb-pwm
+      - amlogic,meson-gxbb-ao-pwm
+      - amlogic,meson-axg-ee-pwm
+      - amlogic,meson-axg-ao-pwm

Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml line 32

Quoted 10 lines
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +10 -0
+      - amlogic,meson-g12a-ee-pwm
+      - amlogic,meson-g12a-ao-pwm-ab
+      - amlogic,meson-g12a-ao-pwm-cd
+      - amlogic,meson-s4-pwm
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    $ref: /schemas/types.yaml#/definitions/phandle-array

No need for a type, 'clocks' already has one. You need how many and what each one is when more than 1.

Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml line 36

Quoted 4 lines
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +4 -0
+
+  clock-names:
+    minItems: 1
+    maxItems: 2

Need the exact names here.

Quoted 64 lines
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +25 -0
+
+  "#pwm-cells":
+    const: 3
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    apb@fe000000 {
+      reg = <0x0 0xfe000000 0x0 0x480000>;
+      #address-cells = <2>;
+      #size-cells = <2>;
+
+      pwm@8550 {
+        compatible = "amlogic,meson-gxbb-pwm";
+        reg = <0x0 0x08550 0x0 0x10>;
+        clocks = <&xtal>, <&xtal>;
+        clock-names = "clkin0", "clkin1";
+        #pwm-cells = <3>;
+      };
+    };
Documentation/devicetree/bindings/pwm/pwm-meson.txt deleted +0 -29
deleted file mode 100644
index bd02b0a14..000000000
@@ -1,29 +0,0 @@
-Amlogic Meson PWM Controller
-============================
-
-Required properties:
-- compatible: Shall contain "amlogic,meson8b-pwm"
-                         or "amlogic,meson-gxbb-pwm"
-                         or "amlogic,meson-gxbb-ao-pwm"
-                         or "amlogic,meson-axg-ee-pwm"
-                         or "amlogic,meson-axg-ao-pwm"
-                         or "amlogic,meson-g12a-ee-pwm"
-                         or "amlogic,meson-g12a-ao-pwm-ab"
-                         or "amlogic,meson-g12a-ao-pwm-cd"
-- #pwm-cells: Should be 3. See pwm.yaml in this directory for a description of
-  the cells format.
-
-Optional properties:
-- clocks: Could contain one or two parents clocks phandle for each of the two
-  PWM channels.
-- clock-names: Could contain at least the "clkin0" and/or "clkin1" names.
-
-Example:
-
-	pwm_ab: pwm@8550 {
-		compatible = "amlogic,meson-gxbb-pwm";
-		reg = <0x0 0x08550 0x0 0x10>;
-		#pwm-cells = <3>;
-		clocks = <&xtal>, <&xtal>;
-		clock-names = "clkin0", "clkin1";
-	}
Signature · 1 line
2.39.1
#11 lore raw

PATCH 7/8 dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt controller binding

In reply to Heiner Kallweit

Add Amlogic Meson GPIO interrupt controller binding. Tested with make targets dt_binding_check and dtbs_check.

---
 .../amlogic,meson-gpio-intc.txt               | 38 ----------
 .../amlogic,meson-gpio-intc.yaml              | 72 +++++++++++++++++++
 2 files changed, 72 insertions(+), 38 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt deleted +0 -38
deleted file mode 100644
index bde63f8f0..000000000
@@ -1,38 +0,0 @@
-Amlogic meson GPIO interrupt controller
-
-Meson SoCs contains an interrupt controller which is able to watch the SoC
-pads and generate an interrupt on edge or level. The controller is essentially
-a 256 pads to 8 GIC interrupt multiplexer, with a filter block to select edge
-or level and polarity. It does not expose all 256 mux inputs because the
-documentation shows that the upper part is not mapped to any pad. The actual
-number of interrupt exposed depends on the SoC.
-
-Required properties:
-
-- compatible : must have "amlogic,meson8-gpio-intc" and either
-    "amlogic,meson8-gpio-intc" for meson8 SoCs (S802) or
-    "amlogic,meson8b-gpio-intc" for meson8b SoCs (S805) or
-    "amlogic,meson-gxbb-gpio-intc" for GXBB SoCs (S905) or
-    "amlogic,meson-gxl-gpio-intc" for GXL SoCs (S905X, S912)
-    "amlogic,meson-axg-gpio-intc" for AXG SoCs (A113D, A113X)
-    "amlogic,meson-g12a-gpio-intc" for G12A SoCs (S905D2, S905X2, S905Y2)
-    "amlogic,meson-sm1-gpio-intc" for SM1 SoCs (S905D3, S905X3, S905Y3)
-    "amlogic,meson-a1-gpio-intc" for A1 SoCs (A113L)
-    "amlogic,meson-s4-gpio-intc" for S4 SoCs (S802X2, S905Y4, S805X2G, S905W2)
-- reg : Specifies base physical address and size of the registers.
-- interrupt-controller : Identifies the node as an interrupt controller.
-- #interrupt-cells : Specifies the number of cells needed to encode an
-   interrupt source. The value must be 2.
-- meson,channel-interrupts: Array with the 8 upstream hwirq numbers. These
-   are the hwirqs used on the parent interrupt controller.
-
-Example:
-
-gpio_interrupt: interrupt-controller@9880 {
-	compatible = "amlogic,meson-gxbb-gpio-intc",
-		     "amlogic,meson-gpio-intc";
-	reg = <0x0 0x9880 0x0 0x10>;
-	interrupt-controller;
-	#interrupt-cells = <2>;
-	meson,channel-interrupts = <64 65 66 67 68 69 70 71>;
-};
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +72 -0

72 lines not on this page · raw message

Signature · 1 line
2.39.1
maintainer
#12 lore raw

Re: [PATCH 7/8] dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt controller binding

Quoted 11 lines · Heiner Kallweit

Add Amlogic Meson GPIO interrupt controller binding. Tested with make targets dt_binding_check and dtbs_check.

---
 .../amlogic,meson-gpio-intc.txt               | 38 ----------
 .../amlogic,meson-gpio-intc.yaml              | 72 +++++++++++++++++++
 2 files changed, 72 insertions(+), 38 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml

Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings.

Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future.

Full log is available here: https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]

interrupt-controller@4080: compatible: ['amlogic,meson-s4-gpio-intc', 'amlogic,meson-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dtb

interrupt-controller@9880: compatible:0: 'amlogic,meson-gpio-intc' is not one of ['amlogic,meson8-gpio-intc', 'amlogic,meson8b-gpio-intc', 'amlogic,meson-gxbb-gpio-intc', 'amlogic,meson-gxl-gpio-intc', 'amlogic,meson-axg-gpio-intc', 'amlogic,meson-g12a-gpio-intc', 'amlogic,meson-sm1-gpio-intc', 'amlogic,meson-a1-gpio-intc', 'amlogic,meson-s4-gpio-intc', 'amlogic,meson-sc2-gpio-intc']

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb
	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb

interrupt-controller@9880: compatible: ['amlogic,meson8-gpio-intc', 'amlogic,meson-gpio-intc'] is too long
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb arch/arm/boot/dts/meson8-minix-neo-x8.dtb

interrupt-controller@9880: compatible: ['amlogic,meson-gpio-intc', 'amlogic,meson8b-gpio-intc'] is too long

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb

interrupt-controller@9880: compatible: ['amlogic,meson-gpio-intc', 'amlogic,meson-gxbb-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb

interrupt-controller@9880: compatible: ['amlogic,meson-gpio-intc', 'amlogic,meson-gxl-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb

interrupt-controller@f080: compatible: ['amlogic,meson-axg-gpio-intc', 'amlogic,meson-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dtb
	arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dtb
	arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dtb
	arch/arm64/boot/dts/amlogic/meson-axg-s400.dtb

interrupt-controller@f080: compatible: ['amlogic,meson-g12a-gpio-intc', 'amlogic,meson-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dtb
	arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dtb
	arch/arm64/boot/dts/amlogic/meson-g12a-u200.dtb
	arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dtb

interrupt-controller@f080: compatible: ['amlogic,meson-sm1-gpio-intc', 'amlogic,meson-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dtb

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic

#13 lore raw

Re: [PATCH 7/8] dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt controller binding

Quoted 14 lines · Rob Herring
Quoted 11 lines · Heiner Kallweit

Add Amlogic Meson GPIO interrupt controller binding. Tested with make targets dt_binding_check and dtbs_check.

---
 .../amlogic,meson-gpio-intc.txt               | 38 ----------
 .../amlogic,meson-gpio-intc.yaml              | 72 +++++++++++++++++++
 2 files changed, 72 insertions(+), 38 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml
Quoted 4 lines

Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings.

Patch 4 of the series fixes these warnings.
Did you apply the full series?

Quoted 140 lines

Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future.

Full log is available here: https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]

interrupt-controller@4080: compatible: ['amlogic,meson-s4-gpio-intc', 'amlogic,meson-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dtb

interrupt-controller@9880: compatible:0: 'amlogic,meson-gpio-intc' is not one of ['amlogic,meson8-gpio-intc', 'amlogic,meson8b-gpio-intc', 'amlogic,meson-gxbb-gpio-intc', 'amlogic,meson-gxl-gpio-intc', 'amlogic,meson-axg-gpio-intc', 'amlogic,meson-g12a-gpio-intc', 'amlogic,meson-sm1-gpio-intc', 'amlogic,meson-a1-gpio-intc', 'amlogic,meson-s4-gpio-intc', 'amlogic,meson-sc2-gpio-intc']

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb
	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb

interrupt-controller@9880: compatible: ['amlogic,meson8-gpio-intc', 'amlogic,meson-gpio-intc'] is too long
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb arch/arm/boot/dts/meson8-minix-neo-x8.dtb

interrupt-controller@9880: compatible: ['amlogic,meson-gpio-intc', 'amlogic,meson8b-gpio-intc'] is too long

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb

interrupt-controller@9880: compatible: ['amlogic,meson-gpio-intc', 'amlogic,meson-gxbb-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dtb
	arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dtb

interrupt-controller@9880: compatible: ['amlogic,meson-gpio-intc', 'amlogic,meson-gxl-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-p281.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
	arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q200.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-q201.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dtb
	arch/arm64/boot/dts/amlogic/meson-gxm-wetek-core2.dtb

interrupt-controller@f080: compatible: ['amlogic,meson-axg-gpio-intc', 'amlogic,meson-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dtb
	arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dtb
	arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dtb
	arch/arm64/boot/dts/amlogic/meson-axg-s400.dtb

interrupt-controller@f080: compatible: ['amlogic,meson-g12a-gpio-intc', 'amlogic,meson-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dtb
	arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dtb
	arch/arm64/boot/dts/amlogic/meson-g12a-u200.dtb
	arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3.dtb
	arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dtb

interrupt-controller@f080: compatible: ['amlogic,meson-sm1-gpio-intc', 'amlogic,meson-gpio-intc'] is too long

	arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dtb
	arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dtb
maintainer
#14 lore raw

Re: [PATCH 7/8] dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt controller binding

Quoted 16 lines · Heiner Kallweit
Quoted 14 lines · Rob Herring
Quoted 11 lines · Heiner Kallweit

Add Amlogic Meson GPIO interrupt controller binding. Tested with make targets dt_binding_check and dtbs_check.

---
 .../amlogic,meson-gpio-intc.txt               | 38 ----------
 .../amlogic,meson-gpio-intc.yaml              | 72 +++++++++++++++++++
 2 files changed, 72 insertions(+), 38 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml
Quoted 6 lines
Quoted 4 lines

Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings.

Patch 4 of the series fixes these warnings.

Then you can ignore them.

You did change the binding somewhat and that should be detailed in the commit message. Granted, the original details on 'compatible' seem to have a typo and are ambiguous on the order of entries.

Quoted 1 line

Did you apply the full series?

No, because patchwork doesn't get the full series nor do I see the full thread when reviewing these bot emails before sending them. If I see a conversion and warnings that look like the schema should be fixed rather than the dts files, then you get this email. Though on further review, dropping 'amlogic,meson-gpio-intc' seems fine given it is often in the wrong spot (it should be last as it is least specific).

Rob

#15 lore raw

PATCH 8/8 dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding

In reply to Heiner Kallweit

Add Amlogic Meson pinctrl binding.
Tested with make targets dt_binding_check and dtbs_check.

---
 .../pinctrl/amlogic,meson-pinctrl.yaml        | 121 ++++++++++++++++++
 .../bindings/pinctrl/meson,pinctrl.txt        |  94 --------------
 2 files changed, 121 insertions(+), 94 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +121 -0
new file mode 100644
index 000000000..afdf4dade
@@ -0,0 +1,121 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/amlogic,meson-pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Meson pinmux controller
+
+maintainers:
+  - Neil Armstrong <[email protected]>
+
+allOf:
+  - $ref: pinctrl.yaml#
+
+properties:
+  compatible:
+    enum:
+      - amlogic,meson8-cbus-pinctrl
+      - amlogic,meson8b-cbus-pinctrl
+      - amlogic,meson8m2-cbus-pinctrl
+      - amlogic,meson8-aobus-pinctrl
+      - amlogic,meson8b-aobus-pinctrl
+      - amlogic,meson8m2-aobus-pinctrl
+      - amlogic,meson-gxbb-periphs-pinctrl
+      - amlogic,meson-gxbb-aobus-pinctrl
+      - amlogic,meson-gxl-periphs-pinctrl
+      - amlogic,meson-gxl-aobus-pinctrl
+      - amlogic,meson-axg-periphs-pinctrl
+      - amlogic,meson-axg-aobus-pinctrl
+      - amlogic,meson-g12a-periphs-pinctrl
+      - amlogic,meson-g12a-aobus-pinctrl
+      - amlogic,meson-a1-periphs-pinctrl
+      - amlogic,meson-s4-periphs-pinctrl
+
+  ranges: true
+
+  "#address-cells":
+    const: 2
+
+  "#size-cells":
+    const: 2
+
+required:
+  - compatible
+  - ranges
+  - "#address-cells"
+  - "#size-cells"
+
+additionalProperties:
+  anyOf:
+    - type: object
+      allOf:
+        - $ref: pincfg-node.yaml#
+        - $ref: pinmux-node.yaml#
+
+patternProperties:
+  "^bank@[0-9]$":
+    type: object
+    properties:
+      reg:
+        minItems: 5
+        maxItems: 5
+
+      reg-names:
+        items:
+          - const: gpio
+          - const: pull
+          - const: pull-enable
+          - const: mux
+          - const: ds
+
+      gpio-controller: true
+
+      "#gpio-cells":
+        const: 2
+
+      gpio-ranges:
+        $ref: /schemas/types.yaml#/definitions/phandle
+
+    required:
+      - reg
+      - reg-names
+      - gpio-controller
+      - "#gpio-cells"
+      - gpio-ranges
+
+examples:
+  - |
+    bus@34400 {
+      reg = <0x0 0x34400 0x0 0x400>;
+      #address-cells = <2>;
+      #size-cells = <2>;
+
+      pinctrl@40 {
+        compatible = "amlogic,meson-g12a-periphs-pinctrl";
+        #address-cells = <2>;
+        #size-cells = <2>;
+        /* avoid "unit has no reg or ranges property" warning */
+        ranges = <0x0 0x0 0x0 0x34400 0x0 0x100>;
+
+        bank@40 {
+          reg = <0x0 0x40  0x0 0x4c>,
+                <0x0 0xe8  0x0 0x18>,
+                <0x0 0x120 0x0 0x18>,
+                <0x0 0x2c0 0x0 0x40>,
+                <0x0 0x340 0x0 0x1c>;
+          reg-names = "gpio", "pull", "pull-enable", "mux", "ds";
+          gpio-controller;
+          #gpio-cells = <2>;
+          gpio-ranges = <&periphs_pinctrl 0 0 86>;
+        };
+
+        cec_ao_a_h_pins: cec_ao_a_h {
+          mux {
+            groups = "cec_ao_a_h";
+            function = "cec_ao_a_h";
+            bias-disable;
+          };
+        };
+      };
+    };
Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt deleted +0 -94

94 lines not on this page · raw message

Signature · 1 line
2.39.1
maintainer
#16 lore raw

Re: [PATCH 8/8] dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding

Quoted 11 lines · Heiner Kallweit

Add Amlogic Meson pinctrl binding.
Tested with make targets dt_binding_check and dtbs_check.

---
 .../pinctrl/amlogic,meson-pinctrl.yaml        | 121 ++++++++++++++++++
 .../bindings/pinctrl/meson,pinctrl.txt        |  94 --------------
 2 files changed, 121 insertions(+), 94 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt

Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings.

Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future.

Full log is available here: https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]

pinctrl@84: #address-cells:0:0: 2 was expected

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pinctrl@84: compatible: ['amlogic,meson8m2-aobus-pinctrl', 'amlogic,meson8-aobus-pinctrl'] is too long
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb

pinctrl@84: reg: 'anyOf' conditional failed, one must be fixed:

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pinctrl@84: #size-cells:0:0: 2 was expected

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pinctrl@9880: #address-cells:0:0: 2 was expected

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pinctrl@9880: compatible: ['amlogic,meson8m2-cbus-pinctrl', 'amlogic,meson8-cbus-pinctrl'] is too long
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb

pinctrl@9880: reg: 'anyOf' conditional failed, one must be fixed:

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pinctrl@9880: #size-cells:0:0: 2 was expected

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic

#17 lore raw

Re: [PATCH 8/8] dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding

Quoted 5 lines · Rob Herring
Quoted 3 lines · Heiner Kallweit

Add Amlogic Meson pinctrl binding.
Tested with make targets dt_binding_check and dtbs_check.

Quoted 9 lines
Quoted 8 lines
---
 .../pinctrl/amlogic,meson-pinctrl.yaml        | 121 ++++++++++++++++++
 .../bindings/pinctrl/meson,pinctrl.txt        |  94 --------------
 2 files changed, 121 insertions(+), 94 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt

Thanks, I didn't catch these warnings because Meson8 support isn't enabled on my system. Will look into it.

Quoted 58 lines

Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings.

Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future.

Full log is available here: https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]

pinctrl@84: #address-cells:0:0: 2 was expected

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pinctrl@84: compatible: ['amlogic,meson8m2-aobus-pinctrl', 'amlogic,meson8-aobus-pinctrl'] is too long
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb

pinctrl@84: reg: 'anyOf' conditional failed, one must be fixed:

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pinctrl@84: #size-cells:0:0: 2 was expected

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pinctrl@9880: #address-cells:0:0: 2 was expected

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pinctrl@9880: compatible: ['amlogic,meson8m2-cbus-pinctrl', 'amlogic,meson8-cbus-pinctrl'] is too long
arch/arm/boot/dts/meson8m2-mxiii-plus.dtb

pinctrl@9880: reg: 'anyOf' conditional failed, one must be fixed:

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb

pinctrl@9880: #size-cells:0:0: 2 was expected

	arch/arm/boot/dts/meson8b-ec100.dtb
	arch/arm/boot/dts/meson8b-mxq.dtb
	arch/arm/boot/dts/meson8b-odroidc1.dtb
	arch/arm/boot/dts/meson8m2-mxiii-plus.dtb
	arch/arm/boot/dts/meson8-minix-neo-x8.dtb
maintainer
#18 lore raw
In reply to Heiner Kallweit

Hi Heiner,

Le 23/01/2023 à 22:22, Heiner Kallweit a écrit :

Quoted 2 lines

At first adjust some existing dtbs's so that they pass dtbs_check after switching bindings to yaml.

Thanks for this patchset, but please drop patches 1, 3 & 4, and take in account the existing compatible usage in your new bindings like I did in my conversion patchset.

While we did remove some bad compatibles we introduced a few years ago, now the GXBB, GXL & GXM are now stable a aew LTS releases now and a few other projects uses them as-is (U-Boot, BSDs, ...) so changing the compatibles isn't an option anymore... and we can't know which one they use and how the implementation behaves we must document the existing usage without breaking any potential users (including linux).

Thanks,
Neil

Quoted 41 lines

Then switch further Amlogic Meson bindings to yaml. Tested with make targets dt_binding_check and dtbs_check.

Heiner Kallweit (8):
arm64: dts: meson-gx: Remove invalid pwm compatible
arm64: dts: amlogic: Fix non-compliant SD/SDIO node names
arm64: dts: meson-gx: Set only one compatible string for mmc
arm64: dts: amlogic: Remove invalid compatible string
amlogic,meson-gpio-intc
dt-bindings: rtc: Add Amlogic Meson vrtc controller binding
dt-bindings: pwm: Add Amlogic Meson PWM binding
dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt
controller binding
dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding

  .../amlogic,meson-gpio-intc.txt               |  38 ------
  .../amlogic,meson-gpio-intc.yaml              |  72 +++++++++++
  .../pinctrl/amlogic,meson-pinctrl.yaml        | 121 ++++++++++++++++++
  .../bindings/pinctrl/meson,pinctrl.txt        |  94 --------------
  .../devicetree/bindings/pwm/pwm-amlogic.yaml  |  61 +++++++++
  .../devicetree/bindings/pwm/pwm-meson.txt     |  29 -----
  .../bindings/rtc/amlogic,meson-vrtc.yaml      |  50 ++++++++
  .../bindings/rtc/rtc-meson-vrtc.txt           |  22 ----
  arch/arm64/boot/dts/amlogic/meson-axg.dtsi    |   5 +-
  .../boot/dts/amlogic/meson-g12-common.dtsi    |   7 +-
  arch/arm64/boot/dts/amlogic/meson-gx.dtsi     |  15 +--
  arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi   |   3 +-
  arch/arm64/boot/dts/amlogic/meson-gxl.dtsi    |   3 +-
  arch/arm64/boot/dts/amlogic/meson-s4.dtsi     |   3 +-
  arch/arm64/boot/dts/amlogic/meson-sm1.dtsi    |   3 +-
  15 files changed, 320 insertions(+), 206 deletions(-)

delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt
create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt

#19 lore raw
Quoted 10 lines · Neil Armstrong

Hi Heiner,

Le 23/01/2023 à 22:22, Heiner Kallweit a écrit :

Quoted 2 lines

At first adjust some existing dtbs's so that they pass dtbs_check after switching bindings to yaml.

Thanks for this patchset, but please drop patches 1, 3 & 4, and take in account the existing compatible usage in your new bindings like I did in my conversion patchset.

Quoted 7 lines

While we did remove some bad compatibles we introduced a few years ago, now the GXBB, GXL & GXM are now stable a aew LTS releases now and a few other projects uses them as-is (U-Boot, BSDs, ...) so changing the compatibles isn't an option anymore... and we can't know which one they use and how the implementation behaves we must document the existing usage without breaking any potential users (including linux).

I wasn't aware of this. Thanks for the hint.
So I'll rework the schemas to cover current usage of compatible strings.

Quoted 3 lines

Thanks,
Neil

Heiner

Quoted 45 lines
Quoted 43 lines

Then switch further Amlogic Meson bindings to yaml. Tested with make targets dt_binding_check and dtbs_check.

Heiner Kallweit (8):
   arm64: dts: meson-gx: Remove invalid pwm compatible
   arm64: dts: amlogic: Fix non-compliant SD/SDIO node names
   arm64: dts: meson-gx: Set only one compatible string for mmc
   arm64: dts: amlogic: Remove invalid compatible string amlogic,meson-gpio-intc
   dt-bindings: rtc: Add Amlogic Meson vrtc controller binding
   dt-bindings: pwm: Add Amlogic Meson PWM binding
   dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt controller binding
   dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding

  .../amlogic,meson-gpio-intc.txt               |  38 ------ .../amlogic,meson-gpio-intc.yaml              |  72 +++++++++++ .../pinctrl/amlogic,meson-pinctrl.yaml        | 121 ++++++++++++++++++ .../bindings/pinctrl/meson,pinctrl.txt        |  94 -------------- .../devicetree/bindings/pwm/pwm-amlogic.yaml  |  61 +++++++++ .../devicetree/bindings/pwm/pwm-meson.txt     |  29 ----- .../bindings/rtc/amlogic,meson-vrtc.yaml      |  50 ++++++++ .../bindings/rtc/rtc-meson-vrtc.txt           |  22 ---- arch/arm64/boot/dts/amlogic/meson-axg.dtsi    |   5 +- .../boot/dts/amlogic/meson-g12-common.dtsi    |   7 +- arch/arm64/boot/dts/amlogic/meson-gx.dtsi     |  15 +-- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi   |   3 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi    |   3 +- arch/arm64/boot/dts/amlogic/meson-s4.dtsi     |   3 +- arch/arm64/boot/dts/amlogic/meson-sm1.dtsi    |   3 +-

  15 files changed, 320 insertions(+), 206 deletions(-)

  delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt
  create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
  delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt
  create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt

#20 lore raw
In reply to Neil Armstrong

Hello,

Quoted 8 lines · Neil Armstrong

Le 23/01/2023 à 22:22, Heiner Kallweit a écrit :

Quoted 2 lines

At first adjust some existing dtbs's so that they pass dtbs_check after switching bindings to yaml.

Thanks for this patchset, but please drop patches 1, 3 & 4, and take in account the existing compatible usage in your new bindings like I did in my conversion patchset.

Quoted 6 lines

While we did remove some bad compatibles we introduced a few years ago, now the GXBB, GXL & GXM are now stable a aew LTS releases now and a few other projects uses them as-is (U-Boot, BSDs, ...) so changing the compatibles isn't an option anymore... and we can't know which one they use and how the implementation behaves we must document the existing usage without breaking any potential users (including linux).

I only looked into patch #1, and I support dropping it for stronger reasons than not breaking things which maybe started to rely on the existing contents.

In patch #1 you write:

| amlogic,meson-gx-pwm isn't a valid compatible string, so remove it.
| See drivers/pwm/pwm-meson.c.
| 
| Signed-off-by: Heiner Kallweit <[email protected]>
| ---
|  arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 ++++----
|  1 file changed, 4 insertions(+), 4 deletions(-)
| 
| diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
| index a79a35e84..75d35dcfe 100644
| --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
| +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
| @@ -328,14 +328,14 @@ i2c_A: i2c@8500 {
|                         };
| 
|                         pwm_ab: pwm@8550 {
| -                               compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm";
| +                               compatible = "amlogic,meson-gxbb-pwm";

There are two issues:

a) drivers/pwm/pwm-meson.c isn't the reference. The driver doesn't justify which compatibles should be used. You should refer to the binding document instead.

b) Having the SoC name as an additional compatible (i.e. the status quo before your patch) is an advantage. While it doesn't hurt (apart from making the dtb a tad bigger) it makes it possible to adapt the driver if in the future someone discovers that the PWM component on GX is a tad different from the GXBB one. In that case you can add a check in the driver à la

if (of_device_is_compatible(np, amlogic,meson-gx-pwm))
do_the_special_gx_handling()

without having to adapt the device trees then (or use some ugly code that somehow detects if it's running on GX).

So the driver not handling amlogic,meson-gx-pwm today is fine. I expect the fix to be: Include that compatible in the binding.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |
maintainer Applied
#21 lore raw

Re: (subset) [PATCH 0/8] soc: amlogic: switch bindings to yaml and adjust some dtbs's

In reply to Heiner Kallweit

Hi,

Quoted 18 lines · Heiner Kallweit

At first adjust some existing dtbs's so that they pass dtbs_check after switching bindings to yaml.

Then switch further Amlogic Meson bindings to yaml. Tested with make targets dt_binding_check and dtbs_check.

Heiner Kallweit (8):
arm64: dts: meson-gx: Remove invalid pwm compatible
arm64: dts: amlogic: Fix non-compliant SD/SDIO node names
arm64: dts: meson-gx: Set only one compatible string for mmc
arm64: dts: amlogic: Remove invalid compatible string
amlogic,meson-gpio-intc
dt-bindings: rtc: Add Amlogic Meson vrtc controller binding
dt-bindings: pwm: Add Amlogic Meson PWM binding
dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt
controller binding
dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding

Quoted 1 line

[...]

Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.3/arm64-dt)

[2/8] arm64: dts: amlogic: Fix non-compliant SD/SDIO node names

      https://git.kernel.org/amlogic/c/1be13a5091bf71627aa1a3d35360b039510f42f3

These changes has been applied on the intermediate git tree [1].

The v6.3/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers for inclusion in their intermediate git branches in order to be sent to Linus during the next merge window, or sooner if it's a set of fixes.

In the cases of fixes, those will be merged in the current release candidate kernel and as soon they appear on the Linux master branch they will be backported to the previous Stable and Long-Stable kernels [2].

The intermediate git branches are merged daily in the linux-next tree [3], people are encouraged testing these pre-release kernels and report issues on the relevant mailing-lists.

If problems are discovered on those changes, please submit a signed-off-by revert patch followed by a corrective changeset.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

Signature · 1 line
Neil
#22 lore raw

PATCH v2 1/1 dt-bindings: rtc: Convert Amlogic Meson vrtc controller binding

In reply to Heiner Kallweit

Convert Amlogic Meson vrtc controller binding to yaml.

---
v2:
- improve title and commit message
- remove bus part from example

---
 .../bindings/rtc/amlogic,meson-vrtc.yaml      | 44 +++++++++++++++++++
 .../bindings/rtc/rtc-meson-vrtc.txt           | 22 ----------
 2 files changed, 44 insertions(+), 22 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml
 delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt
Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml new file +44 -0
new file mode 100644
index 000000000..a89865fa6
@@ -0,0 +1,44 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/rtc/amlogic,meson-vrtc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Virtual RTC (VRTC)
+
+maintainers:
+  - Neil Armstrong <[email protected]>
+
+description: |
+  This is a Linux interface to an RTC managed by firmware, hence it's
+  virtual from a Linux perspective.  The interface is 1 register where
+  an alarm time (in seconds) is to be written.
+  The alarm register is a simple scratch register shared between the
+  application processors (AP) and the secure co-processor (SCP.)  When
+  the AP suspends, the SCP will use the value of this register to
+  program an always-on timer before going sleep. When the timer expires,
+  the SCP will wake up and will then wake the AP.
+
+allOf:
+  - $ref: rtc.yaml#
+
+properties:
+  compatible:
+    enum:
+      - amlogic,meson-vrtc
+
+  reg:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    rtc@a8 {
+      compatible = "amlogic,meson-vrtc";
+      reg = <0x000a8 0x4>;
+    };
Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt deleted +0 -22
deleted file mode 100644
index c014f54a9..000000000
@@ -1,22 +0,0 @@
-* Amlogic Virtual RTC (VRTC)
-
-This is a Linux interface to an RTC managed by firmware, hence it's
-virtual from a Linux perspective.  The interface is 1 register where
-an alarm time (in seconds) is to be written.
-
-Required properties:
-- compatible: should be "amlogic,meson-vrtc"
-- reg: physical address for the alarm register
-
-The alarm register is a simple scratch register shared between the
-application processors (AP) and the secure co-processor (SCP.)  When
-the AP suspends, the SCP will use the value of this register to
-program an always-on timer before going sleep. When the timer expires,
-the SCP will wake up and will then wake the AP.
-
-Example:
-
-	vrtc: rtc@0a8 {
-		compatible = "amlogic,meson-vrtc";
-		reg = <0x0 0x000a8 0x0 0x4>;
-	};
Signature · 1 line
2.39.1
maintainer Reviewed-by on v2 1/1
#23 lore raw

Re: [PATCH v2] dt-bindings: rtc: Convert Amlogic Meson vrtc controller binding

Quoted 7 lines · Heiner Kallweit

Convert Amlogic Meson vrtc controller binding to yaml.

---
v2:
- improve title and commit message
- remove bus part from example

Quoted 7 lines
---
 .../bindings/rtc/amlogic,meson-vrtc.yaml      | 44 +++++++++++++++++++
 .../bindings/rtc/rtc-meson-vrtc.txt           | 22 ----------
 2 files changed, 44 insertions(+), 22 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml
 delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt
maintainer Applied
#24 lore raw

Re: (subset) [PATCH v2] dt-bindings: rtc: Convert Amlogic Meson vrtc controller binding

In reply to Heiner Kallweit
Quoted 3 lines · Heiner Kallweit

Convert Amlogic Meson vrtc controller binding to yaml.

Applied, thanks!

[1/1] dt-bindings: rtc: Convert Amlogic Meson vrtc controller binding

      commit: 6a22a5dbc69473c2c46d1a13fe6cbc7bdaacb2a6
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#25 lore raw

PATCH v2 1/1 dt-bindings: pwm: Convert Amlogic Meson PWM binding

In reply to Heiner Kallweit

Convert Amlogic Meson PWM binding to yaml.

---
v2:
- fix clocks and clock-names
- consider that more than one compatible may be set

---
 .../devicetree/bindings/pwm/pwm-amlogic.yaml  | 73 +++++++++++++++++++
 .../devicetree/bindings/pwm/pwm-meson.txt     | 29 --------
 2 files changed, 73 insertions(+), 29 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
 delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +73 -0
new file mode 100644
index 000000000..871b24bc2
@@ -0,0 +1,73 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pwm/pwm-amlogic.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic PWM
+
+maintainers:
+  - Heiner Kallweit <[email protected]>
+
+allOf:
+  - $ref: pwm.yaml#
+
+properties:
+  compatible:
+    minItems: 1
+    maxItems: 2
+    oneOf:
+      - items:
+          - enum:
+              - amlogic,meson8b-pwm
+              - amlogic,meson-gxbb-pwm
+              - amlogic,meson-gxbb-ao-pwm
+              - amlogic,meson-axg-ee-pwm
+              - amlogic,meson-axg-ao-pwm
+              - amlogic,meson-g12a-ee-pwm
+              - amlogic,meson-g12a-ao-pwm-ab
+              - amlogic,meson-g12a-ao-pwm-cd
+              - amlogic,meson-s4-pwm
+      - items:
+          - const: amlogic,meson-gx-pwm
+          - const: amlogic,meson-gxbb-pwm
+      - items:
+          - const: amlogic,meson-gx-ao-pwm
+          - const: amlogic,meson-gxbb-ao-pwm
+      - items:
+          - const: amlogic,meson8-pwm
+          - const: amlogic,meson8b-pwm
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    minItems: 1
+    maxItems: 2
+
+  clock-names:
+    oneOf:
+      - items:
+          - enum: [clkin0, clkin1]
+      - items:
+          - const: clkin0
+          - const: clkin1
+
+  "#pwm-cells":
+    const: 3
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    pwm@8550 {
+      compatible = "amlogic,meson-gxbb-pwm";
+      reg = <0x08550 0x10>;
+      clocks = <&xtal>, <&xtal>;
+      clock-names = "clkin0", "clkin1";
+      #pwm-cells = <3>;
+    };
Documentation/devicetree/bindings/pwm/pwm-meson.txt deleted +0 -29
deleted file mode 100644
index bd02b0a14..000000000
@@ -1,29 +0,0 @@
-Amlogic Meson PWM Controller
-============================
-
-Required properties:
-- compatible: Shall contain "amlogic,meson8b-pwm"
-                         or "amlogic,meson-gxbb-pwm"
-                         or "amlogic,meson-gxbb-ao-pwm"
-                         or "amlogic,meson-axg-ee-pwm"
-                         or "amlogic,meson-axg-ao-pwm"
-                         or "amlogic,meson-g12a-ee-pwm"
-                         or "amlogic,meson-g12a-ao-pwm-ab"
-                         or "amlogic,meson-g12a-ao-pwm-cd"
-- #pwm-cells: Should be 3. See pwm.yaml in this directory for a description of
-  the cells format.
-
-Optional properties:
-- clocks: Could contain one or two parents clocks phandle for each of the two
-  PWM channels.
-- clock-names: Could contain at least the "clkin0" and/or "clkin1" names.
-
-Example:
-
-	pwm_ab: pwm@8550 {
-		compatible = "amlogic,meson-gxbb-pwm";
-		reg = <0x0 0x08550 0x0 0x10>;
-		#pwm-cells = <3>;
-		clocks = <&xtal>, <&xtal>;
-		clock-names = "clkin0", "clkin1";
-	}
Signature · 1 line
2.39.1
maintainer
#26 lore raw

Re: [PATCH v2] dt-bindings: pwm: Convert Amlogic Meson PWM binding

Quoted 28 lines · Heiner Kallweit

Convert Amlogic Meson PWM binding to yaml.

---
v2:
- fix clocks and clock-names
- consider that more than one compatible may be set

---
 .../devicetree/bindings/pwm/pwm-amlogic.yaml  | 73 +++++++++++++++++++
 .../devicetree/bindings/pwm/pwm-meson.txt     | 29 --------
 2 files changed, 73 insertions(+), 29 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
 delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +8 -0
new file mode 100644
index 000000000..871b24bc2
@@ -0,0 +1,73 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pwm/pwm-amlogic.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic PWM
+

Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml line 18

Quoted 10 lines
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +10 -0
+maintainers:
+  - Heiner Kallweit <[email protected]>
+
+allOf:
+  - $ref: pwm.yaml#
+
+properties:
+  compatible:
+    minItems: 1
+    maxItems: 2

A fallback compatible shouldn't be optional. This makes 'amlogic,meson-gx-pwm' alone valid, for example.

Though probably the dtschema processing will add minItems/maxItems on each oneOf entry to prevent that anyways. So just drop the minItems/maxItems here.

Quoted 94 lines
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +55 -0
+    oneOf:
+      - items:
+          - enum:
+              - amlogic,meson8b-pwm
+              - amlogic,meson-gxbb-pwm
+              - amlogic,meson-gxbb-ao-pwm
+              - amlogic,meson-axg-ee-pwm
+              - amlogic,meson-axg-ao-pwm
+              - amlogic,meson-g12a-ee-pwm
+              - amlogic,meson-g12a-ao-pwm-ab
+              - amlogic,meson-g12a-ao-pwm-cd
+              - amlogic,meson-s4-pwm
+      - items:
+          - const: amlogic,meson-gx-pwm
+          - const: amlogic,meson-gxbb-pwm
+      - items:
+          - const: amlogic,meson-gx-ao-pwm
+          - const: amlogic,meson-gxbb-ao-pwm
+      - items:
+          - const: amlogic,meson8-pwm
+          - const: amlogic,meson8b-pwm
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    minItems: 1
+    maxItems: 2
+
+  clock-names:
+    oneOf:
+      - items:
+          - enum: [clkin0, clkin1]
+      - items:
+          - const: clkin0
+          - const: clkin1
+
+  "#pwm-cells":
+    const: 3
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    pwm@8550 {
+      compatible = "amlogic,meson-gxbb-pwm";
+      reg = <0x08550 0x10>;
+      clocks = <&xtal>, <&xtal>;
+      clock-names = "clkin0", "clkin1";
+      #pwm-cells = <3>;
+    };
Documentation/devicetree/bindings/pwm/pwm-meson.txt deleted +0 -29
deleted file mode 100644
index bd02b0a14..000000000
@@ -1,29 +0,0 @@
-Amlogic Meson PWM Controller
-============================
-
-Required properties:
-- compatible: Shall contain "amlogic,meson8b-pwm"
-                         or "amlogic,meson-gxbb-pwm"
-                         or "amlogic,meson-gxbb-ao-pwm"
-                         or "amlogic,meson-axg-ee-pwm"
-                         or "amlogic,meson-axg-ao-pwm"
-                         or "amlogic,meson-g12a-ee-pwm"
-                         or "amlogic,meson-g12a-ao-pwm-ab"
-                         or "amlogic,meson-g12a-ao-pwm-cd"
-- #pwm-cells: Should be 3. See pwm.yaml in this directory for a description of
-  the cells format.
-
-Optional properties:
-- clocks: Could contain one or two parents clocks phandle for each of the two
-  PWM channels.
-- clock-names: Could contain at least the "clkin0" and/or "clkin1" names.
-
-Example:
-
-	pwm_ab: pwm@8550 {
-		compatible = "amlogic,meson-gxbb-pwm";
-		reg = <0x0 0x08550 0x0 0x10>;
-		#pwm-cells = <3>;
-		clocks = <&xtal>, <&xtal>;
-		clock-names = "clkin0", "clkin1";
-	}
Signature · 1 line
2.39.1
#27 lore raw

PATCH v2 1/1 dt-bindings: interrupt-controller: Convert Amlogic Meson GPIO interrupt controller binding

In reply to Heiner Kallweit

Convert Amlogic Meson GPIO interrupt controller binding to yaml.

---
v2:
- consider that more than one compatible may be set
- remove bus part from example

---
 .../amlogic,meson-gpio-intc.txt               | 38 --------
 .../amlogic,meson-gpio-intc.yaml              | 86 +++++++++++++++++++
 2 files changed, 86 insertions(+), 38 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt deleted +0 -38
deleted file mode 100644
index bde63f8f0..000000000
@@ -1,38 +0,0 @@
-Amlogic meson GPIO interrupt controller
-
-Meson SoCs contains an interrupt controller which is able to watch the SoC
-pads and generate an interrupt on edge or level. The controller is essentially
-a 256 pads to 8 GIC interrupt multiplexer, with a filter block to select edge
-or level and polarity. It does not expose all 256 mux inputs because the
-documentation shows that the upper part is not mapped to any pad. The actual
-number of interrupt exposed depends on the SoC.
-
-Required properties:
-
-- compatible : must have "amlogic,meson8-gpio-intc" and either
-    "amlogic,meson8-gpio-intc" for meson8 SoCs (S802) or
-    "amlogic,meson8b-gpio-intc" for meson8b SoCs (S805) or
-    "amlogic,meson-gxbb-gpio-intc" for GXBB SoCs (S905) or
-    "amlogic,meson-gxl-gpio-intc" for GXL SoCs (S905X, S912)
-    "amlogic,meson-axg-gpio-intc" for AXG SoCs (A113D, A113X)
-    "amlogic,meson-g12a-gpio-intc" for G12A SoCs (S905D2, S905X2, S905Y2)
-    "amlogic,meson-sm1-gpio-intc" for SM1 SoCs (S905D3, S905X3, S905Y3)
-    "amlogic,meson-a1-gpio-intc" for A1 SoCs (A113L)
-    "amlogic,meson-s4-gpio-intc" for S4 SoCs (S802X2, S905Y4, S805X2G, S905W2)
-- reg : Specifies base physical address and size of the registers.
-- interrupt-controller : Identifies the node as an interrupt controller.
-- #interrupt-cells : Specifies the number of cells needed to encode an
-   interrupt source. The value must be 2.
-- meson,channel-interrupts: Array with the 8 upstream hwirq numbers. These
-   are the hwirqs used on the parent interrupt controller.
-
-Example:
-
-gpio_interrupt: interrupt-controller@9880 {
-	compatible = "amlogic,meson-gxbb-gpio-intc",
-		     "amlogic,meson-gpio-intc";
-	reg = <0x0 0x9880 0x0 0x10>;
-	interrupt-controller;
-	#interrupt-cells = <2>;
-	meson,channel-interrupts = <64 65 66 67 68 69 70 71>;
-};
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +86 -0

86 lines not on this page · raw message

Signature · 1 line
2.39.1
#28 lore raw

PATCH v2 1/1 dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding

In reply to Heiner Kallweit

Convert Amlogic Meson pinctrl binding to yaml.

---
v2:
- consider that more than one compatible can be set
- remove bus part from example

---
 .../pinctrl/amlogic,meson-pinctrl.yaml        | 124 ++++++++++++++++++
 .../bindings/pinctrl/meson,pinctrl.txt        |  94 -------------
 2 files changed, 124 insertions(+), 94 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +124 -0
new file mode 100644
index 000000000..7ab6e2089
@@ -0,0 +1,124 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/amlogic,meson-pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Meson pinmux controller
+
+maintainers:
+  - Neil Armstrong <[email protected]>
+
+allOf:
+  - $ref: pinctrl.yaml#
+
+properties:
+  compatible:
+    minItems: 1
+    maxItems: 2
+    oneOf:
+      - items:
+          - enum:
+              - amlogic,meson8-cbus-pinctrl
+              - amlogic,meson8b-cbus-pinctrl
+              - amlogic,meson8m2-cbus-pinctrl
+              - amlogic,meson8-aobus-pinctrl
+              - amlogic,meson8b-aobus-pinctrl
+              - amlogic,meson8m2-aobus-pinctrl
+              - amlogic,meson-gxbb-periphs-pinctrl
+              - amlogic,meson-gxbb-aobus-pinctrl
+              - amlogic,meson-gxl-periphs-pinctrl
+              - amlogic,meson-gxl-aobus-pinctrl
+              - amlogic,meson-axg-periphs-pinctrl
+              - amlogic,meson-axg-aobus-pinctrl
+              - amlogic,meson-g12a-periphs-pinctrl
+              - amlogic,meson-g12a-aobus-pinctrl
+              - amlogic,meson-a1-periphs-pinctrl
+              - amlogic,meson-s4-periphs-pinctrl
+      - items:
+          - const: amlogic,meson8m2-aobus-pinctrl
+          - const: amlogic,meson8-aobus-pinctrl
+      - items:
+          - const: amlogic,meson8m2-cbus-pinctrl
+          - const: amlogic,meson8-cbus-pinctrl
+
+  ranges: true
+
+  "#address-cells":
+    enum: [1, 2]
+
+  "#size-cells":
+    enum: [1, 2]
+
+required:
+  - compatible
+  - ranges
+  - "#address-cells"
+  - "#size-cells"
+
+additionalProperties:
+  anyOf:
+    - type: object
+      allOf:
+        - $ref: pincfg-node.yaml#
+        - $ref: pinmux-node.yaml#
+
+patternProperties:
+  "^bank@[0-9]$":
+    type: object
+    properties:
+      reg:
+        minItems: 5
+        maxItems: 5
+
+      reg-names:
+        items:
+          - const: gpio
+          - const: pull
+          - const: pull-enable
+          - const: mux
+          - const: ds
+
+      gpio-controller: true
+
+      "#gpio-cells":
+        const: 2
+
+      gpio-ranges:
+        $ref: /schemas/types.yaml#/definitions/phandle
+
+    required:
+      - reg
+      - reg-names
+      - gpio-controller
+      - "#gpio-cells"
+      - gpio-ranges
+
+examples:
+  - |
+    pinctrl {
+      compatible = "amlogic,meson-g12a-periphs-pinctrl";
+      #address-cells = <1>;
+      #size-cells = <1>;
+      ranges;
+
+      bank@40 {
+        reg = <0x0 0x40  0x0 0x4c>,
+              <0x0 0xe8  0x0 0x18>,
+              <0x0 0x120 0x0 0x18>,
+              <0x0 0x2c0 0x0 0x40>,
+              <0x0 0x340 0x0 0x1c>;
+        reg-names = "gpio", "pull", "pull-enable", "mux", "ds";
+        gpio-controller;
+        #gpio-cells = <2>;
+        gpio-ranges = <&periphs_pinctrl 0 0 86>;
+      };
+
+      cec_ao_a_h_pins: cec_ao_a_h {
+        mux {
+          groups = "cec_ao_a_h";
+          function = "cec_ao_a_h";
+          bias-disable;
+        };
+      };
+    };
Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt deleted +0 -94

94 lines not on this page · raw message

Signature · 1 line
2.39.1
#29 lore raw

PATCH v3 1/1 dt-bindings: pwm: Convert Amlogic Meson PWM binding

In reply to Heiner Kallweit

Convert Amlogic Meson PWM binding to yaml.

---
v2:
- fix clocks and clock-names
- consider that more than one compatible may be set v3:
- remove minItem/maxItem properties for compatible

---
 .../devicetree/bindings/pwm/pwm-amlogic.yaml  | 71 +++++++++++++++++++
 .../devicetree/bindings/pwm/pwm-meson.txt     | 29 --------
 2 files changed, 71 insertions(+), 29 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
 delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +71 -0
new file mode 100644
index 000000000..750642e76
@@ -0,0 +1,71 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pwm/pwm-amlogic.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic PWM
+
+maintainers:
+  - Heiner Kallweit <[email protected]>
+
+allOf:
+  - $ref: pwm.yaml#
+
+properties:
+  compatible:
+    oneOf:
+      - items:
+          - enum:
+              - amlogic,meson8b-pwm
+              - amlogic,meson-gxbb-pwm
+              - amlogic,meson-gxbb-ao-pwm
+              - amlogic,meson-axg-ee-pwm
+              - amlogic,meson-axg-ao-pwm
+              - amlogic,meson-g12a-ee-pwm
+              - amlogic,meson-g12a-ao-pwm-ab
+              - amlogic,meson-g12a-ao-pwm-cd
+              - amlogic,meson-s4-pwm
+      - items:
+          - const: amlogic,meson-gx-pwm
+          - const: amlogic,meson-gxbb-pwm
+      - items:
+          - const: amlogic,meson-gx-ao-pwm
+          - const: amlogic,meson-gxbb-ao-pwm
+      - items:
+          - const: amlogic,meson8-pwm
+          - const: amlogic,meson8b-pwm
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    minItems: 1
+    maxItems: 2
+
+  clock-names:
+    oneOf:
+      - items:
+          - enum: [clkin0, clkin1]
+      - items:
+          - const: clkin0
+          - const: clkin1
+
+  "#pwm-cells":
+    const: 3
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    pwm@8550 {
+      compatible = "amlogic,meson-gxbb-pwm";
+      reg = <0x08550 0x10>;
+      clocks = <&xtal>, <&xtal>;
+      clock-names = "clkin0", "clkin1";
+      #pwm-cells = <3>;
+    };
Documentation/devicetree/bindings/pwm/pwm-meson.txt deleted +0 -29
deleted file mode 100644
index bd02b0a14..000000000
@@ -1,29 +0,0 @@
-Amlogic Meson PWM Controller
-============================
-
-Required properties:
-- compatible: Shall contain "amlogic,meson8b-pwm"
-                         or "amlogic,meson-gxbb-pwm"
-                         or "amlogic,meson-gxbb-ao-pwm"
-                         or "amlogic,meson-axg-ee-pwm"
-                         or "amlogic,meson-axg-ao-pwm"
-                         or "amlogic,meson-g12a-ee-pwm"
-                         or "amlogic,meson-g12a-ao-pwm-ab"
-                         or "amlogic,meson-g12a-ao-pwm-cd"
-- #pwm-cells: Should be 3. See pwm.yaml in this directory for a description of
-  the cells format.
-
-Optional properties:
-- clocks: Could contain one or two parents clocks phandle for each of the two
-  PWM channels.
-- clock-names: Could contain at least the "clkin0" and/or "clkin1" names.
-
-Example:
-
-	pwm_ab: pwm@8550 {
-		compatible = "amlogic,meson-gxbb-pwm";
-		reg = <0x0 0x08550 0x0 0x10>;
-		#pwm-cells = <3>;
-		clocks = <&xtal>, <&xtal>;
-		clock-names = "clkin0", "clkin1";
-	}
Signature · 1 line
2.39.1
maintainer Reviewed-by on v3 1/1
#30 lore raw

Re: [PATCH v3] dt-bindings: pwm: Convert Amlogic Meson PWM binding

Quoted 1 line · Heiner Kallweit

Convert Amlogic Meson PWM binding to yaml.

In the future, don't thread new versions to old versions of patches/series.

Quoted 8 lines

---
v2:
- fix clocks and clock-names
- consider that more than one compatible may be set v3:
- remove minItem/maxItem properties for compatible

Quoted 6 lines
---
 .../devicetree/bindings/pwm/pwm-amlogic.yaml  | 71 +++++++++++++++++++
 .../devicetree/bindings/pwm/pwm-meson.txt     | 29 --------
 2 files changed, 71 insertions(+), 29 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
 delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt
#31 lore raw

Re: [PATCH v3] dt-bindings: pwm: Convert Amlogic Meson PWM binding

In reply to Heiner Kallweit
Quoted 30 lines · Heiner Kallweit

Convert Amlogic Meson PWM binding to yaml.

---
v2:
- fix clocks and clock-names
- consider that more than one compatible may be set v3:
- remove minItem/maxItem properties for compatible

---
 .../devicetree/bindings/pwm/pwm-amlogic.yaml  | 71 +++++++++++++++++++
 .../devicetree/bindings/pwm/pwm-meson.txt     | 29 --------
 2 files changed, 71 insertions(+), 29 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml
 delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +8 -0
new file mode 100644
index 000000000..750642e76
@@ -0,0 +1,71 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pwm/pwm-amlogic.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic PWM
+

Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml line 18

Quoted 10 lines
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +10 -0
+maintainers:
+  - Heiner Kallweit <[email protected]>
+
+allOf:
+  - $ref: pwm.yaml#
+
+properties:
+  compatible:
+    oneOf:
+      - items:

Drop items

Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml line 28

Quoted 10 lines
Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml new file +10 -0
+          - enum:
+              - amlogic,meson8b-pwm
+              - amlogic,meson-gxbb-pwm
+              - amlogic,meson-gxbb-ao-pwm
+              - amlogic,meson-axg-ee-pwm
+              - amlogic,meson-axg-ao-pwm
+              - amlogic,meson-g12a-ee-pwm
+              - amlogic,meson-g12a-ao-pwm-ab
+              - amlogic,meson-g12a-ao-pwm-cd
+              - amlogic,meson-s4-pwm

Best regards,
Krzysztof

#32 lore raw

PATCH v3 1/1 dt-bindings: interrupt-controller: Convert Amlogic Meson GPIO interrupt controller binding

In reply to Heiner Kallweit

Convert Amlogic Meson GPIO interrupt controller binding to yaml.

---
v2:
- consider that more than one compatible may be set
- remove bus part from example
v3:
- remove minItem/maxItem properties for compatible

---
 .../amlogic,meson-gpio-intc.txt               | 38 ---------
 .../amlogic,meson-gpio-intc.yaml              | 84 +++++++++++++++++++
 2 files changed, 84 insertions(+), 38 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt deleted +0 -38
deleted file mode 100644
index bde63f8f0..000000000
@@ -1,38 +0,0 @@
-Amlogic meson GPIO interrupt controller
-
-Meson SoCs contains an interrupt controller which is able to watch the SoC
-pads and generate an interrupt on edge or level. The controller is essentially
-a 256 pads to 8 GIC interrupt multiplexer, with a filter block to select edge
-or level and polarity. It does not expose all 256 mux inputs because the
-documentation shows that the upper part is not mapped to any pad. The actual
-number of interrupt exposed depends on the SoC.
-
-Required properties:
-
-- compatible : must have "amlogic,meson8-gpio-intc" and either
-    "amlogic,meson8-gpio-intc" for meson8 SoCs (S802) or
-    "amlogic,meson8b-gpio-intc" for meson8b SoCs (S805) or
-    "amlogic,meson-gxbb-gpio-intc" for GXBB SoCs (S905) or
-    "amlogic,meson-gxl-gpio-intc" for GXL SoCs (S905X, S912)
-    "amlogic,meson-axg-gpio-intc" for AXG SoCs (A113D, A113X)
-    "amlogic,meson-g12a-gpio-intc" for G12A SoCs (S905D2, S905X2, S905Y2)
-    "amlogic,meson-sm1-gpio-intc" for SM1 SoCs (S905D3, S905X3, S905Y3)
-    "amlogic,meson-a1-gpio-intc" for A1 SoCs (A113L)
-    "amlogic,meson-s4-gpio-intc" for S4 SoCs (S802X2, S905Y4, S805X2G, S905W2)
-- reg : Specifies base physical address and size of the registers.
-- interrupt-controller : Identifies the node as an interrupt controller.
-- #interrupt-cells : Specifies the number of cells needed to encode an
-   interrupt source. The value must be 2.
-- meson,channel-interrupts: Array with the 8 upstream hwirq numbers. These
-   are the hwirqs used on the parent interrupt controller.
-
-Example:
-
-gpio_interrupt: interrupt-controller@9880 {
-	compatible = "amlogic,meson-gxbb-gpio-intc",
-		     "amlogic,meson-gpio-intc";
-	reg = <0x0 0x9880 0x0 0x10>;
-	interrupt-controller;
-	#interrupt-cells = <2>;
-	meson,channel-interrupts = <64 65 66 67 68 69 70 71>;
-};
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +84 -0

84 lines not on this page · raw message

Signature · 1 line
2.39.1
maintainer
#33 lore raw

Re: [PATCH v3] dt-bindings: interrupt-controller: Convert Amlogic Meson GPIO interrupt controller binding

Quoted 96 lines · Heiner Kallweit

Convert Amlogic Meson GPIO interrupt controller binding to yaml.

---
v2:
- consider that more than one compatible may be set
- remove bus part from example
v3:
- remove minItem/maxItem properties for compatible

---
 .../amlogic,meson-gpio-intc.txt               | 38 ---------
 .../amlogic,meson-gpio-intc.yaml              | 84 +++++++++++++++++++
 2 files changed, 84 insertions(+), 38 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt deleted +0 -38
deleted file mode 100644
index bde63f8f0..000000000
@@ -1,38 +0,0 @@
-Amlogic meson GPIO interrupt controller
-
-Meson SoCs contains an interrupt controller which is able to watch the SoC
-pads and generate an interrupt on edge or level. The controller is essentially
-a 256 pads to 8 GIC interrupt multiplexer, with a filter block to select edge
-or level and polarity. It does not expose all 256 mux inputs because the
-documentation shows that the upper part is not mapped to any pad. The actual
-number of interrupt exposed depends on the SoC.
-
-Required properties:
-
-- compatible : must have "amlogic,meson8-gpio-intc" and either
-    "amlogic,meson8-gpio-intc" for meson8 SoCs (S802) or
-    "amlogic,meson8b-gpio-intc" for meson8b SoCs (S805) or
-    "amlogic,meson-gxbb-gpio-intc" for GXBB SoCs (S905) or
-    "amlogic,meson-gxl-gpio-intc" for GXL SoCs (S905X, S912)
-    "amlogic,meson-axg-gpio-intc" for AXG SoCs (A113D, A113X)
-    "amlogic,meson-g12a-gpio-intc" for G12A SoCs (S905D2, S905X2, S905Y2)
-    "amlogic,meson-sm1-gpio-intc" for SM1 SoCs (S905D3, S905X3, S905Y3)
-    "amlogic,meson-a1-gpio-intc" for A1 SoCs (A113L)
-    "amlogic,meson-s4-gpio-intc" for S4 SoCs (S802X2, S905Y4, S805X2G, S905W2)
-- reg : Specifies base physical address and size of the registers.
-- interrupt-controller : Identifies the node as an interrupt controller.
-- #interrupt-cells : Specifies the number of cells needed to encode an
-   interrupt source. The value must be 2.
-- meson,channel-interrupts: Array with the 8 upstream hwirq numbers. These
-   are the hwirqs used on the parent interrupt controller.
-
-Example:
-
-gpio_interrupt: interrupt-controller@9880 {
-	compatible = "amlogic,meson-gxbb-gpio-intc",
-		     "amlogic,meson-gpio-intc";
-	reg = <0x0 0x9880 0x0 0x10>;
-	interrupt-controller;
-	#interrupt-cells = <2>;
-	meson,channel-interrupts = <64 65 66 67 68 69 70 71>;
-};
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +30 -0
new file mode 100644
index 000000000..da55a2d25
@@ -0,0 +1,84 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/interrupt-controller/amlogic,meson-gpio-intc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Meson GPIO interrupt controller
+
+maintainers:
+  - Heiner Kallweit <[email protected]>
+
+description: |
+  Meson SoCs contains an interrupt controller which is able to watch the SoC
+  pads and generate an interrupt on edge or level. The controller is essentially
+  a 256 pads to 8 GIC interrupt multiplexer, with a filter block to select edge
+  or level and polarity. It does not expose all 256 mux inputs because the
+  documentation shows that the upper part is not mapped to any pad. The actual
+  number of interrupt exposed depends on the SoC.
+
+allOf:
+  - $ref: /schemas/interrupt-controller.yaml#
+
+properties:
+  compatible:
+    oneOf:
+      - items:
+          - enum:
+              - amlogic,meson-gpio-intc
+              - amlogic,meson8-gpio-intc
+              - amlogic,meson8b-gpio-intc

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml line 40

Quoted 10 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +10 -0
+              - amlogic,meson-gxbb-gpio-intc
+              - amlogic,meson-gxl-gpio-intc
+              - amlogic,meson-axg-gpio-intc
+              - amlogic,meson-g12a-gpio-intc
+              - amlogic,meson-sm1-gpio-intc
+              - amlogic,meson-a1-gpio-intc
+              - amlogic,meson-s4-gpio-intc
+      - items:
+          - enum:
+              - amlogic,meson8-gpio-intc

We allow this with or without a fallback? Again, that should not be allowed and any dts files fixed.

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml line 51

Quoted 11 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +11 -0
+              - amlogic,meson-axg-gpio-intc
+              - amlogic,meson-g12a-gpio-intc
+              - amlogic,meson-sm1-gpio-intc
+              - amlogic,meson-s4-gpio-intc
+          - const: amlogic,meson-gpio-intc
+      - items:
+          - const: amlogic,meson-gpio-intc
+          - enum:
+              - amlogic,meson8b-gpio-intc
+              - amlogic,meson-gxbb-gpio-intc
+              - amlogic,meson-gxl-gpio-intc

This looks wrong. The order is most specific to least specific compatible. amlogic,meson-gpio-intc is more specific (or a superset of) than amlogic,meson8b-gpio-intc?

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml line 61

Quoted 10 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +10 -0
+
+  reg:
+    maxItems: 1
+
+  interrupt-controller: true
+
+  "#interrupt-cells":
+    const: 2
+
+  amlogic,channel-interrupts:

This was 'meson', not 'amlogic'. You can't just change things.

Really, 'interrupts' should have been used here, but oh well.

Quoted 26 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +23 -0
+    description: Array with the upstream hwirq numbers
+    minItems: 8
+    maxItems: 12
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+
+required:
+  - compatible
+  - reg
+  - interrupt-controller
+  - "#interrupt-cells"
+  - amlogic,channel-interrupts
+
+additionalProperties: false
+
+examples:
+  - |
+    interrupt-controller@9880 {
+      compatible = "amlogic,meson-gxbb-gpio-intc";
+      reg = <0x9880 0x10>;
+      interrupt-controller;
+      #interrupt-cells = <2>;
+      amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
+    };
Signature · 1 line
2.39.1
#34 lore raw

Re: [PATCH v3] dt-bindings: interrupt-controller: Convert Amlogic Meson GPIO interrupt controller binding

Quoted 102 lines · Rob Herring
Quoted 101 lines · Heiner Kallweit

Convert Amlogic Meson GPIO interrupt controller binding to yaml.

---
v2:
- consider that more than one compatible may be set
- remove bus part from example
v3:
- remove minItem/maxItem properties for compatible

---
 .../amlogic,meson-gpio-intc.txt               | 38 ---------
 .../amlogic,meson-gpio-intc.yaml              | 84 +++++++++++++++++++
 2 files changed, 84 insertions(+), 38 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt deleted +0 -38
deleted file mode 100644
index bde63f8f0..000000000
@@ -1,38 +0,0 @@
-Amlogic meson GPIO interrupt controller
-
-Meson SoCs contains an interrupt controller which is able to watch the SoC
-pads and generate an interrupt on edge or level. The controller is essentially
-a 256 pads to 8 GIC interrupt multiplexer, with a filter block to select edge
-or level and polarity. It does not expose all 256 mux inputs because the
-documentation shows that the upper part is not mapped to any pad. The actual
-number of interrupt exposed depends on the SoC.
-
-Required properties:
-
-- compatible : must have "amlogic,meson8-gpio-intc" and either
-    "amlogic,meson8-gpio-intc" for meson8 SoCs (S802) or
-    "amlogic,meson8b-gpio-intc" for meson8b SoCs (S805) or
-    "amlogic,meson-gxbb-gpio-intc" for GXBB SoCs (S905) or
-    "amlogic,meson-gxl-gpio-intc" for GXL SoCs (S905X, S912)
-    "amlogic,meson-axg-gpio-intc" for AXG SoCs (A113D, A113X)
-    "amlogic,meson-g12a-gpio-intc" for G12A SoCs (S905D2, S905X2, S905Y2)
-    "amlogic,meson-sm1-gpio-intc" for SM1 SoCs (S905D3, S905X3, S905Y3)
-    "amlogic,meson-a1-gpio-intc" for A1 SoCs (A113L)
-    "amlogic,meson-s4-gpio-intc" for S4 SoCs (S802X2, S905Y4, S805X2G, S905W2)
-- reg : Specifies base physical address and size of the registers.
-- interrupt-controller : Identifies the node as an interrupt controller.
-- #interrupt-cells : Specifies the number of cells needed to encode an
-   interrupt source. The value must be 2.
-- meson,channel-interrupts: Array with the 8 upstream hwirq numbers. These
-   are the hwirqs used on the parent interrupt controller.
-
-Example:
-
-gpio_interrupt: interrupt-controller@9880 {
-	compatible = "amlogic,meson-gxbb-gpio-intc",
-		     "amlogic,meson-gpio-intc";
-	reg = <0x0 0x9880 0x0 0x10>;
-	interrupt-controller;
-	#interrupt-cells = <2>;
-	meson,channel-interrupts = <64 65 66 67 68 69 70 71>;
-};
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +35 -0
new file mode 100644
index 000000000..da55a2d25
@@ -0,0 +1,84 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/interrupt-controller/amlogic,meson-gpio-intc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Meson GPIO interrupt controller
+
+maintainers:
+  - Heiner Kallweit <[email protected]>
+
+description: |
+  Meson SoCs contains an interrupt controller which is able to watch the SoC
+  pads and generate an interrupt on edge or level. The controller is essentially
+  a 256 pads to 8 GIC interrupt multiplexer, with a filter block to select edge
+  or level and polarity. It does not expose all 256 mux inputs because the
+  documentation shows that the upper part is not mapped to any pad. The actual
+  number of interrupt exposed depends on the SoC.
+
+allOf:
+  - $ref: /schemas/interrupt-controller.yaml#
+
+properties:
+  compatible:
+    oneOf:
+      - items:
+          - enum:
+              - amlogic,meson-gpio-intc
+              - amlogic,meson8-gpio-intc
+              - amlogic,meson8b-gpio-intc
+              - amlogic,meson-gxbb-gpio-intc
+              - amlogic,meson-gxl-gpio-intc
+              - amlogic,meson-axg-gpio-intc
+              - amlogic,meson-g12a-gpio-intc
+              - amlogic,meson-sm1-gpio-intc
Quoted 9 lines

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml line 40

Quoted 5 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +5 -0
+              - amlogic,meson-a1-gpio-intc
+              - amlogic,meson-s4-gpio-intc
+      - items:
+          - enum:
+              - amlogic,meson8-gpio-intc

We allow this with or without a fallback? Again, that should not be allowed and any dts files fixed.

I'll check this and will see if and which dts files need fixing.

Quoted 16 lines

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml line 51

Quoted 11 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +11 -0
+              - amlogic,meson-axg-gpio-intc
+              - amlogic,meson-g12a-gpio-intc
+              - amlogic,meson-sm1-gpio-intc
+              - amlogic,meson-s4-gpio-intc
+          - const: amlogic,meson-gpio-intc
+      - items:
+          - const: amlogic,meson-gpio-intc
+          - enum:
+              - amlogic,meson8b-gpio-intc
+              - amlogic,meson-gxbb-gpio-intc
+              - amlogic,meson-gxl-gpio-intc

This looks wrong. The order is most specific to least specific compatible. amlogic,meson-gpio-intc is more specific (or a superset of) than amlogic,meson8b-gpio-intc?

Quoted 13 lines

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml line 61

Quoted 10 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +10 -0
+
+  reg:
+    maxItems: 1
+
+  interrupt-controller: true
+
+  "#interrupt-cells":
+    const: 2
+
+  amlogic,channel-interrupts:

This was 'meson', not 'amlogic'. You can't just change things.

In driver and dts it has been 'amlogic' since 2017. Obviously the documentation has been wrong.

Quoted 2 lines

Really, 'interrupts' should have been used here, but oh well.

I remember there was a discussion back then on why 'interrupts' wouldn't be a good fit here. Don't remember the details, but the current naming is the result of a longer discussion.

Quoted 26 lines
Quoted 26 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +23 -0
+    description: Array with the upstream hwirq numbers
+    minItems: 8
+    maxItems: 12
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+
+required:
+  - compatible
+  - reg
+  - interrupt-controller
+  - "#interrupt-cells"
+  - amlogic,channel-interrupts
+
+additionalProperties: false
+
+examples:
+  - |
+    interrupt-controller@9880 {
+      compatible = "amlogic,meson-gxbb-gpio-intc";
+      reg = <0x9880 0x10>;
+      interrupt-controller;
+      #interrupt-cells = <2>;
+      amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
+    };
Signature · 1 line
2.39.1
maintainer
#35 lore raw

Re: [PATCH v3] dt-bindings: interrupt-controller: Convert Amlogic Meson GPIO interrupt controller binding

In reply to Rob Herring
Quoted 102 lines · Rob Herring
Quoted 101 lines · Heiner Kallweit

Convert Amlogic Meson GPIO interrupt controller binding to yaml.

---
v2:
- consider that more than one compatible may be set
- remove bus part from example
v3:
- remove minItem/maxItem properties for compatible

---
  .../amlogic,meson-gpio-intc.txt               | 38 ---------
  .../amlogic,meson-gpio-intc.yaml              | 84 +++++++++++++++++++
  2 files changed, 84 insertions(+), 38 deletions(-)

delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt deleted +0 -38
deleted file mode 100644
index bde63f8f0..000000000
@@ -1,38 +0,0 @@
-Amlogic meson GPIO interrupt controller
-
-Meson SoCs contains an interrupt controller which is able to watch the SoC
-pads and generate an interrupt on edge or level. The controller is essentially
-a 256 pads to 8 GIC interrupt multiplexer, with a filter block to select edge
-or level and polarity. It does not expose all 256 mux inputs because the
-documentation shows that the upper part is not mapped to any pad. The actual
-number of interrupt exposed depends on the SoC.
-
-Required properties:
-
-- compatible : must have "amlogic,meson8-gpio-intc" and either
-    "amlogic,meson8-gpio-intc" for meson8 SoCs (S802) or
-    "amlogic,meson8b-gpio-intc" for meson8b SoCs (S805) or
-    "amlogic,meson-gxbb-gpio-intc" for GXBB SoCs (S905) or
-    "amlogic,meson-gxl-gpio-intc" for GXL SoCs (S905X, S912)
-    "amlogic,meson-axg-gpio-intc" for AXG SoCs (A113D, A113X)
-    "amlogic,meson-g12a-gpio-intc" for G12A SoCs (S905D2, S905X2, S905Y2)
-    "amlogic,meson-sm1-gpio-intc" for SM1 SoCs (S905D3, S905X3, S905Y3)
-    "amlogic,meson-a1-gpio-intc" for A1 SoCs (A113L)
-    "amlogic,meson-s4-gpio-intc" for S4 SoCs (S802X2, S905Y4, S805X2G, S905W2)
-- reg : Specifies base physical address and size of the registers.
-- interrupt-controller : Identifies the node as an interrupt controller.
-- #interrupt-cells : Specifies the number of cells needed to encode an
-   interrupt source. The value must be 2.
-- meson,channel-interrupts: Array with the 8 upstream hwirq numbers. These
-   are the hwirqs used on the parent interrupt controller.
-
-Example:
-
-gpio_interrupt: interrupt-controller@9880 {
-	compatible = "amlogic,meson-gxbb-gpio-intc",
-		     "amlogic,meson-gpio-intc";
-	reg = <0x0 0x9880 0x0 0x10>;
-	interrupt-controller;
-	#interrupt-cells = <2>;
-	meson,channel-interrupts = <64 65 66 67 68 69 70 71>;
-};
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +35 -0
new file mode 100644
index 000000000..da55a2d25
@@ -0,0 +1,84 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/interrupt-controller/amlogic,meson-gpio-intc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Meson GPIO interrupt controller
+
+maintainers:
+  - Heiner Kallweit <[email protected]>
+
+description: |
+  Meson SoCs contains an interrupt controller which is able to watch the SoC
+  pads and generate an interrupt on edge or level. The controller is essentially
+  a 256 pads to 8 GIC interrupt multiplexer, with a filter block to select edge
+  or level and polarity. It does not expose all 256 mux inputs because the
+  documentation shows that the upper part is not mapped to any pad. The actual
+  number of interrupt exposed depends on the SoC.
+
+allOf:
+  - $ref: /schemas/interrupt-controller.yaml#
+
+properties:
+  compatible:
+    oneOf:
+      - items:
+          - enum:
+              - amlogic,meson-gpio-intc
+              - amlogic,meson8-gpio-intc
+              - amlogic,meson8b-gpio-intc
+              - amlogic,meson-gxbb-gpio-intc
+              - amlogic,meson-gxl-gpio-intc
+              - amlogic,meson-axg-gpio-intc
+              - amlogic,meson-g12a-gpio-intc
+              - amlogic,meson-sm1-gpio-intc
Quoted 8 lines

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml line 40

Quoted 5 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +5 -0
+              - amlogic,meson-a1-gpio-intc
+              - amlogic,meson-s4-gpio-intc
+      - items:
+          - enum:
+              - amlogic,meson8-gpio-intc

We allow this with or without a fallback? Again, that should not be allowed and any dts files fixed.

I'm not very open onto removing any compatible to the current DTs

Quoted 13 lines

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml line 51

Quoted 12 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +11 -0
+              - amlogic,meson-axg-gpio-intc
+              - amlogic,meson-g12a-gpio-intc
+              - amlogic,meson-sm1-gpio-intc
+              - amlogic,meson-s4-gpio-intc
+          - const: amlogic,meson-gpio-intc
+      - items:
+          - const: amlogic,meson-gpio-intc
+          - enum:
+              - amlogic,meson8b-gpio-intc
+              - amlogic,meson-gxbb-gpio-intc
+              - amlogic,meson-gxl-gpio-intc
Quoted 3 lines

This looks wrong. The order is most specific to least specific compatible. amlogic,meson-gpio-intc is more specific (or a superset of) than amlogic,meson8b-gpio-intc?

But changing order is OK I suppose.

Neil

Quoted 42 lines

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml line 61

Quoted 11 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +10 -0
+
+  reg:
+    maxItems: 1
+
+  interrupt-controller: true
+
+  "#interrupt-cells":
+    const: 2
+
+  amlogic,channel-interrupts:

This was 'meson', not 'amlogic'. You can't just change things.

Really, 'interrupts' should have been used here, but oh well.

Quoted 26 lines
Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml new file +23 -0
+    description: Array with the upstream hwirq numbers
+    minItems: 8
+    maxItems: 12
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+
+required:
+  - compatible
+  - reg
+  - interrupt-controller
+  - "#interrupt-cells"
+  - amlogic,channel-interrupts
+
+additionalProperties: false
+
+examples:
+  - |
+    interrupt-controller@9880 {
+      compatible = "amlogic,meson-gxbb-gpio-intc";
+      reg = <0x9880 0x10>;
+      interrupt-controller;
+      #interrupt-cells = <2>;
+      amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
+    };
Signature · 1 line
2.39.1
#36 lore raw

PATCH v3 1/1 dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding

In reply to Heiner Kallweit

Convert Amlogic Meson pinctrl binding to yaml.

---
v2:
- consider that more than one compatible can be set
- remove bus part from example
v3:
- remove minItem/maxItem properties for compatible

---
 .../pinctrl/amlogic,meson-pinctrl.yaml        | 122 ++++++++++++++++++
 .../bindings/pinctrl/meson,pinctrl.txt        |  94 --------------
 2 files changed, 122 insertions(+), 94 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +122 -0
new file mode 100644
index 000000000..7aaae606b
@@ -0,0 +1,122 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/amlogic,meson-pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Meson pinmux controller
+
+maintainers:
+  - Neil Armstrong <[email protected]>
+
+allOf:
+  - $ref: pinctrl.yaml#
+
+properties:
+  compatible:
+    oneOf:
+      - items:
+          - enum:
+              - amlogic,meson8-cbus-pinctrl
+              - amlogic,meson8b-cbus-pinctrl
+              - amlogic,meson8m2-cbus-pinctrl
+              - amlogic,meson8-aobus-pinctrl
+              - amlogic,meson8b-aobus-pinctrl
+              - amlogic,meson8m2-aobus-pinctrl
+              - amlogic,meson-gxbb-periphs-pinctrl
+              - amlogic,meson-gxbb-aobus-pinctrl
+              - amlogic,meson-gxl-periphs-pinctrl
+              - amlogic,meson-gxl-aobus-pinctrl
+              - amlogic,meson-axg-periphs-pinctrl
+              - amlogic,meson-axg-aobus-pinctrl
+              - amlogic,meson-g12a-periphs-pinctrl
+              - amlogic,meson-g12a-aobus-pinctrl
+              - amlogic,meson-a1-periphs-pinctrl
+              - amlogic,meson-s4-periphs-pinctrl
+      - items:
+          - const: amlogic,meson8m2-aobus-pinctrl
+          - const: amlogic,meson8-aobus-pinctrl
+      - items:
+          - const: amlogic,meson8m2-cbus-pinctrl
+          - const: amlogic,meson8-cbus-pinctrl
+
+  ranges: true
+
+  "#address-cells":
+    enum: [1, 2]
+
+  "#size-cells":
+    enum: [1, 2]
+
+required:
+  - compatible
+  - ranges
+  - "#address-cells"
+  - "#size-cells"
+
+additionalProperties:
+  anyOf:
+    - type: object
+      allOf:
+        - $ref: pincfg-node.yaml#
+        - $ref: pinmux-node.yaml#
+
+patternProperties:
+  "^bank@[0-9]$":
+    type: object
+    properties:
+      reg:
+        minItems: 5
+        maxItems: 5
+
+      reg-names:
+        items:
+          - const: gpio
+          - const: pull
+          - const: pull-enable
+          - const: mux
+          - const: ds
+
+      gpio-controller: true
+
+      "#gpio-cells":
+        const: 2
+
+      gpio-ranges:
+        $ref: /schemas/types.yaml#/definitions/phandle
+
+    required:
+      - reg
+      - reg-names
+      - gpio-controller
+      - "#gpio-cells"
+      - gpio-ranges
+
+examples:
+  - |
+    pinctrl {
+      compatible = "amlogic,meson-g12a-periphs-pinctrl";
+      #address-cells = <1>;
+      #size-cells = <1>;
+      ranges;
+
+      bank@40 {
+        reg = <0x0 0x40  0x0 0x4c>,
+              <0x0 0xe8  0x0 0x18>,
+              <0x0 0x120 0x0 0x18>,
+              <0x0 0x2c0 0x0 0x40>,
+              <0x0 0x340 0x0 0x1c>;
+        reg-names = "gpio", "pull", "pull-enable", "mux", "ds";
+        gpio-controller;
+        #gpio-cells = <2>;
+        gpio-ranges = <&periphs_pinctrl 0 0 86>;
+      };
+
+      cec_ao_a_h_pins: cec_ao_a_h {
+        mux {
+          groups = "cec_ao_a_h";
+          function = "cec_ao_a_h";
+          bias-disable;
+        };
+      };
+    };
Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt deleted +0 -94

94 lines not on this page · raw message

Signature · 1 line
2.39.1
maintainer
#37 lore raw

Re: [PATCH v3] dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding

Quoted 53 lines · Heiner Kallweit

Convert Amlogic Meson pinctrl binding to yaml.

---
v2:
- consider that more than one compatible can be set
- remove bus part from example
v3:
- remove minItem/maxItem properties for compatible

---
 .../pinctrl/amlogic,meson-pinctrl.yaml        | 122 ++++++++++++++++++
 .../bindings/pinctrl/meson,pinctrl.txt        |  94 --------------
 2 files changed, 122 insertions(+), 94 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +31 -0
new file mode 100644
index 000000000..7aaae606b
@@ -0,0 +1,122 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/amlogic,meson-pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Meson pinmux controller
+
+maintainers:
+  - Neil Armstrong <[email protected]>
+
+allOf:
+  - $ref: pinctrl.yaml#
+
+properties:
+  compatible:
+    oneOf:
+      - items:
+          - enum:
+              - amlogic,meson8-cbus-pinctrl
+              - amlogic,meson8b-cbus-pinctrl
+              - amlogic,meson8m2-cbus-pinctrl
+              - amlogic,meson8-aobus-pinctrl
+              - amlogic,meson8b-aobus-pinctrl
+              - amlogic,meson8m2-aobus-pinctrl
+              - amlogic,meson-gxbb-periphs-pinctrl
+              - amlogic,meson-gxbb-aobus-pinctrl
+              - amlogic,meson-gxl-periphs-pinctrl
+              - amlogic,meson-gxl-aobus-pinctrl
+              - amlogic,meson-axg-periphs-pinctrl
+              - amlogic,meson-axg-aobus-pinctrl

Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml line 41

Quoted 10 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +10 -0
+              - amlogic,meson-g12a-periphs-pinctrl
+              - amlogic,meson-g12a-aobus-pinctrl
+              - amlogic,meson-a1-periphs-pinctrl
+              - amlogic,meson-s4-periphs-pinctrl
+      - items:
+          - const: amlogic,meson8m2-aobus-pinctrl
+          - const: amlogic,meson8-aobus-pinctrl
+      - items:
+          - const: amlogic,meson8m2-cbus-pinctrl
+          - const: amlogic,meson8-cbus-pinctrl

Again, can't have both with and without the fallback allowed.

Quoted 7 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +7 -0
+
+  ranges: true
+
+  "#address-cells":
+    enum: [1, 2]
+
+  "#size-cells":

Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml line 58

Quoted 10 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +10 -0
+    enum: [1, 2]
+
+required:
+  - compatible
+  - ranges
+  - "#address-cells"
+  - "#size-cells"
+
+additionalProperties:
+  anyOf:

Don't need anyOf.

Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml line 65

Quoted 7 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +7 -0
+    - type: object
+      allOf:
+        - $ref: pincfg-node.yaml#
+        - $ref: pinmux-node.yaml#
+
+patternProperties:
+  "^bank@[0-9]$":

Unit addresses are hex.

Quoted 11 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +11 -0
+    type: object
+    properties:
+      reg:
+        minItems: 5
+        maxItems: 5
+
+      reg-names:
+        items:
+          - const: gpio
+          - const: pull
+          - const: pull-enable

Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml line 86

Quoted 10 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +10 -0
+          - const: mux
+          - const: ds
+
+      gpio-controller: true
+
+      "#gpio-cells":
+        const: 2
+
+      gpio-ranges:
+        $ref: /schemas/types.yaml#/definitions/phandle

Wrong type and gpio-ranges already has a type.

Quoted 36 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +36 -0
+
+    required:
+      - reg
+      - reg-names
+      - gpio-controller
+      - "#gpio-cells"
+      - gpio-ranges
+
+examples:
+  - |
+    pinctrl {
+      compatible = "amlogic,meson-g12a-periphs-pinctrl";
+      #address-cells = <1>;
+      #size-cells = <1>;
+      ranges;
+
+      bank@40 {
+        reg = <0x0 0x40  0x0 0x4c>,
+              <0x0 0xe8  0x0 0x18>,
+              <0x0 0x120 0x0 0x18>,
+              <0x0 0x2c0 0x0 0x40>,
+              <0x0 0x340 0x0 0x1c>;
+        reg-names = "gpio", "pull", "pull-enable", "mux", "ds";
+        gpio-controller;
+        #gpio-cells = <2>;
+        gpio-ranges = <&periphs_pinctrl 0 0 86>;
+      };
+
+      cec_ao_a_h_pins: cec_ao_a_h {
+        mux {
+          groups = "cec_ao_a_h";
+          function = "cec_ao_a_h";
+          bias-disable;
+        };
+      };
+    };
#38 lore raw

Re: [PATCH v3] dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding

Quoted 58 lines · Rob Herring
Quoted 57 lines · Heiner Kallweit

Convert Amlogic Meson pinctrl binding to yaml.

---
v2:
- consider that more than one compatible can be set
- remove bus part from example
v3:
- remove minItem/maxItem properties for compatible

---
 .../pinctrl/amlogic,meson-pinctrl.yaml        | 122 ++++++++++++++++++
 .../bindings/pinctrl/meson,pinctrl.txt        |  94 --------------
 2 files changed, 122 insertions(+), 94 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml
 delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +35 -0
new file mode 100644
index 000000000..7aaae606b
@@ -0,0 +1,122 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/amlogic,meson-pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Meson pinmux controller
+
+maintainers:
+  - Neil Armstrong <[email protected]>
+
+allOf:
+  - $ref: pinctrl.yaml#
+
+properties:
+  compatible:
+    oneOf:
+      - items:
+          - enum:
+              - amlogic,meson8-cbus-pinctrl
+              - amlogic,meson8b-cbus-pinctrl
+              - amlogic,meson8m2-cbus-pinctrl
+              - amlogic,meson8-aobus-pinctrl
+              - amlogic,meson8b-aobus-pinctrl
+              - amlogic,meson8m2-aobus-pinctrl
+              - amlogic,meson-gxbb-periphs-pinctrl
+              - amlogic,meson-gxbb-aobus-pinctrl
+              - amlogic,meson-gxl-periphs-pinctrl
+              - amlogic,meson-gxl-aobus-pinctrl
+              - amlogic,meson-axg-periphs-pinctrl
+              - amlogic,meson-axg-aobus-pinctrl
+              - amlogic,meson-g12a-periphs-pinctrl
+              - amlogic,meson-g12a-aobus-pinctrl
+              - amlogic,meson-a1-periphs-pinctrl
+              - amlogic,meson-s4-periphs-pinctrl
Quoted 9 lines

Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml line 41

Quoted 6 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +6 -0
+      - items:
+          - const: amlogic,meson8m2-aobus-pinctrl
+          - const: amlogic,meson8-aobus-pinctrl
+      - items:
+          - const: amlogic,meson8m2-cbus-pinctrl
+          - const: amlogic,meson8-cbus-pinctrl

Again, can't have both with and without the fallback allowed.

Hi Martin,

meson8m2 is the only chip version having a fallback for the pinctrl compatible. Is this fallback really needed? Looking at the driver it seems that both compatibles are handled identically.

#39 lore raw

Re: [PATCH v3] dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding

Hi Heiner,

On Wed, Feb 1, 2023 at 11:13 PM Heiner Kallweit <[email protected]> wrote:
[...]

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +6 -0
+      - items:
+          - const: amlogic,meson8m2-aobus-pinctrl
+          - const: amlogic,meson8-aobus-pinctrl
+      - items:
+          - const: amlogic,meson8m2-cbus-pinctrl
+          - const: amlogic,meson8-cbus-pinctrl
Quoted 8 lines
Quoted 2 lines

Again, can't have both with and without the fallback allowed.

Hi Martin,

meson8m2 is the only chip version having a fallback for the pinctrl compatible. Is this fallback really needed? Looking at the driver it seems that both compatibles are handled identically.

Back in the day we decided to duplicate the Meson8 driver code just to add four new pin functions that are added by the Meson8m2 SoC generation:
"eth_rxd2", "eth_rxd3", "eth_txd2", "eth_txd3"

The compatible string was defined with a similar approach: since Meson8m2 just adds a few bits to the Meson8 pin controller it's backwards compatible.

If the fallback has to be removed then I'm okay with that but I would like to understand it first.
So far I thought that Rob basically asked to remove the following two compatible strings from the enum (as they're listed separately with their fallbacks):
- amlogic,meson8m2-cbus-pinctrl
- amlogic,meson8m2-aobus-pinctrl

Best regards,
Martin

#40 lore raw

Re: [PATCH v3] dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding

Quoted 28 lines · Martin Blumenstingl

Hi Heiner,

On Wed, Feb 1, 2023 at 11:13 PM Heiner Kallweit <[email protected]> wrote:
[...]

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +6 -0
+      - items:
+          - const: amlogic,meson8m2-aobus-pinctrl
+          - const: amlogic,meson8-aobus-pinctrl
+      - items:
+          - const: amlogic,meson8m2-cbus-pinctrl
+          - const: amlogic,meson8-cbus-pinctrl
Quoted 8 lines
Quoted 2 lines

Again, can't have both with and without the fallback allowed.

Hi Martin,

meson8m2 is the only chip version having a fallback for the pinctrl compatible. Is this fallback really needed? Looking at the driver it seems that both compatibles are handled identically.

Back in the day we decided to duplicate the Meson8 driver code just to add four new pin functions that are added by the Meson8m2 SoC generation:
"eth_rxd2", "eth_rxd3", "eth_txd2", "eth_txd3"

The compatible string was defined with a similar approach: since Meson8m2 just adds a few bits to the Meson8 pin controller it's backwards compatible.

Quoted 8 lines

If the fallback has to be removed then I'm okay with that but I would like to understand it first.
So far I thought that Rob basically asked to remove the following two compatible strings from the enum (as they're listed separately with their fallbacks):
- amlogic,meson8m2-cbus-pinctrl
- amlogic,meson8m2-aobus-pinctrl

Right, this should be sufficient. There's no place where the 8m2 pinctrl compatibles are used w/o fallback.

Then the hopefully final version of the binding is almost ready. I'm just still checking whether there's any way in yaml to specify a reg-names list with mandatory and optional names. Doesn't seem so.

Quoted 3 lines

Best regards,
Martin

Heiner

#41 lore raw

Re: [PATCH v3] dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding

Quoted 40 lines · Heiner Kallweit
Quoted 28 lines · Martin Blumenstingl

Hi Heiner,

On Wed, Feb 1, 2023 at 11:13 PM Heiner Kallweit <[email protected]> wrote:
[...]

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +6 -0
+      - items:
+          - const: amlogic,meson8m2-aobus-pinctrl
+          - const: amlogic,meson8-aobus-pinctrl
+      - items:
+          - const: amlogic,meson8m2-cbus-pinctrl
+          - const: amlogic,meson8-cbus-pinctrl
Quoted 8 lines
Quoted 2 lines

Again, can't have both with and without the fallback allowed.

Hi Martin,

meson8m2 is the only chip version having a fallback for the pinctrl compatible. Is this fallback really needed? Looking at the driver it seems that both compatibles are handled identically.

Back in the day we decided to duplicate the Meson8 driver code just to add four new pin functions that are added by the Meson8m2 SoC generation:
"eth_rxd2", "eth_rxd3", "eth_txd2", "eth_txd3"

The compatible string was defined with a similar approach: since Meson8m2 just adds a few bits to the Meson8 pin controller it's backwards compatible.

Quoted 8 lines

If the fallback has to be removed then I'm okay with that but I would like to understand it first.
So far I thought that Rob basically asked to remove the following two compatible strings from the enum (as they're listed separately with their fallbacks):
- amlogic,meson8m2-cbus-pinctrl
- amlogic,meson8m2-aobus-pinctrl

Quoted 6 lines

Right, this should be sufficient. There's no place where the 8m2 pinctrl compatibles are used w/o fallback.

Then the hopefully final version of the binding is almost ready. I'm just still checking whether there's any way in yaml to specify a reg-names list with mandatory and optional names. Doesn't seem so.

It’s possible with minItems/maxItems and allOf:if/else to specify different min/max for each compatible

Neil

Quoted 6 lines
Quoted 4 lines

Best regards,
Martin

Heiner

#42 lore raw

Re: [PATCH v3] dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding

Quoted 40 lines · Neil Armstrong
Quoted 40 lines · Heiner Kallweit
Quoted 36 lines · Martin Blumenstingl

Hi Heiner,

On Wed, Feb 1, 2023 at 11:13 PM Heiner Kallweit <[email protected]> wrote:
[...]

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml new file +6 -0
+      - items:
+          - const: amlogic,meson8m2-aobus-pinctrl
+          - const: amlogic,meson8-aobus-pinctrl
+      - items:
+          - const: amlogic,meson8m2-cbus-pinctrl
+          - const: amlogic,meson8-cbus-pinctrl
Quoted 8 lines
Quoted 2 lines

Again, can't have both with and without the fallback allowed.

Hi Martin,

meson8m2 is the only chip version having a fallback for the pinctrl compatible. Is this fallback really needed? Looking at the driver it seems that both compatibles are handled identically.

Back in the day we decided to duplicate the Meson8 driver code just to add four new pin functions that are added by the Meson8m2 SoC generation:
"eth_rxd2", "eth_rxd3", "eth_txd2", "eth_txd3"

The compatible string was defined with a similar approach: since Meson8m2 just adds a few bits to the Meson8 pin controller it's backwards compatible.

If the fallback has to be removed then I'm okay with that but I would like to understand it first.
So far I thought that Rob basically asked to remove the following two compatible strings from the enum (as they're listed separately with their fallbacks):
- amlogic,meson8m2-cbus-pinctrl
- amlogic,meson8m2-aobus-pinctrl

Quoted 9 lines
Quoted 6 lines

Right, this should be sufficient. There's no place where the 8m2 pinctrl compatibles are used w/o fallback.

Then the hopefully final version of the binding is almost ready. I'm just still checking whether there's any way in yaml to specify a reg-names list with mandatory and optional names. Doesn't seem so.

It’s possible with minItems/maxItems and allOf:if/else to specify different min/max for each compatible

I have a problem here because reg-names is in the gpio-controller child node and compatible is in the pinctrl parent node. An expression under patternProperties doesn't see the compatible property of the parent node. It would have been better to place regs/reg-names in the pinctrl node. Not sure how to deal with this. The easiest would be to just have minItems:2 and maxItems:5 as criteria for regs and reg-names.

maintainer
#43 lore raw

Re: [PATCH v3] dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding

Quoted 48 lines · Heiner Kallweit
Quoted 47 lines · Neil Armstrong
Quoted 46 lines · Heiner Kallweit
Quoted 28 lines · Martin Blumenstingl

Hi Heiner,

On Wed, Feb 1, 2023 at 11:13 PM Heiner Kallweit <[email protected]> wrote:
[...]

Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
(quoted diff) +6 -0
+      - items:
+          - const: amlogic,meson8m2-aobus-pinctrl
+          - const: amlogic,meson8-aobus-pinctrl
+      - items:
+          - const: amlogic,meson8m2-cbus-pinctrl
+          - const: amlogic,meson8-cbus-pinctrl
Quoted 8 lines
Quoted 2 lines

Again, can't have both with and without the fallback allowed.

Hi Martin,

meson8m2 is the only chip version having a fallback for the pinctrl compatible. Is this fallback really needed? Looking at the driver it seems that both compatibles are handled identically.

Back in the day we decided to duplicate the Meson8 driver code just to add four new pin functions that are added by the Meson8m2 SoC generation:
"eth_rxd2", "eth_rxd3", "eth_txd2", "eth_txd3"

The compatible string was defined with a similar approach: since Meson8m2 just adds a few bits to the Meson8 pin controller it's backwards compatible.

Quoted 8 lines

If the fallback has to be removed then I'm okay with that but I would like to understand it first.
So far I thought that Rob basically asked to remove the following two compatible strings from the enum (as they're listed separately with their fallbacks):
- amlogic,meson8m2-cbus-pinctrl
- amlogic,meson8m2-aobus-pinctrl

Right, this should be sufficient. There's no place where the 8m2 pinctrl compatibles are used w/o fallback.

Then the hopefully final version of the binding is almost ready. I'm just still checking whether there's any way in yaml to specify a reg-names list with mandatory and optional names. Doesn't seem so.

Quoted 8 lines
Quoted 2 lines

It’s possible with minItems/maxItems and allOf:if/else to specify different min/max for each compatible

I have a problem here because reg-names is in the gpio-controller child node and compatible is in the pinctrl parent node. An expression under patternProperties doesn't see the compatible property of the parent node. It would have been better to place regs/reg-names in the pinctrl node. Not sure how to deal with this. The easiest would be to just have minItems:2 and maxItems:5 as criteria for regs and reg-names.

In this case, either you add 2 yaml bindings with perhaps a common yaml using allOf:ref or you add some complex matching but I think you should split it in 3 files like:

================================================================
amlogic,meson-pinctrl-common.yaml:
...

properties:
ranges: true

"#address-cells":

    enum: [1, 2]

"#size-cells":

    enum: [1, 2]

patternProperties:
"-state$":
allOf:
- $ref: pincfg-node.yaml#
- $ref: pinmux-node.yaml#

allOf:
- $ref: pinctrl.yaml#

required:
- compatible
- ranges
- "#address-cells"
- "#size-cells"

additionalProperties: true

$defs:
meson-gpio:
type: object
properties:
gpio-controller: true

"#gpio-cells":
const: 2

gpio-ranges:
$ref: /schemas/types.yaml#/definitions/phandle

required:
- gpio-controller
- "#gpio-cells"
- gpio-ranges
...

================================================================
amlogic,meson8-cbus-pinctrl.yaml:

...
$ref: amlogic,meson-pinctrl-common.yaml#

properties:
compatible:
oneOf:
- items:
- enum:
- amlogic,meson8-cbus-pinctrl
- amlogic,meson8b-cbus-pinctrl
- amlogic,meson8-aobus-pinctrl
- amlogic,meson8b-aobus-pinctrl
- items:
- const: amlogic,meson8m2-aobus-pinctrl
- const: amlogic,meson8-aobus-pinctrl
- items:
- const: amlogic,meson8m2-cbus-pinctrl
- const: amlogic,meson8-cbus-pinctrl

required:
- compatible

patternProperties:
"^bank@[0-9]$":
$ref: "#/$defs/meson-gpio"

properties:
reg:
maxItems: 2

reg-names:
items:
- const: gpio
- const: pull

required:
- reg
- reg-names
...

================================================================
amlogic,meson-gxbb-periphs-pinctrl.yaml:

...
$ref: amlogic,meson-pinctrl-common.yaml#

properties:
compatible:
items:
- enum:
- amlogic,meson-gxbb-periphs-pinctrl
- amlogic,meson-gxbb-aobus-pinctrl
- amlogic,meson-gxl-periphs-pinctrl
- amlogic,meson-gxl-aobus-pinctrl
- amlogic,meson-axg-periphs-pinctrl
- amlogic,meson-axg-aobus-pinctrl
- amlogic,meson-g12a-periphs-pinctrl
- amlogic,meson-g12a-aobus-pinctrl
- amlogic,meson-a1-periphs-pinctrl
- amlogic,meson-s4-periphs-pinctrl

required:
- compatible

patternProperties:
"^bank@[0-9]$":
$ref: "#/$defs/meson-gpio"

properties:
reg:
minItems: 5

reg-names:
items:
- const: gpio
- const: pull
- const: pull-enable
- const: mux
- const: ds

required:
- reg
- reg-names
...
================================================================

You may even add a 4th file for G12/A1 is reg-names need a different count.

Neil

maintainer
#44 lore raw

Re: [PATCH v3] dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding

In reply to Heiner Kallweit

Hi Heiner,

Quoted 9 lines · Heiner Kallweit

Convert Amlogic Meson pinctrl binding to yaml.

---
v2:
- consider that more than one compatible can be set
- remove bus part from example
v3:
- remove minItem/maxItem properties for compatible

Quoted 7 lines
---
  .../pinctrl/amlogic,meson-pinctrl.yaml        | 122 ++++++++++++++++++
  .../bindings/pinctrl/meson,pinctrl.txt        |  94 --------------
  2 files changed, 122 insertions(+), 94 deletions(-)

create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt

<snip>

Please send new versions as separate threads, or keep the same thread structure othwerwise it highly confuses humans & b4 when applying the patches...

Assuming new revision: v2 ([PATCH v2] dt-bindings: pwm: Convert Amlogic Meson PWM binding)
Assuming new revision: v4 ([PATCH v3] dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding)
Assuming new revision: v5 ([PATCH v2] dt-bindings: interrupt-controller: Convert Amlogic Meson GPIO interrupt controller binding) Assuming new revision: v6 ([PATCH v3] dt-bindings: interrupt-controller: Convert Amlogic Meson GPIO interrupt controller binding) Assuming new revision: v7 ([PATCH v2] dt-bindings: pinctrl: Convert Amlogic Meson pinctrl binding)

Thanks,
Neil

maintainer Applied
#45 lore raw
In reply to Heiner Kallweit

Hi,

Quoted 18 lines · Heiner Kallweit

At first adjust some existing dtbs's so that they pass dtbs_check after switching bindings to yaml.

Then switch further Amlogic Meson bindings to yaml. Tested with make targets dt_binding_check and dtbs_check.

Heiner Kallweit (8):
arm64: dts: meson-gx: Remove invalid pwm compatible
arm64: dts: amlogic: Fix non-compliant SD/SDIO node names
arm64: dts: meson-gx: Set only one compatible string for mmc
arm64: dts: amlogic: Remove invalid compatible string
amlogic,meson-gpio-intc
dt-bindings: rtc: Add Amlogic Meson vrtc controller binding
dt-bindings: pwm: Add Amlogic Meson PWM binding
dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt
controller binding
dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding

Quoted 1 line

[...]

Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.5/drivers)

[1/1] dt-bindings: interrupt-controller: Convert Amlogic Meson GPIO interrupt controller binding

      https://git.kernel.org/amlogic/c/6b0139b372d40bd5dafc140b6618b57d13211168

These changes has been applied on the intermediate git tree [1].

The v6.5/drivers branch will then be sent via a formal Pull Request to the Linux SoC maintainers for inclusion in their intermediate git branches in order to be sent to Linus during the next merge window, or sooner if it's a set of fixes.

In the cases of fixes, those will be merged in the current release candidate kernel and as soon they appear on the Linux master branch they will be backported to the previous Stable and Long-Stable kernels [2].

The intermediate git branches are merged daily in the linux-next tree [3], people are encouraged testing these pre-release kernels and report issues on the relevant mailing-lists.

If problems are discovered on those changes, please submit a signed-off-by revert patch followed by a corrective changeset.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

Signature · 7 lines
Neil


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel