From: Anand Moon <linux.amoon@gmail.com>
To: Neil Armstrong <narmstrong@baylibre.com>,
Jerome Brunet <jbrunet@baylibre.com>, Peng Fan <peng.fan@nxp.com>,
Jaehoon Chung <jh80.chung@samsung.com>,
u-boot-amlogic@groups.io, u-boot@lists.denx.de
Subject: [PATCHv6 5/5] arm: dts: s400: Move common nodes to the -u-boot.dtsi
Date: Sun, 9 Feb 2020 11:05:57 +0000 [thread overview]
Message-ID: <20200209110557.1996-6-linux.amoon@gmail.com> (raw)
In-Reply-To: <20200209110557.1996-1-linux.amoon@gmail.com>
Move u-boot specific common nodes in the dts files to
meson-axg-s400-u-boot.dtsi. This allows us to keep the basic
dts[i] files up-to-date with the ones in kernel,
but at the same time allowing the u-boot to add its own
properties to the existing nodes.
Also add missing mmc alias to dts nodes to avoid
below debug warning.
mmc_bind: alias ret=-2, devnum=-1
mmc_bind: alias ret=-2, devnum=-1
Signed-off-by: Anand Moon <linux.amoon@gmail.com>
---
no changes from previous changes
---
arch/arm/dts/meson-axg-s400-u-boot.dtsi | 16 ++++++++++++++++
arch/arm/dts/meson-axg-s400.dts | 9 ---------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/meson-axg-s400-u-boot.dtsi b/arch/arm/dts/meson-axg-s400-u-boot.dtsi
index c46eb3f38d..74241e9fcd 100644
--- a/arch/arm/dts/meson-axg-s400-u-boot.dtsi
+++ b/arch/arm/dts/meson-axg-s400-u-boot.dtsi
@@ -2,6 +2,22 @@
/*
* Copyright (c) 2017 Amlogic, Inc. All rights reserved.
*/
+/ {
+ soc {
+ u-boot,dm-pre-reloc;
+ };
+
+ aliases {
+ serial0 = &uart_AO;
+ serial1 = &uart_A;
+ mmc1 = &sd_emmc_b;
+ mmc2 = &sd_emmc_c;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+};
/* wifi module */
&sd_emmc_b {
diff --git a/arch/arm/dts/meson-axg-s400.dts b/arch/arm/dts/meson-axg-s400.dts
index 18778ada7b..feb84255ad 100644
--- a/arch/arm/dts/meson-axg-s400.dts
+++ b/arch/arm/dts/meson-axg-s400.dts
@@ -55,11 +55,6 @@
};
};
- aliases {
- serial0 = &uart_AO;
- serial1 = &uart_A;
- };
-
linein: audio-codec@0 {
#sound-dai-cells = <0>;
compatible = "everest,es7241";
@@ -100,10 +95,6 @@
reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
};
- chosen {
- stdout-path = "serial0:115200n8";
- };
-
memory@0 {
device_type = "memory";
reg = <0x0 0x0 0x0 0x40000000>;
--
2.25.0
WARNING: multiple messages have this Message-ID (diff)
From: Anand Moon <linux.amoon@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCHv6 5/5] arm: dts: s400: Move common nodes to the -u-boot.dtsi
Date: Sun, 9 Feb 2020 11:05:57 +0000 [thread overview]
Message-ID: <20200209110557.1996-6-linux.amoon@gmail.com> (raw)
In-Reply-To: <20200209110557.1996-1-linux.amoon@gmail.com>
Move u-boot specific common nodes in the dts files to
meson-axg-s400-u-boot.dtsi. This allows us to keep the basic
dts[i] files up-to-date with the ones in kernel,
but at the same time allowing the u-boot to add its own
properties to the existing nodes.
Also add missing mmc alias to dts nodes to avoid
below debug warning.
mmc_bind: alias ret=-2, devnum=-1
mmc_bind: alias ret=-2, devnum=-1
Signed-off-by: Anand Moon <linux.amoon@gmail.com>
---
no changes from previous changes
---
arch/arm/dts/meson-axg-s400-u-boot.dtsi | 16 ++++++++++++++++
arch/arm/dts/meson-axg-s400.dts | 9 ---------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/meson-axg-s400-u-boot.dtsi b/arch/arm/dts/meson-axg-s400-u-boot.dtsi
index c46eb3f38d..74241e9fcd 100644
--- a/arch/arm/dts/meson-axg-s400-u-boot.dtsi
+++ b/arch/arm/dts/meson-axg-s400-u-boot.dtsi
@@ -2,6 +2,22 @@
/*
* Copyright (c) 2017 Amlogic, Inc. All rights reserved.
*/
+/ {
+ soc {
+ u-boot,dm-pre-reloc;
+ };
+
+ aliases {
+ serial0 = &uart_AO;
+ serial1 = &uart_A;
+ mmc1 = &sd_emmc_b;
+ mmc2 = &sd_emmc_c;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+};
/* wifi module */
&sd_emmc_b {
diff --git a/arch/arm/dts/meson-axg-s400.dts b/arch/arm/dts/meson-axg-s400.dts
index 18778ada7b..feb84255ad 100644
--- a/arch/arm/dts/meson-axg-s400.dts
+++ b/arch/arm/dts/meson-axg-s400.dts
@@ -55,11 +55,6 @@
};
};
- aliases {
- serial0 = &uart_AO;
- serial1 = &uart_A;
- };
-
linein: audio-codec at 0 {
#sound-dai-cells = <0>;
compatible = "everest,es7241";
@@ -100,10 +95,6 @@
reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
};
- chosen {
- stdout-path = "serial0:115200n8";
- };
-
memory at 0 {
device_type = "memory";
reg = <0x0 0x0 0x0 0x40000000>;
--
2.25.0
next prev parent reply other threads:[~2020-02-09 11:06 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-09 11:05 [PATCHv6 0/5] Odroid n2 using eMMC would fail to boot up Anand Moon
2020-02-09 11:05 ` Anand Moon
2020-02-09 11:05 ` [PATCHv6 1/5] mmc: meson-gx: Fix clk phase tuning for MMC Anand Moon
2020-02-09 11:05 ` Anand Moon
2020-02-09 13:08 ` Neil Armstrong
2020-02-09 13:08 ` Neil Armstrong
2020-02-09 17:22 ` Anand Moon
2020-02-09 17:22 ` Anand Moon
2020-02-10 9:03 ` Neil Armstrong
2020-02-10 9:03 ` Neil Armstrong
2020-02-13 11:58 ` Anand Moon
2020-02-13 11:58 ` Anand Moon
2020-02-13 15:39 ` Neil Armstrong
2020-02-13 15:39 ` Neil Armstrong
2020-02-13 16:41 ` Anand Moon
2020-02-13 16:41 ` Anand Moon
2020-02-10 9:35 ` Jerome Brunet
2020-02-10 9:35 ` Jerome Brunet
2020-02-13 12:04 ` Anand Moon
2020-02-13 12:04 ` Anand Moon
2020-02-09 11:05 ` [PATCHv6 2/5] mmc: meson-gx: Use proper compatible string as per the dts Anand Moon
2020-02-09 11:05 ` Anand Moon
2020-02-09 13:01 ` Neil Armstrong
2020-02-09 13:01 ` Neil Armstrong
2020-02-09 17:23 ` Anand Moon
2020-02-09 17:23 ` Anand Moon
2020-02-10 8:26 ` Neil Armstrong
2020-02-10 8:26 ` Neil Armstrong
2020-02-09 11:05 ` [PATCHv6 3/5] arm: dts: gx: Move common nodes to the -u-boot.dtsi Anand Moon
2020-02-09 11:05 ` Anand Moon
2020-02-09 12:58 ` Neil Armstrong
2020-02-09 12:58 ` Neil Armstrong
2020-02-09 17:25 ` Anand Moon
2020-02-09 17:25 ` Anand Moon
2020-02-10 8:24 ` Neil Armstrong
2020-02-10 8:24 ` Neil Armstrong
2020-02-09 11:05 ` [PATCHv6 4/5] arm: dts: g12: " Anand Moon
2020-02-09 11:05 ` Anand Moon
2020-02-09 12:58 ` Neil Armstrong
2020-02-09 12:58 ` Neil Armstrong
2020-02-09 17:25 ` Anand Moon
2020-02-09 17:25 ` Anand Moon
2020-02-09 11:05 ` Anand Moon [this message]
2020-02-09 11:05 ` [PATCHv6 5/5] arm: dts: s400: " Anand Moon
2020-02-09 12:58 ` Neil Armstrong
2020-02-09 12:58 ` Neil Armstrong
2020-02-09 17:24 ` Anand Moon
2020-02-09 17:24 ` Anand Moon
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=20200209110557.1996-6-linux.amoon@gmail.com \
--to=linux.amoon@gmail.com \
--cc=jbrunet@baylibre.com \
--cc=jh80.chung@samsung.com \
--cc=narmstrong@baylibre.com \
--cc=peng.fan@nxp.com \
--cc=u-boot-amlogic@groups.io \
--cc=u-boot@lists.denx.de \
/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.