[RESEND PATCH 2/2] dt-bindings: soc: altera: combine Intel's SoCFPGA into altera.yaml

[Dinh Nguyen <dinguyen@kernel.org>]

For all SoCFPGA platforms, whether it has the "intel" or "altr" vendor
prefix are referring to the same business unit that is responsible for
the platform. Thus, it would make sense to have the device bindings
documentation in the same location. Move the Intel AgileX board binding
documentations into the same file that contains the Altera ones.

Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
---
 .../bindings/arm/intel,socfpga.yaml           | 40 -------------------
 .../bindings/soc/altera/altera.yaml           | 28 ++++++++++++-
 2 files changed, 27 insertions(+), 41 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/intel,socfpga.yaml

diff --git a/Documentation/devicetree/bindings/arm/intel,socfpga.yaml b/Documentation/devicetree/bindings/arm/intel,socfpga.yaml
deleted file mode 100644
index c918837bd41c..000000000000
--- a/Documentation/devicetree/bindings/arm/intel,socfpga.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/arm/intel,socfpga.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: Intel SoCFPGA platform
-
-maintainers:
-  - Dinh Nguyen <dinguyen@kernel.org>
-
-properties:
-  $nodename:
-    const: "/"
-  compatible:
-    oneOf:
-      - description: AgileX boards
-        items:
-          - enum:
-              - intel,n5x-socdk
-              - intel,socfpga-agilex-n6000
-              - intel,socfpga-agilex-socdk
-          - const: intel,socfpga-agilex
-      - description: Agilex3 boards
-        items:
-          - enum:
-              - intel,socfpga-agilex3-socdk
-          - const: intel,socfpga-agilex3
-          - const: intel,socfpga-agilex5
-      - description: Agilex5 boards
-        items:
-          - enum:
-              - intel,socfpga-agilex5-socdk
-              - intel,socfpga-agilex5-socdk-013b
-              - intel,socfpga-agilex5-socdk-nand
-          - const: intel,socfpga-agilex5
-
-additionalProperties: true
-
-...
diff --git a/Documentation/devicetree/bindings/soc/altera/altera.yaml b/Documentation/devicetree/bindings/soc/altera/altera.yaml
index 7c6827837b95..a853ba3daf80 100644
--- a/Documentation/devicetree/bindings/soc/altera/altera.yaml
+++ b/Documentation/devicetree/bindings/soc/altera/altera.yaml
@@ -4,7 +4,10 @@
 $id: http://devicetree.org/schemas/soc/altera/altera.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Altera's SoCFPGA platform
+title: Intel/Altera's SoCFPGA platform
+
+description:
+  Intel/Altera boards with ARM 32/64 bit cores
 
 maintainers:
   - Dinh Nguyen <dinguyen@kernel.org>
@@ -86,6 +89,29 @@ properties:
           - const: altr,socfpga-vt
           - const: altr,socfpga
 
+      - description: AgileX boards
+        items:
+          - enum:
+              - intel,n5x-socdk
+              - intel,socfpga-agilex-n6000
+              - intel,socfpga-agilex-socdk
+          - const: intel,socfpga-agilex
+
+      - description: Agilex3 boards
+        items:
+          - enum:
+              - intel,socfpga-agilex3-socdk
+          - const: intel,socfpga-agilex3
+          - const: intel,socfpga-agilex5
+
+      - description: Agilex5 boards
+        items:
+          - enum:
+              - intel,socfpga-agilex5-socdk
+              - intel,socfpga-agilex5-socdk-013b
+              - intel,socfpga-agilex5-socdk-nand
+          - const: intel,socfpga-agilex5
+
 additionalProperties: true
 
 ...
-- 
2.42.0.411.g813d9a9188