From: rmk+kernel@armlinux•org.uk (Russell King)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 03/13] ARM: dts: imx6qdl: SolidRun: move microsom includes into .dts
Date: Mon, 27 Nov 2017 16:52:20 +0000 [thread overview]
Message-ID: <E1eJMdo-0002qf-2D@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <20171127165134.GH31757@n2100.armlinux.org.uk>
Move the microsom includes into the .dts files so different options can
be accomodated at the lowest level.
Signed-off-by: Russell King <rmk+kernel@armlinux•org.uk>
---
arch/arm/boot/dts/imx6dl-cubox-i.dts | 1 +
arch/arm/boot/dts/imx6dl-hummingboard.dts | 1 +
arch/arm/boot/dts/imx6q-cubox-i.dts | 1 +
arch/arm/boot/dts/imx6q-hummingboard.dts | 1 +
arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 1 -
6 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6dl-cubox-i.dts b/arch/arm/boot/dts/imx6dl-cubox-i.dts
index f10a36b8647d..222c269f687a 100644
--- a/arch/arm/boot/dts/imx6dl-cubox-i.dts
+++ b/arch/arm/boot/dts/imx6dl-cubox-i.dts
@@ -41,6 +41,7 @@
/dts-v1/;
#include "imx6dl.dtsi"
+#include "imx6qdl-microsom.dtsi"
#include "imx6qdl-cubox-i.dtsi"
/ {
diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts
index 39c2602fa87c..1709810de77e 100644
--- a/arch/arm/boot/dts/imx6dl-hummingboard.dts
+++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts
@@ -42,6 +42,7 @@
/dts-v1/;
#include "imx6dl.dtsi"
+#include "imx6qdl-microsom.dtsi"
#include "imx6qdl-hummingboard.dtsi"
/ {
diff --git a/arch/arm/boot/dts/imx6q-cubox-i.dts b/arch/arm/boot/dts/imx6q-cubox-i.dts
index b68aa0e57f20..8f39682c33a9 100644
--- a/arch/arm/boot/dts/imx6q-cubox-i.dts
+++ b/arch/arm/boot/dts/imx6q-cubox-i.dts
@@ -41,6 +41,7 @@
/dts-v1/;
#include "imx6q.dtsi"
+#include "imx6qdl-microsom.dtsi"
#include "imx6qdl-cubox-i.dtsi"
/ {
diff --git a/arch/arm/boot/dts/imx6q-hummingboard.dts b/arch/arm/boot/dts/imx6q-hummingboard.dts
index 69a7a0a1cb21..6fc692940e6b 100644
--- a/arch/arm/boot/dts/imx6q-hummingboard.dts
+++ b/arch/arm/boot/dts/imx6q-hummingboard.dts
@@ -42,6 +42,7 @@
/dts-v1/;
#include "imx6q.dtsi"
+#include "imx6qdl-microsom.dtsi"
#include "imx6qdl-hummingboard.dtsi"
/ {
diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index 57ce2dbb6ad9..98ec7ce1f2a3 100644
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.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-microsom.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index afd981e9b5e3..84e6392fee1f 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.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-microsom.dtsi"
/ {
chosen {
--
2.7.4
next prev parent reply other threads:[~2017-11-27 16:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-27 16:51 [PATCH 00/13] SolidRun Hummingboard DT updates Russell King - ARM Linux
2017-11-27 16:52 ` [PATCH 01/13] ARM: dts: imx6qdl: SolidRun: remove redundant regulators node Russell King
2017-11-27 20:15 ` Fabio Estevam
2017-11-27 23:14 ` Russell King - ARM Linux
2017-11-27 23:55 ` Fabio Estevam
2017-11-27 16:52 ` [PATCH 02/13] ARM: dts: imx6qdl: SolidRun: move AR8035 into microsom Russell King
2017-11-27 20:12 ` Fabio Estevam
2017-11-27 23:13 ` Russell King - ARM Linux
2017-11-27 16:52 ` Russell King [this message]
[not found] ` <CALHpu36Kjy4SSn1m8ZOYwEr+9u67dobfNHiOX6s75UFGVm3atw@mail.gmail.com>
2017-11-28 10:45 ` [PATCH 03/13] ARM: dts: imx6qdl: SolidRun: move microsom includes into .dts Russell King - ARM Linux
2017-11-27 16:52 ` [PATCH 04/13] ARM: dts: imx6qdl-microsom: split out Broadcom Wi-Fi support Russell King
2017-11-27 16:52 ` [PATCH 05/13] ARM: dts: imx6qdl-microsom-brcm: rename sdio clock Russell King
2017-11-27 16:52 ` [PATCH 06/13] ARM: dts: imx6qdl-microsom: add 3.3V vcc regulator Russell King
2017-11-27 16:52 ` [PATCH 07/13] ARM: dts: imx6qdl-microsom: add support for TI Wi-Fi Russell King
2017-11-27 16:52 ` [PATCH 08/13] ARM: dts: ixm6qdl-microsom: add support for eMMC Russell King
2017-11-27 16:52 ` [PATCH 09/13] ARM: dts: imx6qdl-hummingboard: add SD card regulator Russell King
2017-11-27 20:11 ` Fabio Estevam
2017-11-27 16:52 ` [PATCH 10/13] ARM: dts: imx6qdl-hummingboard: rename regulators to match schematic Russell King
2017-11-27 16:53 ` [PATCH 11/13] ARM: dts: imx6qdl-hummingboard: fix node names Russell King
2017-11-27 16:53 ` [PATCH 12/13] ARM: dts: imx6qdl-cubox-i: rename regulators to match schematic Russell King
2017-11-27 16:53 ` [PATCH 13/13] ARM: dts: imx6qdl-cubox-i: fix node names Russell King
2017-11-27 20:18 ` [PATCH 00/13] SolidRun Hummingboard DT updates Fabio Estevam
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=E1eJMdo-0002qf-2D@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux$(echo .)org.uk \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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