Skip to contentSkip to conversation

ARM: dts: imx6: phycore: Make use of upstream devicetree

PATCH Applied Stefan Riedmueller 2 participants 3 messages Nov 12, 2019 – Nov 13, 2019

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

PATCH 1/2 ARM: dts: imx6: phycore: Make use of upstream devicetree

Make use of the upstream devicetree for the phyCORE-i.MX 6 and the phyBOARD-Mira to reduce code duplication. In this context also add a Mira devicetree for barebox to better differentiate between phyCORE related settings and baseboard related settings.

---
 arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts    |  23 +-
 arch/arm/dts/imx6dl-phytec-phycore-som-lc-emmc.dts |  20 +-
 arch/arm/dts/imx6dl-phytec-phycore-som-lc-nand.dts |  14 +-
 arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts    |  17 +-
 arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts     |  23 +-
 arch/arm/dts/imx6q-phytec-phycore-som-nand.dts     |  23 +-
 arch/arm/dts/imx6qdl-phytec-mira.dtsi              |  44 ++++
 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi       | 286 +++------------------
 arch/arm/dts/imx6qp-phytec-phycore-som-nand.dts    |  23 +-
 9 files changed, 94 insertions(+), 379 deletions(-)
 create mode 100644 arch/arm/dts/imx6qdl-phytec-mira.dtsi
arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts +2 -21
index 21cbb5f944c9..8ce0066c691d 100644
@@ -15,6 +15,7 @@
 #include <arm/imx6dl.dtsi>
 #include "imx6dl.dtsi"
 #include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
 #include "imx6qdl-phytec-state.dtsi"
 
 / {
@@ -22,10 +23,6 @@
 	compatible = "phytec,imx6dl-pcm058-emmc", "fsl,imx6dl";
 };
 
-&ecspi1 {
-	status = "okay";
-};
-
 &eeprom {
 	status = "okay";
 };
@@ -38,7 +35,7 @@
 	status = "okay";
 };
 
-&flash {
+&m25p80 {
 	status = "okay";
 };
 
@@ -52,22 +49,6 @@
 
 &usdhc1 {
 	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition@0 {
-			label = "barebox";
-			reg = <0x0 0xe0000>;
-		};
-
-		partition@e0000 {
-			label = "barebox-environment";
-			reg = <0xe0000 0x20000>;
-		};
-	};
 };
 
 &usdhc4 {
arch/arm/dts/imx6dl-phytec-phycore-som-lc-emmc.dts +2 -18
index b8efb95ee08a..bf3a03c4f62a 100644
@@ -9,6 +9,7 @@
 #include <arm/imx6dl.dtsi>
 #include "imx6dl.dtsi"
 #include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
 #include "imx6qdl-phytec-state.dtsi"
 
 / {
@@ -16,10 +17,6 @@
 	compatible = "phytec,imx6dl-pcm058-emmc", "fsl,imx6dl";
 };
 
-&ecspi1 {
-	status = "okay";
-};
-
 &eeprom {
 	status = "okay";
 };
@@ -32,7 +29,7 @@
 	status = "okay";
 };
 
-&flash {
+&m25p80 {
 	status = "okay";
 };
 
@@ -46,19 +43,6 @@
 
 &usdhc1 {
 	status = "okay";
-
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	partition@0 {
-		label = "barebox";
-		reg = <0x0 0xe0000>;
-	};
-
-	partition@e0000 {
-		label = "barebox-environment";
-		reg = <0xe0000 0x20000>;
-	};
 };
 
 &usdhc4 {
arch/arm/dts/imx6dl-phytec-phycore-som-lc-nand.dts +1 -13
index 4d38d1698a48..654f6c152dee 100644
@@ -9,6 +9,7 @@
 #include <arm/imx6dl.dtsi>
 #include "imx6dl.dtsi"
 #include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
 #include "imx6qdl-phytec-state.dtsi"
 
 / {
@@ -42,17 +43,4 @@
 
 &usdhc1 {
 	status = "okay";
-
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	partition@0 {
-		label = "barebox";
-		reg = <0x0 0xe0000>;
-	};
-
-	partition@e0000 {
-		label = "barebox-environment";
-		reg = <0xe0000 0x20000>;
-	};
 };
arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts +1 -16
index 3ad3723d2893..18d14d6b945c 100644
@@ -14,6 +14,7 @@
 #include <arm/imx6dl.dtsi>
 #include "imx6dl.dtsi"
 #include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
 #include "imx6qdl-phytec-state.dtsi"
 
 / {
@@ -47,20 +48,4 @@
 
 &usdhc1 {
 	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition@0 {
-			label = "barebox";
-			reg = <0x0 0xe0000>;
-		};
-
-		partition@e0000 {
-			label = "barebox-environment";
-			reg = <0xe0000 0x20000>;
-		};
-	};
 };
arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts +2 -21
index 7a86d5b94daf..2ff4ae7a488a 100644
@@ -14,6 +14,7 @@
 #include <arm/imx6q.dtsi>
 #include "imx6q.dtsi"
 #include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
 #include "imx6qdl-phytec-state.dtsi"
 
 / {
@@ -21,10 +22,6 @@
 	compatible = "phytec,imx6q-pcm058-emmc", "fsl,imx6q";
 };
 
-&ecspi1 {
-	status = "okay";
-};
-
 &eeprom {
 	status = "okay";
 };
@@ -37,7 +34,7 @@
 	status = "okay";
 };
 
-&flash {
+&m25p80 {
 	status = "okay";
 };
 
@@ -51,22 +48,6 @@
 
 &usdhc1 {
 	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition@0 {
-			label = "barebox";
-			reg = <0x0 0xe0000>;
-		};
-
-		partition@e0000 {
-			label = "barebox-environment";
-			reg = <0xe0000 0x20000>;
-		};
-	};
 };
 
 &usdhc4 {
arch/arm/dts/imx6q-phytec-phycore-som-nand.dts +2 -21
index 96d1de224c9e..cc5ef7d11d30 100644
@@ -14,6 +14,7 @@
 #include <arm/imx6q.dtsi>
 #include "imx6q.dtsi"
 #include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
 #include "imx6qdl-phytec-state.dtsi"
 
 / {
@@ -22,10 +23,6 @@
 
 };
 
-&ecspi1 {
-	status = "okay";
-};
-
 &eeprom {
 	status = "okay";
 };
@@ -38,7 +35,7 @@
 	status = "okay";
 };
 
-&flash {
+&m25p80 {
 	status = "okay";
 };
 
@@ -56,20 +53,4 @@
 
 &usdhc1 {
 	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition@0 {
-			label = "barebox";
-			reg = <0x0 0xe0000>;
-		};
-
-		partition@e0000 {
-			label = "barebox-environment";
-			reg = <0xe0000 0x20000>;
-		};
-	};
 };
arch/arm/dts/imx6qdl-phytec-mira.dtsi new file +44 -0

44 lines not on this page · raw message

arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi +38 -248

343 lines not on this page · raw message

arch/arm/dts/imx6qp-phytec-phycore-som-nand.dts +2 -21
index 437457ce7522..410071192eee 100644
@@ -13,16 +13,13 @@
 /dts-v1/;
 #include <arm/imx6qp.dtsi>
 #include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
 
 / {
 	model = "Phytec phyCORE-i.MX6 Quad with NAND";
 	compatible = "phytec,imx6qp-pcm058-nand", "fsl,imx6qp";
 };
 
-&ecspi1 {
-	status = "okay";
-};
-
 &eeprom {
 	status = "okay";
 };
@@ -35,7 +32,7 @@
 	status = "okay";
 };
 
-&flash {
+&m25p80 {
 	status = "okay";
 };
 
@@ -53,20 +50,4 @@
 
 &usdhc1 {
 	status = "okay";
-
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition@0 {
-			label = "barebox";
-			reg = <0x0 0xe0000>;
-		};
-
-		partition@e0000 {
-			label = "barebox-environment";
-			reg = <0xe0000 0x20000>;
-		};
-	};
 };
Signature · 7 lines
2.7.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw

PATCH 2/2 ARM: dts: imx6: phycore: Update License, copyright and model description

Make use of SPDX license identifiers and update copyright notices and model descriptions of the phyCORE-i.MX 6 SOM's.

---
 arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts | 10 ++--------
 arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts | 13 ++++---------
 arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts  | 13 ++++---------
 arch/arm/dts/imx6q-phytec-phycore-som-nand.dts  | 13 ++++---------
 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi    | 11 +++--------
 arch/arm/dts/imx6qp-phytec-phycore-som-nand.dts | 12 +++---------
 6 files changed, 20 insertions(+), 52 deletions(-)
arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts +2 -8
index 8ce0066c691d..b2e86eae175a 100644
@@ -1,13 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later)
 /*
  * Copyright (C) 2015 PHYTEC Messtechnik GmbH,
  * Author: Stefan Christ <[email protected]>
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 /dts-v1/;
@@ -19,7 +13,7 @@
 #include "imx6qdl-phytec-state.dtsi"
 
 / {
-	model = "Phytec phyCORE-i.MX6 DualLite/SOLO with eMMC";
+	model = "PHYTEC phyCORE-i.MX6 DualLite/SOLO with eMMC";
 	compatible = "phytec,imx6dl-pcm058-emmc", "fsl,imx6dl";
 };
 
arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts +4 -9
index 18d14d6b945c..d747c837a535 100644
@@ -1,12 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later)
 /*
- * Copyright 2015 Christian Hemp, Phytec Messtechnik GmbH
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * Copyright (C) 2015 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <[email protected]>
  */
 
 /dts-v1/;
