public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Adam Ford <aford173@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/5] ARM: dts: omap36xx-u-boot.dtsi
Date: Sun,  9 Sep 2018 15:24:01 -0500	[thread overview]
Message-ID: <20180909202405.12410-1-aford173@gmail.com> (raw)

Make omap36xx-u-boot.dtsi include omap3-u-boot.dtsi until the
new omap serial driver is available.  This allows higher level functions
to include those and not replicate contents at higher levels.

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
index d584b4a9ab..96ad636755 100644
--- a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
@@ -3,9 +3,10 @@
  * Copyright (C) 2017
  * Logic PD - http://www.logicpd.com
  */
+#include "omap36xx-u-boot.dtsi"
 
 / {
-	model = "LogicPD Zoom OMAP3 Development Kit";
+	model = "LogicPD Zoom DM37 Torpedo Development Kit";
 
 	chosen {
 		stdout-path = &uart1;
@@ -26,17 +27,4 @@
 
 &mmc3 {
       status = "disabled";
-};
-
-&uart1 {
-	reg-shift = <2>;
-};
-
-&uart2 {
-	reg-shift = <2>;
-};
-
-&uart3 {
-	reg-shift = <2>;
-};
-
+};
\ No newline at end of file
diff --git a/arch/arm/dts/omap36xx-u-boot.dtsi b/arch/arm/dts/omap36xx-u-boot.dtsi
index 374499dcb2..0b4b909e87 100644
--- a/arch/arm/dts/omap36xx-u-boot.dtsi
+++ b/arch/arm/dts/omap36xx-u-boot.dtsi
@@ -3,6 +3,7 @@
  * Copyright (C) 2017
  * Logic PD - http://www.logicpd.com
  */
+#include "omap3-u-boot.dtsi"
 
 &uart4 {
 	reg-shift = <2>;
-- 
2.17.1

             reply	other threads:[~2018-09-09 20:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-09 20:24 Adam Ford [this message]
2018-09-09 20:24 ` [U-Boot] [PATCH 2/5] ARM: DTS: logicpd-som-lv-37xx-devkit-u-boot Adam Ford
2018-09-09 20:24 ` [U-Boot] [PATCH 3/5] configs: ARM: Add omap36_logic_somlv_defconfig Adam Ford
2018-09-09 20:24 ` [U-Boot] [PATCH 4/5] configs: ARM: Add omap35_logic_somlv_defconfig Adam Ford
2018-09-09 20:24 ` [U-Boot] [PATCH 5/5] ARM: omap3_logic: Remove Torpedo/SOM-LV autodection Adam Ford

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=20180909202405.12410-1-aford173@gmail.com \
    --to=aford173@gmail.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox