Skip to contentSkip to conversation

dt-bindings: arm: fsl: document i.MX7S boards

PATCH Applied Krzysztof Kozlowski 2 participants 3 messages Nov 10, 2020 – Nov 16, 2020

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

PATCH v2 1/2 dt-bindings: arm: fsl: document i.MX7S boards

Document and adjust the compatibles for i.MX7S based boards. The Toradex boards use multiple compatibles.

---

Changes since v1:
1. Rebase,
2. Add Rob's review.

---
 Documentation/devicetree/bindings/arm/fsl.yaml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/arm/fsl.yaml +9 -3
index e4db0f9ed664..1977a23c2c53 100644
@@ -579,9 +579,15 @@ properties:
       - description: i.MX7S based Boards
         items:
           - enum:
-              - toradex,colibri-imx7s           # Colibri iMX7 Solo Module
-              - toradex,colibri-imx7s-aster     # Colibri iMX7 Solo Module on Aster Carrier Board
-              - toradex,colibri-imx7s-eval-v3   # Colibri iMX7 Solo Module on Colibri Evaluation Board V3
+              - element14,imx7s-warp      # Element14 Warp i.MX7 Board
+          - const: fsl,imx7s
+
+      - description: i.MX7S Boards with Toradex Colibri iMX7S Module
+        items:
+          - enum:
+              - toradex,colibri-imx7s-aster     # Module on Aster Carrier Board
+              - toradex,colibri-imx7s-eval-v3   # Module on Colibri Evaluation Board V3
+          - const: toradex,colibri-imx7s
           - const: fsl,imx7s
 
       - description: TQ-Systems TQMa7S SoM on MBa7x board
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 2/2 ARM: dts: imx6q-pico: fix board compatibles

There are four flavors of TechNexion PICO-IMX6 boards. They have their own DTSes, even though in Dwarf, Nymph and Pi are exactly the same. They also have their own bindings so adjust the compatibles to match the bindings.

---

Changes since v1:
1. None

---
 arch/arm/boot/dts/imx6q-pico-dwarf.dts  | 2 +-
 arch/arm/boot/dts/imx6q-pico-hobbit.dts | 2 +-
 arch/arm/boot/dts/imx6q-pico-nymph.dts  | 2 +-
 arch/arm/boot/dts/imx6q-pico-pi.dts     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx6q-pico-dwarf.dts +1 -1
index 618d2743e1e9..479a63ed42af 100644
@@ -13,5 +13,5 @@
 
 / {
 	model = "TechNexion PICO-IMX6 Quad Board and Dwarf baseboard";
-	compatible = "technexion,imx6q-pico", "fsl,imx6q";
+	compatible = "technexion,imx6q-pico-dwarf", "fsl,imx6q";
 };
arch/arm/boot/dts/imx6q-pico-hobbit.dts +1 -1
index 7a666507b456..b767131068f5 100644
@@ -13,5 +13,5 @@
 
 / {
 	model = "TechNexion PICO-IMX6 Quad Board and Hobbit baseboard";
-	compatible = "technexion,imx6q-pico", "fsl,imx6q";
+	compatible = "technexion,imx6q-pico-hobbit", "fsl,imx6q";
 };
arch/arm/boot/dts/imx6q-pico-nymph.dts +1 -1
index fe5a7becc9e5..e8ad4c12b263 100644
@@ -13,5 +13,5 @@
 
 / {
 	model = "TechNexion PICO-IMX6 Quad Board and Nymph baseboard";
-	compatible = "technexion,imx6q-pico", "fsl,imx6q";
+	compatible = "technexion,imx6q-pico-nymph", "fsl,imx6q";
 };
arch/arm/boot/dts/imx6q-pico-pi.dts +1 -1
index 9413f0a68f54..cc2394ddad6c 100644
@@ -13,5 +13,5 @@
 
 / {
 	model = "TechNexion PICO-IMX6 Quad Board and PI baseboard";
-	compatible = "technexion,imx6q-pico", "fsl,imx6q";
+	compatible = "technexion,imx6q-pico-pi", "fsl,imx6q";
 };
Signature · 1 line
2.25.1
Applied
#2 lore raw
In reply to Krzysztof Kozlowski
Quoted 5 lines · Krzysztof Kozlowski

Document and adjust the compatibles for i.MX7S based boards. The Toradex boards use multiple compatibles.

Applied both, thanks.

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