mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/6] ARM: nitrogen6x: use upstream DTs
Date: Fri, 22 Jul 2016 14:31:26 +0200	[thread overview]
Message-ID: <1469190690-14508-2-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1469190690-14508-1-git-send-email-l.stach@pengutronix.de>

This gets rid of the (mostly) stub top level DTs in barebox
and switches the compatible to the proper "boundary" one.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boards/boundarydevices-nitrogen6x/board.c |  8 ++++----
 arch/arm/dts/imx6dl-nitrogen6x.dts                 |  8 +-------
 arch/arm/dts/imx6q-nitrogen6x.dts                  | 12 +-----------
 arch/arm/dts/imx6qdl-nitrogen6x.dtsi               |  2 --
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/board.c b/arch/arm/boards/boundarydevices-nitrogen6x/board.c
index 347fd9128bcd..28dba3af9a15 100644
--- a/arch/arm/boards/boundarydevices-nitrogen6x/board.c
+++ b/arch/arm/boards/boundarydevices-nitrogen6x/board.c
@@ -22,8 +22,8 @@
 
 static int nitrogen6x_devices_init(void)
 {
-	if (!of_machine_is_compatible("fsl,imx6dl-nitrogen6x") &&
-	    !of_machine_is_compatible("fsl,imx6q-nitrogen6x"))
+	if (!of_machine_is_compatible("boundary,imx6dl-nitrogen6x") &&
+	    !of_machine_is_compatible("boundary,imx6q-nitrogen6x"))
 		return 0;
 
 	imx6_bbu_internal_spi_i2c_register_handler("spiflash", "/dev/m25p0.barebox",
@@ -54,8 +54,8 @@ static int ksz9021rn_phy_fixup(struct phy_device *dev)
 
 static int nitrogen6x_coredevices_init(void)
 {
-	if (!of_machine_is_compatible("fsl,imx6dl-nitrogen6x") &&
-	    !of_machine_is_compatible("fsl,imx6q-nitrogen6x"))
+	if (!of_machine_is_compatible("boundary,imx6dl-nitrogen6x") &&
+	    !of_machine_is_compatible("boundary,imx6q-nitrogen6x"))
 		return 0;
 
 	phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
diff --git a/arch/arm/dts/imx6dl-nitrogen6x.dts b/arch/arm/dts/imx6dl-nitrogen6x.dts
index 50267b103866..bc199c31671d 100644
--- a/arch/arm/dts/imx6dl-nitrogen6x.dts
+++ b/arch/arm/dts/imx6dl-nitrogen6x.dts
@@ -11,12 +11,6 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-/dts-v1/;
-#include <arm/imx6dl.dtsi>
+#include <arm/imx6dl-nitrogen6x.dts>
 #include "imx6dl.dtsi"
 #include "imx6qdl-nitrogen6x.dtsi"
-
-/ {
-	model = "Freescale i.MX6 DualLite Nitrogen6x Board";
-	compatible = "fsl,imx6dl-nitrogen6x", "fsl,imx6dl";
-};
diff --git a/arch/arm/dts/imx6q-nitrogen6x.dts b/arch/arm/dts/imx6q-nitrogen6x.dts
index d8906e606381..e4a6a6c29e97 100644
--- a/arch/arm/dts/imx6q-nitrogen6x.dts
+++ b/arch/arm/dts/imx6q-nitrogen6x.dts
@@ -11,16 +11,6 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-/dts-v1/;
-#include <arm/imx6q.dtsi>
+#include <arm/imx6q-nitrogen6x.dts>
 #include "imx6q.dtsi"
 #include "imx6qdl-nitrogen6x.dtsi"
-
-/ {
-	model = "Freescale i.MX6 Quad Nitrogen6x Board";
-	compatible = "fsl,imx6q-nitrogen6x", "fsl,imx6q";
-};
-
-&sata {
-	status = "okay";
-};
diff --git a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
index 9ff7395f45e7..76e55e057cce 100644
--- a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
@@ -16,8 +16,6 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart2;
-
 		environment@0 {
 			compatible = "barebox,environment";
 			device-path = &flash, "partname:barebox-environment";
-- 
2.8.1


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

  reply	other threads:[~2016-07-22 12:31 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-22 12:31 [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Lucas Stach
2016-07-22 12:31 ` Lucas Stach [this message]
2016-07-22 12:31 ` [PATCH 3/6] ARM: nitrogen6x: use imx6q_barebox_entry Lucas Stach
2016-07-22 12:31 ` [PATCH 4/6] ARM: nitrogen6x: disable address mirroring Lucas Stach
2016-07-22 12:31 ` [PATCH 5/6] ARM: add support for Nitrogen6MAX QP variant Lucas Stach
2016-07-22 12:31 ` [PATCH 6/6] ARM: nitrogen: rename to nitrogen6 Lucas Stach
2016-07-25  8:18 ` [PATCH 1/6] ARM: imx: add QP as supported i.MX6 variant Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1469190690-14508-2-git-send-email-l.stach@pengutronix.de \
    --to=l.stach@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox