All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johan Jonker <jbx6244@gmail.com>
To: kever.yang@rock-chips.com
Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, heiko@sntech.de,
	mail@david-bauer.net, ldevulder@suse.com, wens@csie.org,
	banglang.huang@foxmail.com, matwey.kornilov@gmail.com,
	u-boot@lists.denx.de, linux-rockchip@lists.infradead.org
Subject: [RFC PATCH v1 4/6] arm: dts: rockchip: move spi0 u-boot, dm-pre-reloc and alias to rk3328 board files
Date: Wed, 30 Jun 2021 18:22:49 +0200	[thread overview]
Message-ID: <20210630162251.7378-5-jbx6244@gmail.com> (raw)
In-Reply-To: <20210630162251.7378-1-jbx6244@gmail.com>

The spi0 node has a common u-boot,dm-pre-reloc property and
an alias in rk3328-u-boot.dtsi, so all boards contain this
as well in u-boot-tpl.dtb. Clean it up a bit and move it
to only boards that use it.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
 arch/arm/dts/rk3328-rock64-u-boot.dtsi | 6 ++++++
 arch/arm/dts/rk3328-u-boot.dtsi        | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
index 37ecc6a753..dae79d6268 100644
--- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
@@ -6,6 +6,10 @@
 #include "rk3328-u-boot.dtsi"
 #include "rk3328-sdram-lpddr3-1600.dtsi"
 / {
+	aliases {
+		spi0 = &spi0;
+	};
+
 	chosen {
 		u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
 	};
@@ -69,6 +73,8 @@
 };
 
 &spi0 {
+	u-boot,dm-pre-reloc;
+
 	spi_flash: spiflash@0 {
 		u-boot,dm-pre-reloc;
 	};
diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
index e00e466d8d..03e5f18f1a 100644
--- a/arch/arm/dts/rk3328-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-u-boot.dtsi
@@ -4,10 +4,6 @@
  */
 
 / {
-	aliases {
-		spi0 = &spi0;
-	};
-
 	chosen {
 		u-boot,spl-boot-order = &emmc, &sdmmc;
 	};
@@ -54,7 +50,3 @@
 &usb20_otg {
 	hnp-srp-disable;
 };
-
-&spi0 {
-	u-boot,dm-pre-reloc;
-};
-- 
2.11.0


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

WARNING: multiple messages have this Message-ID (diff)
From: Johan Jonker <jbx6244@gmail.com>
To: kever.yang@rock-chips.com
Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, heiko@sntech.de,
	mail@david-bauer.net, ldevulder@suse.com, wens@csie.org,
	banglang.huang@foxmail.com, matwey.kornilov@gmail.com,
	u-boot@lists.denx.de, linux-rockchip@lists.infradead.org
Subject: [RFC PATCH v1 4/6] arm: dts: rockchip: move spi0 u-boot, dm-pre-reloc and alias to rk3328 board files
Date: Wed, 30 Jun 2021 18:22:49 +0200	[thread overview]
Message-ID: <20210630162251.7378-5-jbx6244@gmail.com> (raw)
In-Reply-To: <20210630162251.7378-1-jbx6244@gmail.com>

The spi0 node has a common u-boot,dm-pre-reloc property and
an alias in rk3328-u-boot.dtsi, so all boards contain this
as well in u-boot-tpl.dtb. Clean it up a bit and move it
to only boards that use it.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
 arch/arm/dts/rk3328-rock64-u-boot.dtsi | 6 ++++++
 arch/arm/dts/rk3328-u-boot.dtsi        | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
index 37ecc6a753..dae79d6268 100644
--- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
@@ -6,6 +6,10 @@
 #include "rk3328-u-boot.dtsi"
 #include "rk3328-sdram-lpddr3-1600.dtsi"
 / {
+	aliases {
+		spi0 = &spi0;
+	};
+
 	chosen {
 		u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
 	};
@@ -69,6 +73,8 @@
 };
 
 &spi0 {
+	u-boot,dm-pre-reloc;
+
 	spi_flash: spiflash@0 {
 		u-boot,dm-pre-reloc;
 	};
diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
index e00e466d8d..03e5f18f1a 100644
--- a/arch/arm/dts/rk3328-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-u-boot.dtsi
@@ -4,10 +4,6 @@
  */
 
 / {
-	aliases {
-		spi0 = &spi0;
-	};
-
 	chosen {
 		u-boot,spl-boot-order = &emmc, &sdmmc;
 	};
@@ -54,7 +50,3 @@
 &usb20_otg {
 	hnp-srp-disable;
 };
-
-&spi0 {
-	u-boot,dm-pre-reloc;
-};
-- 
2.11.0


  parent reply	other threads:[~2021-06-30 16:23 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-30 16:22 [RFC PATCH v1 0/6] add rk3318 A95X Z2 board Johan Jonker
2021-06-30 16:22 ` Johan Jonker
2021-06-30 16:22 ` [RFC PATCH v1 1/6] arm: dts: rockchip: update rk3328.dtsi Johan Jonker
2021-06-30 16:22   ` Johan Jonker
2022-03-11 19:29   ` Jagan Teki
2022-03-11 19:29     ` Jagan Teki
2021-06-30 16:22 ` [RFC PATCH v1 2/6] arm: dts: rockchip: remove usb_host0_xhci node from rk3328-u-boot.dtsi Johan Jonker
2021-06-30 16:22   ` Johan Jonker
2021-06-30 16:22 ` [RFC PATCH v1 3/6] arm: dts: rockchip: move mmc aliases to board files Johan Jonker
2021-06-30 16:22   ` Johan Jonker
2021-06-30 16:22 ` Johan Jonker [this message]
2021-06-30 16:22   ` [RFC PATCH v1 4/6] arm: dts: rockchip: move spi0 u-boot, dm-pre-reloc and alias to rk3328 " Johan Jonker
2021-06-30 16:22 ` [RFC PATCH v1 5/6] rockchip: rk3318: add a95x-z2-rk3318_defconfig file Johan Jonker
2021-06-30 16:22   ` Johan Jonker
2022-03-11 19:30   ` Jagan Teki
2022-03-11 19:30     ` Jagan Teki
2021-06-30 16:22 ` [RFC PATCH v1 6/6] arm: dts: rockchip: add rk3318 A95X Z2 board Johan Jonker
2021-06-30 16:22   ` Johan Jonker
2021-07-09 11:17   ` [RESEND RFC " Johan Jonker
2021-07-01 11:46 ` [RFC PATCH v1 0/6] " Alex Bee
2021-07-01 11:46   ` Alex Bee
2021-07-01 12:47   ` Johan Jonker
2021-07-01 12:47     ` Johan Jonker
2021-07-02  6:56 ` Matwey V. Kornilov

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=20210630162251.7378-5-jbx6244@gmail.com \
    --to=jbx6244@gmail.com \
    --cc=banglang.huang@foxmail.com \
    --cc=heiko@sntech.de \
    --cc=kever.yang@rock-chips.com \
    --cc=ldevulder@suse.com \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mail@david-bauer.net \
    --cc=matwey.kornilov@gmail.com \
    --cc=philipp.tomsich@vrull.eu \
    --cc=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    --cc=wens@csie.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.