@@ -18,7 +13,7 @@
 #include "imx6qdl-phytec-state.dtsi"
 
 / {
-	model = "Phytec phyCORE-i.MX6 Duallite/SOLO with NAND";
+	model = "PHYTEC phyCORE-i.MX6 Duallite/SOLO with NAND";
 	compatible = "phytec,imx6dl-pcm058-nand", "fsl,imx6dl";
 };
 
arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts +4 -9
index 2ff4ae7a488a..0acc6493cc51 100644
@@ -1,12 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later)
 /*
- * Copyright 2015 Christian Hemp, Phytec Messtechnik GmbH
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * Copyright (C) 2015 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <[email protected]>
  */
 
 /dts-v1/;
@@ -18,7 +13,7 @@
 #include "imx6qdl-phytec-state.dtsi"
 
 / {
-	model = "Phytec phyCORE-i.MX6 Quad with eMMC";
+	model = "PHYTEC phyCORE-i.MX6 Quad with eMMC";
 	compatible = "phytec,imx6q-pcm058-emmc", "fsl,imx6q";
 };
 
arch/arm/dts/imx6q-phytec-phycore-som-nand.dts +4 -9
index cc5ef7d11d30..12f2b21f3b11 100644
@@ -1,12 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later)
 /*
- * Copyright 2015 Christian Hemp, Phytec Messtechnik GmbH
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * Copyright (C) 2015 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <[email protected]>
  */
 
 /dts-v1/;
@@ -18,7 +13,7 @@
 #include "imx6qdl-phytec-state.dtsi"
 
 / {
-	model = "Phytec phyCORE-i.MX6 Quad with NAND";
+	model = "PHYTEC phyCORE-i.MX6 Quad with NAND";
 	compatible = "phytec,imx6q-pcm058-nand", "fsl,imx6q";
 
 };
arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi +3 -8
index 3bb21ce8f761..69f252b42382 100644
@@ -1,12 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later)
 /*
- * Copyright 2015 Christian Hemp, Phytec Messtechnik GmbH
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * Copyright (C) 2015 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <[email protected]>
  */
 
 #include <arm/imx6qdl-phytec-phycore-som.dtsi>
arch/arm/dts/imx6qp-phytec-phycore-som-nand.dts +3 -9
index 410071192eee..13dbd2cb3b0d 100644
@@ -1,13 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later)
 /*
- * Copyright (C) 2016 Phytec Messtechnik GmbH
+ * Copyright (C) 2016 PHYTEC Messtechnik GmbH
  * Author: Christian Hemp <[email protected]>
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 /dts-v1/;
@@ -16,7 +10,7 @@
 #include "imx6qdl-phytec-mira.dtsi"
 
 / {
-	model = "Phytec phyCORE-i.MX6 Quad with NAND";
+	model = "PHYTEC phyCORE-i.MX6 QuadPlus with NAND";
 	compatible = "phytec,imx6qp-pcm058-nand", "fsl,imx6qp";
 };
 
Signature · 7 lines
2.7.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
maintainer Applied
#2 lore raw
In reply to Stefan Riedmueller
Quoted 6 lines · Stefan Riedmueller

Make use of the upstream devicetree for the phyCORE-i.MX 6 and the phyBOARD-Mira to reduce code duplication. In this context also add a Mira devicetree for barebox to better differentiate between phyCORE related settings and baseboard related settings.

Quoted 12 lines
---
 arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts    |  23 +-
 arch/arm/dts/imx6dl-phytec-phycore-som-lc-emmc.dts |  20 +-
 arch/arm/dts/imx6dl-phytec-phycore-som-lc-nand.dts |  14 +-
 arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts    |  17 +-
 arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts     |  23 +-
 arch/arm/dts/imx6q-phytec-phycore-som-nand.dts     |  23 +-
 arch/arm/dts/imx6qdl-phytec-mira.dtsi              |  44 ++++
 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi       | 286 +++------------------
 arch/arm/dts/imx6qp-phytec-phycore-som-nand.dts    |  23 +-
 9 files changed, 94 insertions(+), 379 deletions(-)
 create mode 100644 arch/arm/dts/imx6qdl-phytec-mira.dtsi

Applied, thanks

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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