From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/2] ARM: imx7: sabreSD: remove duplicate DT nodes
Date: Mon, 7 Aug 2017 16:03:11 +0200 [thread overview]
Message-ID: <20170807140311.3515-2-l.stach@pengutronix.de> (raw)
In-Reply-To: <20170807140311.3515-1-l.stach@pengutronix.de>
The latest upstream DTs have been merged, so remove the now duplicate
DT nodes.
Fixes: a0a5a7b84ff8 (ARM: i.MX: Add support for NXP i.MX7 SABRESD board)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/dts/imx7d-sdb.dts | 40 ----------------------------------------
1 file changed, 40 deletions(-)
diff --git a/arch/arm/dts/imx7d-sdb.dts b/arch/arm/dts/imx7d-sdb.dts
index 2e48196f9f7e..b90ada61b805 100644
--- a/arch/arm/dts/imx7d-sdb.dts
+++ b/arch/arm/dts/imx7d-sdb.dts
@@ -8,7 +8,6 @@
*/
#include <arm/imx7d-sdb.dts>
-#include "imx7s.dtsi"
/ {
chosen {
@@ -19,33 +18,6 @@
device_type = "memory";
reg = <0x80000000 0x40000000>;
};
-
- /*
- * This definition is present in the latest kernel DTS file,
- * and could be removed once Barebox catches up.
- *
- * Ditto for pinctrl_spi4
- */
- spi4 {
- compatible = "spi-gpio";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_spi4>;
- gpio-sck = <&gpio1 13 GPIO_ACTIVE_HIGH>;
- gpio-mosi = <&gpio1 9 GPIO_ACTIVE_HIGH>;
- cs-gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
- num-chipselects = <1>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- extended_io: gpio-expander@0 {
- compatible = "fairchild,74hc595";
- gpio-controller;
- #gpio-cells = <2>;
- reg = <0>;
- registers-number = <1>;
- spi-max-frequency = <100000>;
- };
- };
};
&extended_io {
@@ -56,15 +28,3 @@
line-name = "enet-rst-b";
};
};
-
-&iomuxc {
- imx7d-sdb {
- pinctrl_spi4: spi4grp {
- fsl,pins = <
- MX7D_PAD_GPIO1_IO09__GPIO1_IO9 0x59
- MX7D_PAD_GPIO1_IO12__GPIO1_IO12 0x59
- MX7D_PAD_GPIO1_IO13__GPIO1_IO13 0x59
- >;
- };
- };
-};
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2017-08-07 14:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-07 14:03 [PATCH 1/2] ARM: imx: add stub for imx7_uart_setup_ll Lucas Stach
2017-08-07 14:03 ` Lucas Stach [this message]
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=20170807140311.3515-2-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=barebox@lists.infradead.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