mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/2] ARM: dts: drop skeleton.dtsi
@ 2019-09-10 10:06 Uwe Kleine-König
  2019-09-10 10:06 ` [PATCH 2/2] ARM: dts: imx25-karo-tx25: include Linux dts instead of duplicating it Uwe Kleine-König
  2019-09-12  6:20 ` [PATCH 1/2] ARM: dts: drop skeleton.dtsi Sascha Hauer
  0 siblings, 2 replies; 3+ messages in thread
From: Uwe Kleine-König @ 2019-09-10 10:06 UTC (permalink / raw)
  To: barebox

In the Linux dts files skeleton.dtsi was dropped (in commit abe60a3a7afb
("ARM: dts: Kill off skeleton{64}.dtsi") for v5.1-rc1). At least one
reason for this also applies for barebox: memory nodes are supposed to have
a unit address and so adding a memory node without address isn't sensible.

There are only four dtsi files that use skeleton.dtsi. Add some of the
nodes and properties defined in skeleton.dtsi to its includers. I dropped
adding empty alias nodes as neither barebox nor Linux depend on its
presence. All consumers override reg in the memory node, so add the
device_type property there. The remaining properties are added unchanged.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 arch/arm/dts/canon-a1100.dts     |  1 +
 arch/arm/dts/digic4.dtsi         |  7 +++++--
 arch/arm/dts/dm365.dtsi          |  7 +++++--
 arch/arm/dts/imx25-karo-tx25.dts |  1 +
 arch/arm/dts/imx25.dtsi          |  6 +++++-
 arch/arm/dts/k1879hb1ya.dtsi     | 11 +++++++++--
 arch/arm/dts/skeleton.dtsi       | 13 -------------
 arch/arm/dts/virt2real.dts       |  1 +
 8 files changed, 27 insertions(+), 20 deletions(-)
 delete mode 100644 arch/arm/dts/skeleton.dtsi

diff --git a/arch/arm/dts/canon-a1100.dts b/arch/arm/dts/canon-a1100.dts
index a88eacf4d4af..18ba495bcf7d 100644
--- a/arch/arm/dts/canon-a1100.dts
+++ b/arch/arm/dts/canon-a1100.dts
@@ -7,6 +7,7 @@
 	compatible = "canon,a1100";
 
 	memory {
+		device_type = "memory";
 		reg = <0x00000000 0x04000000>;
 	};
 
diff --git a/arch/arm/dts/digic4.dtsi b/arch/arm/dts/digic4.dtsi
index 21b004d4a293..2db9393b330a 100644
--- a/arch/arm/dts/digic4.dtsi
+++ b/arch/arm/dts/digic4.dtsi
@@ -1,8 +1,11 @@
-/include/ "skeleton.dtsi"
-
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	compatible = "canon,digic4";
 
+	chosen { };
+
 	timer0: timer@c0210000 {
 		compatible = "canon,digic-timer";
 		reg = <0xc0210000 0x1c>;
diff --git a/arch/arm/dts/dm365.dtsi b/arch/arm/dts/dm365.dtsi
index ea69007fa892..b03cc3efa9a9 100644
--- a/arch/arm/dts/dm365.dtsi
+++ b/arch/arm/dts/dm365.dtsi
@@ -1,6 +1,9 @@
-#include "skeleton.dtsi"
-
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	chosen { };
+
 	soc {
 		compatible = "simple-bus";
 		model = "TI TMS320DM365";
diff --git a/arch/arm/dts/imx25-karo-tx25.dts b/arch/arm/dts/imx25-karo-tx25.dts
index 9296e90b078a..35464e3a5c20 100644
--- a/arch/arm/dts/imx25-karo-tx25.dts
+++ b/arch/arm/dts/imx25-karo-tx25.dts
@@ -41,6 +41,7 @@
 	};
 
 	memory {
+		device_type = "memory";
 		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
 	};
 };
diff --git a/arch/arm/dts/imx25.dtsi b/arch/arm/dts/imx25.dtsi
index eb3046178031..033ffa50a035 100644
--- a/arch/arm/dts/imx25.dtsi
+++ b/arch/arm/dts/imx25.dtsi
@@ -9,10 +9,14 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include "skeleton.dtsi"
 #include <arm/imx25.dtsi>
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	chosen { };
+
 	aliases {
 		mmc0 = &esdhc1;
 		mmc2 = &esdhc2;
diff --git a/arch/arm/dts/k1879hb1ya.dtsi b/arch/arm/dts/k1879hb1ya.dtsi
index 83ba7fb399c7..7bbc31efc5ad 100644
--- a/arch/arm/dts/k1879hb1ya.dtsi
+++ b/arch/arm/dts/k1879hb1ya.dtsi
@@ -1,6 +1,13 @@
-#include "skeleton.dtsi"
-
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	chosen { };
+
+	memory {
+		device_type = "memory";
+	};
+
 	soc {
 		compatible = "simple-bus";
 		model = "RC Module K1879HB1YA";
diff --git a/arch/arm/dts/skeleton.dtsi b/arch/arm/dts/skeleton.dtsi
deleted file mode 100644
index b41d241de2cd..000000000000
--- a/arch/arm/dts/skeleton.dtsi
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Skeleton device tree; the bare minimum needed to boot; just include and
- * add a compatible value.  The bootloader will typically populate the memory
- * node.
- */
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	chosen { };
-	aliases { };
-	memory { device_type = "memory"; reg = <0 0>; };
-};
diff --git a/arch/arm/dts/virt2real.dts b/arch/arm/dts/virt2real.dts
index 09aec1f722fe..8f8c65ba7a74 100644
--- a/arch/arm/dts/virt2real.dts
+++ b/arch/arm/dts/virt2real.dts
@@ -6,6 +6,7 @@
 	model = "virt2real";
 
 	memory {
+		device_type = "memory";
 		reg = <0x82000000 0x01000000>;
 	};
 
-- 
2.23.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: dts: imx25-karo-tx25: include Linux dts instead of duplicating it
  2019-09-10 10:06 [PATCH 1/2] ARM: dts: drop skeleton.dtsi Uwe Kleine-König
@ 2019-09-10 10:06 ` Uwe Kleine-König
  2019-09-12  6:20 ` [PATCH 1/2] ARM: dts: drop skeleton.dtsi Sascha Hauer
  1 sibling, 0 replies; 3+ messages in thread
From: Uwe Kleine-König @ 2019-09-10 10:06 UTC (permalink / raw)
  To: barebox

This reduces duplicated information and benefits automatically from some
changes that were done in Linux since the board was last touched in
barebox. Also the intended differences are more obvious this way.

To not include dts/src/arm/imx25.dtsi twice (which undoes some intended
changes) it is necessary to drop the respective include from
arch/arm/dts/imx25.dtsi. This is not a problem as tx25 is its only
consumer.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 arch/arm/dts/imx25-karo-tx25.dts | 95 +-------------------------------
 arch/arm/dts/imx25.dtsi          |  2 -
 2 files changed, 1 insertion(+), 96 deletions(-)

diff --git a/arch/arm/dts/imx25-karo-tx25.dts b/arch/arm/dts/imx25-karo-tx25.dts
index 35464e3a5c20..2785a3c91a28 100644
--- a/arch/arm/dts/imx25-karo-tx25.dts
+++ b/arch/arm/dts/imx25-karo-tx25.dts
@@ -9,103 +9,16 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-/dts-v1/;
+#include <arm/imx25-karo-tx25.dts>
 #include "imx25.dtsi"
 
 / {
-	model = "Ka-Ro TX25";
-	compatible = "karo,imx25-tx25", "fsl,imx25";
-
 	chosen {
-		stdout-path = &uart1;
-
 		environment {
 			compatible = "barebox,environment";
 			device-path = &nfc, "partname:environment";
 		};
 	};
-
-	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		reg_fec_phy: regulator@0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "fec-phy";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			gpio = <&gpio4 9 0>;
-		};
-	};
-
-	memory {
-		device_type = "memory";
-		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
-	};
-};
-
-&iomuxc {
-	pinctrl_uart1: uart1grp {
-		fsl,pins = <
-			MX25_PAD_UART1_TXD__UART1_TXD 0x80000000
-			MX25_PAD_UART1_RXD__UART1_RXD 0x80000000
-			MX25_PAD_UART1_CTS__UART1_CTS 0x80000000
-			MX25_PAD_UART1_RTS__UART1_RTS 0x80000000
-		>;
-	};
-
-	pinctrl_fec: fecgrp {
-		fsl,pins = <
-			MX25_PAD_D11__GPIO_4_9		0x80000000 /* FEC PHY power on pin */
-			MX25_PAD_D13__GPIO_4_7		0x80000000 /* FEC reset */
-			MX25_PAD_FEC_MDC__FEC_MDC	0x80000000
-			MX25_PAD_FEC_MDIO__FEC_MDIO	0x80000000
-			MX25_PAD_FEC_TDATA0__FEC_TDATA0	0x80000000
-			MX25_PAD_FEC_TDATA1__FEC_TDATA1	0x80000000
-			MX25_PAD_FEC_TX_EN__FEC_TX_EN	0x80000000
-			MX25_PAD_FEC_RDATA0__FEC_RDATA0	0x80000000
-			MX25_PAD_FEC_RDATA1__FEC_RDATA1	0x80000000
-			MX25_PAD_FEC_RX_DV__FEC_RX_DV	0x80000000
-			MX25_PAD_FEC_TX_CLK__FEC_TX_CLK	0x80000000
-		>;
-	};
-
-	pinctrl_nfc: nfcgrp {
-		fsl,pins = <
-			MX25_PAD_NF_CE0__NF_CE0		0x80000000
-			MX25_PAD_NFWE_B__NFWE_B		0x80000000
-			MX25_PAD_NFRE_B__NFRE_B		0x80000000
-			MX25_PAD_NFALE__NFALE		0x80000000
-			MX25_PAD_NFCLE__NFCLE		0x80000000
-			MX25_PAD_NFWP_B__NFWP_B		0x80000000
-			MX25_PAD_NFRB__NFRB		0x80000000
-			MX25_PAD_D7__D7			0x80000000
-			MX25_PAD_D6__D6			0x80000000
-			MX25_PAD_D5__D5			0x80000000
-			MX25_PAD_D4__D4			0x80000000
-			MX25_PAD_D3__D3			0x80000000
-			MX25_PAD_D2__D2			0x80000000
-			MX25_PAD_D1__D1			0x80000000
-			MX25_PAD_D0__D0			0x80000000
-		>;
-	};
-};
-
-&uart1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_uart1>;
-	status = "okay";
-};
-
-&fec {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_fec>;
-	phy-reset-gpios = <&gpio4 7 0>;
-	phy-mode = "rmii";
-	phy-supply = <&reg_fec_phy>;
-	status = "okay";
 };
 
 &iim {
@@ -113,14 +26,8 @@
 };
 
 &nfc {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_nfc>;
 	#address-cells = <1>;
 	#size-cells = <1>;
-	nand-on-flash-bbt;
-	nand-ecc-mode = "hw";
-	nand-bus-width = <8>;
-	status = "okay";
 
 	partition@0 {
 		label = "boot";
diff --git a/arch/arm/dts/imx25.dtsi b/arch/arm/dts/imx25.dtsi
index 033ffa50a035..e72dbd5f3686 100644
--- a/arch/arm/dts/imx25.dtsi
+++ b/arch/arm/dts/imx25.dtsi
@@ -9,8 +9,6 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include <arm/imx25.dtsi>
-
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
-- 
2.23.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] ARM: dts: drop skeleton.dtsi
  2019-09-10 10:06 [PATCH 1/2] ARM: dts: drop skeleton.dtsi Uwe Kleine-König
  2019-09-10 10:06 ` [PATCH 2/2] ARM: dts: imx25-karo-tx25: include Linux dts instead of duplicating it Uwe Kleine-König
@ 2019-09-12  6:20 ` Sascha Hauer
  1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2019-09-12  6:20 UTC (permalink / raw)
  To: Uwe Kleine-König; +Cc: barebox

On Tue, Sep 10, 2019 at 12:06:10PM +0200, Uwe Kleine-König wrote:
> In the Linux dts files skeleton.dtsi was dropped (in commit abe60a3a7afb
> ("ARM: dts: Kill off skeleton{64}.dtsi") for v5.1-rc1). At least one
> reason for this also applies for barebox: memory nodes are supposed to have
> a unit address and so adding a memory node without address isn't sensible.
> 
> There are only four dtsi files that use skeleton.dtsi. Add some of the
> nodes and properties defined in skeleton.dtsi to its includers. I dropped
> adding empty alias nodes as neither barebox nor Linux depend on its
> presence. All consumers override reg in the memory node, so add the
> device_type property there. The remaining properties are added unchanged.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-12  6:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-10 10:06 [PATCH 1/2] ARM: dts: drop skeleton.dtsi Uwe Kleine-König
2019-09-10 10:06 ` [PATCH 2/2] ARM: dts: imx25-karo-tx25: include Linux dts instead of duplicating it Uwe Kleine-König
2019-09-12  6:20 ` [PATCH 1/2] ARM: dts: drop skeleton.dtsi Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox