diff mbox series

[RESEND,v3,2/2] dt-bindings: riscv: cpus: add ref to interrupt-controller

Message ID 20240523154748.22670-3-kanakshilledar111@protonmail.com (mailing list archive)
State Superseded
Headers show
Series dt-bindings: interrupt-controller: riscv,cpu-intc | expand

Checks

Context Check Description
conchuod/vmtest-for-next-PR fail PR summary
conchuod/patch-2-test-1 success .github/scripts/patches/tests/build_rv32_defconfig.sh
conchuod/patch-2-test-2 fail .github/scripts/patches/tests/build_rv64_clang_allmodconfig.sh
conchuod/patch-2-test-3 fail .github/scripts/patches/tests/build_rv64_gcc_allmodconfig.sh
conchuod/patch-2-test-4 success .github/scripts/patches/tests/build_rv64_nommu_k210_defconfig.sh
conchuod/patch-2-test-5 success .github/scripts/patches/tests/build_rv64_nommu_virt_defconfig.sh
conchuod/patch-2-test-6 warning .github/scripts/patches/tests/checkpatch.sh
conchuod/patch-2-test-7 success .github/scripts/patches/tests/dtb_warn_rv64.sh
conchuod/patch-2-test-8 success .github/scripts/patches/tests/header_inline.sh
conchuod/patch-2-test-9 success .github/scripts/patches/tests/kdoc.sh
conchuod/patch-2-test-10 success .github/scripts/patches/tests/module_param.sh
conchuod/patch-2-test-11 success .github/scripts/patches/tests/verify_fixes.sh
conchuod/patch-2-test-12 success .github/scripts/patches/tests/verify_signedoff.sh

Commit Message

Kanak Shilledar May 23, 2024, 3:47 p.m. UTC
removed the redundant properties for interrupt-controller
and provide reference to the riscv,cpu-intc.yaml which defines
the interrupt-controller. making the properties for riscv
interrupt-controller at a central place.

Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Kanak Shilledar <kanakshilledar111@protonmail.com>
---
Changes in v3:
- No change.
- Rolling out as RESEND.
Changes in v2:
- Fix warning of `type` is a required property during `make
dt_bindings_check`.
---
 .../interrupt-controller/riscv,cpu-intc.yaml  |  2 +-
 .../devicetree/bindings/riscv/cpus.yaml       | 21 +------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

Comments

Conor Dooley June 7, 2024, 2:11 p.m. UTC | #1
On Thu, May 23, 2024 at 09:17:50PM +0530, Kanak Shilledar wrote:
> removed the redundant properties for interrupt-controller
> and provide reference to the riscv,cpu-intc.yaml which defines
> the interrupt-controller. making the properties for riscv
> interrupt-controller at a central place.
> 
> Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
> Signed-off-by: Kanak Shilledar <kanakshilledar111@protonmail.com>
> ---
> Changes in v3:
> - No change.
> - Rolling out as RESEND.
> Changes in v2:
> - Fix warning of `type` is a required property during `make
> dt_bindings_check`.
> ---
>  .../interrupt-controller/riscv,cpu-intc.yaml  |  2 +-
>  .../devicetree/bindings/riscv/cpus.yaml       | 21 +------------------
>  2 files changed, 2 insertions(+), 21 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml b/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml
> index c9c79e0870ff..6c229f3c6735 100644
> --- a/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml
> +++ b/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml
> @@ -61,7 +61,7 @@ required:
>    - compatible
>    - '#interrupt-cells'
>    - interrupt-controller
> -  
> +

I tried to get Palmer to apply this the other day, but the series
somehow conflicts with itself, due to this hunk. When I apply patch 1/2
locally, this whitespace never appears in the file and so patch 2/2 has
a conflict:
	b4 shazam 20240523154748.22670-2-kanakshilledar111@protonmail.com
	Grabbing thread from lore.kernel.org/all/20240523154748.22670-2-kanakshilledar111@protonmail.com/t.mbox.gz
	Checking for newer revisions
	Grabbing search results from lore.kernel.org
	Analyzing 3 messages in the thread
	Looking for additional code-review trailers on lore.kernel.org
	Checking attestation on all messages, may take a moment...
	---
	  ✗ [PATCH v3 1/2] dt-bindings: interrupt-controller: riscv,cpu-intc: convert to dtschema
	    + Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
	  ✗ [PATCH v3 2/2] dt-bindings: riscv: cpus: add ref to interrupt-controller
	    + Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
	  ---
	  ✗ BADSIG: DKIM/gmail.com
	---
	Total patches: 2
	---
	 Base: using specified base-commit 20cb38a7af88dc40095da7c2c9094da3873fea23
	Applying: dt-bindings: interrupt-controller: riscv,cpu-intc: convert to dtschema
	Applying: dt-bindings: riscv: cpus: add ref to interrupt-controller
	Patch failed at 0002 dt-bindings: riscv: cpus: add ref to interrupt-controller
	When you have resolved this problem, run "git am --continue".
	If you prefer to skip this patch, run "git am --skip" instead.
	To restore the original branch and stop patching, run "git am --abort".
	error: patch failed: Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml:61
	error: Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml: patch does not apply
	hint: Use 'git am --show-current-patch=diff' to see the failed patch

He also pointed out that there's a from address mismatch in this patch,
given it was sent from gmail but the signoff is proton. Usually git
send-email will sort this out, provided you've set the protonmail
address as the author for the patch. I think usually this sort of issue
comes about when your signoff email isn't the same as user.email in your
gitconfig, but 100% on that.

Thanks,
Conor.
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml b/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml
index c9c79e0870ff..6c229f3c6735 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml
@@ -61,7 +61,7 @@  required:
   - compatible
   - '#interrupt-cells'
   - interrupt-controller
-  
+
 additionalProperties: false
 
 examples:
diff --git a/Documentation/devicetree/bindings/riscv/cpus.yaml b/Documentation/devicetree/bindings/riscv/cpus.yaml
index d87dd50f1a4b..f1241e5e8753 100644
--- a/Documentation/devicetree/bindings/riscv/cpus.yaml
+++ b/Documentation/devicetree/bindings/riscv/cpus.yaml
@@ -102,26 +102,7 @@  properties:
 
   interrupt-controller:
     type: object
-    additionalProperties: false
-    description: Describes the CPU's local interrupt controller
-
-    properties:
-      '#interrupt-cells':
-        const: 1
-
-      compatible:
-        oneOf:
-          - items:
-              - const: andestech,cpu-intc
-              - const: riscv,cpu-intc
-          - const: riscv,cpu-intc
-
-      interrupt-controller: true
-
-    required:
-      - '#interrupt-cells'
-      - compatible
-      - interrupt-controller
+    $ref: /schemas/interrupt-controller/riscv,cpu-intc.yaml#
 
   cpu-idle-states:
     $ref: /schemas/types.yaml#/definitions/phandle-array