devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>
To: Fabio Estevam <fabio.estevam-3arQi8VN3Tc@public.gmane.org>,
	Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
	Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
	Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Subject: [PATCH 04/20] ARM: dts: imx6*-hummingboard2: move microsom includes into .dts
Date: Mon, 11 Dec 2017 16:57:37 +0000	[thread overview]
Message-ID: <E1eOROb-0000H4-P4@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <20171211165631.GW10595-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org>

Move the microsom includes into the .dts files.

Signed-off-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>
---
 arch/arm/boot/dts/imx6dl-hummingboard2.dts   | 1 +
 arch/arm/boot/dts/imx6q-hummingboard2.dts    | 1 +
 arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6dl-hummingboard2.dts b/arch/arm/boot/dts/imx6dl-hummingboard2.dts
index 207ce329534a..30e042822ec6 100644
--- a/arch/arm/boot/dts/imx6dl-hummingboard2.dts
+++ b/arch/arm/boot/dts/imx6dl-hummingboard2.dts
@@ -42,6 +42,7 @@
 /dts-v1/;
 
 #include "imx6dl.dtsi"
+#include "imx6qdl-sr-som.dtsi"
 #include "imx6qdl-hummingboard2.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/imx6q-hummingboard2.dts b/arch/arm/boot/dts/imx6q-hummingboard2.dts
index b850111ddf34..8dcad5668c17 100644
--- a/arch/arm/boot/dts/imx6q-hummingboard2.dts
+++ b/arch/arm/boot/dts/imx6q-hummingboard2.dts
@@ -42,6 +42,7 @@
 /dts-v1/;
 
 #include "imx6q.dtsi"
+#include "imx6qdl-sr-som.dtsi"
 #include "imx6qdl-hummingboard2.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
index 2dfd8f5887fc..676160ef2718 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
@@ -38,7 +38,6 @@
  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "imx6qdl-sr-som.dtsi"
 
 / {
 	chosen {
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2017-12-11 16:57 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-11 16:56 [PATCH 00/20] Add Hummingboard 2 support Russell King - ARM Linux
     [not found] ` <20171211165631.GW10595-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org>
2017-12-11 16:57   ` [PATCH 01/20] ARM: dts: imx6qdl: add HummingBoard2 boards Russell King
2017-12-11 16:57   ` [PATCH 02/20] ARM: dts: imx6*-hummingboard2: remove ar8035 include Russell King
2017-12-11 16:57   ` [PATCH 03/20] ARM: dts: imx6qdl-hummingboard2: rename microsom include Russell King
2017-12-11 16:57   ` Russell King [this message]
2017-12-11 16:57   ` [PATCH 05/20] ARM: dts: imx6*-hummingboard2: add Broadcom Wi-Fi include Russell King
2017-12-11 16:57   ` [PATCH 06/20] ARM: dts: imx6*-hummingboard2: fix SD card detect Russell King
2017-12-11 16:57   ` [PATCH 07/20] ARM: dts: imx6*-hummingboard2: use proper gpio flags definitions Russell King
2017-12-11 16:57   ` [PATCH 08/20] ARM: dts: imx6*-hummingboard2: convert to more conventional vmmc-supply Russell King
2017-12-11 16:58   ` [PATCH 09/20] ARM: dts: imx6*-hummingboard2: fix formatting Russell King
2017-12-11 16:58   ` [PATCH 10/20] ARM: dts: imx6*-hummingboard2: add SGTL5000 VDDD supply Russell King
2017-12-11 16:58   ` [PATCH 11/20] ARM: dts: imx6*-hummingboard2: remove LDB node Russell King
2017-12-11 16:58   ` [PATCH 12/20] ARM: dts: imx6*-hummingboard2: fix PCIe reset polarity Russell King
2017-12-11 16:58   ` [PATCH 13/20] ARM: dts: imx6*-hummingboard2: remove non-mainline property from RTC Russell King
2017-12-11 16:58   ` [PATCH 14/20] ARM: dts: imx6*-hummingboard2: remove redundant PWM disables Russell King
2017-12-11 16:58   ` [PATCH 15/20] ARM: dts: imx6*-hummingboard2: rework regulators Russell King
2017-12-11 16:58   ` [PATCH 16/20] ARM: dts: imx6*-hummingboard2: split out eMMC support Russell King
2017-12-11 16:58   ` [PATCH 17/20] ARM: dts: imx6qdl-hummingboard2: add PWM3 support Russell King
2017-12-11 16:58   ` [PATCH 18/20] ARM: dts: imx6qdl-hummingboard2: add v1.5 som without eMMC Russell King
2017-12-11 16:58   ` [PATCH 19/20] ARM: dts: imx6qdl-hummingboard2: add v1.5 som with eMMC Russell King
2017-12-11 16:59   ` [PATCH 20/20] ARM: dts: imx6qdl-hummingboard2: rename regulators to match schematic Russell King
2017-12-16 13:58   ` [PATCH 00/20] Add Hummingboard 2 support Fabio Estevam
2017-12-26  4:05   ` Shawn Guo

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=E1eOROb-0000H4-P4@rmk-PC.armlinux.org.uk \
    --to=rmk+kernel-i+ivw8tiwo2tmtq+vha3yw@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=fabio.estevam-3arQi8VN3Tc@public.gmane.org \
    --cc=kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.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;
as well as URLs for NNTP newsgroup(s).