From: "Paweł Anikiel" <pan@semihalf.com>
To: dinguyen@kernel.org, robh+dt@kernel.org, arnd@arndb.de,
olof@lixom.net, soc@kernel.org
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, upstream@semihalf.com,
mw@semihalf.com, jam@semihalf.com, ka@semihalf.com,
tn@semihalf.com, amstan@google.com,
"Paweł Anikiel" <pan@semihalf.com>
Subject: [PATCH v4 1/2] socfpga: dts: move arria10 aliases to socfpga_arria10.dtsi
Date: Tue, 19 Oct 2021 16:12:27 +0200 [thread overview]
Message-ID: <20211019141228.1271617-2-pan@semihalf.com> (raw)
In-Reply-To: <20211019141228.1271617-1-pan@semihalf.com>
socfpga_arria10_socdk.dtsi declares aliases which will most likely
be used by other arria10 boards in the exact same way. move these
aliases to the parent file.
Signed-off-by: Paweł Anikiel <pan@semihalf.com>
---
arch/arm/boot/dts/socfpga_arria10.dtsi | 13 +++++++++++++
arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 7 +------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
index a574ea91d9d3..26b1662cc00f 100644
--- a/arch/arm/boot/dts/socfpga_arria10.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
@@ -10,6 +10,19 @@ / {
#address-cells = <1>;
#size-cells = <1>;
+ aliases {
+ ethernet0 = &gmac0;
+ ethernet1 = &gmac1;
+ ethernet2 = &gmac2;
+ serial0 = &uart0;
+ serial1 = &uart1;
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ };
+
cpus {
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
index 7edebe20e859..e9bb56ec15f1 100644
--- a/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
@@ -8,14 +8,9 @@ / {
model = "Altera SOCFPGA Arria 10";
compatible = "altr,socfpga-arria10", "altr,socfpga";
- aliases {
- ethernet0 = &gmac0;
- serial0 = &uart1;
- };
-
chosen {
bootargs = "earlyprintk";
- stdout-path = "serial0:115200n8";
+ stdout-path = "serial1:115200n8";
};
memory@0 {
--
2.25.1
next prev parent reply other threads:[~2021-10-19 14:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-19 14:12 [PATCH v4 0/2] Add support for the Mercury+ AA1 module Paweł Anikiel
2021-10-19 14:12 ` Paweł Anikiel [this message]
2021-10-20 13:33 ` [PATCH v4 1/2] socfpga: dts: move arria10 aliases to socfpga_arria10.dtsi Arnd Bergmann
2021-10-20 15:52 ` Paweł Anikiel
2021-10-19 14:12 ` [PATCH v4 2/2] dts: socfpga: Add Mercury+ AA1 devicetree Paweł Anikiel
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=20211019141228.1271617-2-pan@semihalf.com \
--to=pan@semihalf.com \
--cc=amstan@google.com \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=dinguyen@kernel.org \
--cc=jam@semihalf.com \
--cc=ka@semihalf.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mw@semihalf.com \
--cc=olof@lixom.net \
--cc=robh+dt@kernel.org \
--cc=soc@kernel.org \
--cc=tn@semihalf.com \
--cc=upstream@semihalf.com \
/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
all inboxes | Powered by JetHome®