diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2017-08-07 16:01:30 +0200 |
---|---|---|
committer | Lucas Stach <l.stach@pengutronix.de> | 2017-08-15 10:54:52 +0200 |
commit | d01954ef973a883fe8d51c610c1f89dc5bbc9f1e (patch) | |
tree | 38059db4ef1297863cdbe26683df7a2eadcef256 | |
parent | 1833f1130268c7ee768c92a3e1bfa02e8f60f954 (diff) | |
download | barebox-d01954ef973a883fe8d51c610c1f89dc5bbc9f1e.tar.gz barebox-d01954ef973a883fe8d51c610c1f89dc5bbc9f1e.tar.xz |
ARM: imx7: sabreSD: remove duplicate DT nodes
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>
-rw-r--r-- | arch/arm/dts/imx7d-sdb.dts | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/arch/arm/dts/imx7d-sdb.dts b/arch/arm/dts/imx7d-sdb.dts index 2e48196f9f..b90ada61b8 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 - >; - }; - }; -}; |