* [PATCH 1/2] ARM: imx: add stub for imx7_uart_setup_ll
@ 2017-08-07 14:03 Lucas Stach
2017-08-07 14:03 ` [PATCH 2/2] ARM: imx7: sabreSD: remove duplicate DT nodes Lucas Stach
0 siblings, 1 reply; 2+ messages in thread
From: Lucas Stach @ 2017-08-07 14:03 UTC (permalink / raw)
To: barebox
Fixes: 28e8db159f25 (ARM: i.MX: Add imx7_uart_setup_ll())
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm/mach-imx/include/mach/debug_ll.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-imx/include/mach/debug_ll.h b/arch/arm/mach-imx/include/mach/debug_ll.h
index b7c0690d8120..d54d601db0da 100644
--- a/arch/arm/mach-imx/include/mach/debug_ll.h
+++ b/arch/arm/mach-imx/include/mach/debug_ll.h
@@ -115,6 +115,7 @@ static inline void imx50_uart_setup_ll(void) {}
static inline void imx51_uart_setup_ll(void) {}
static inline void imx53_uart_setup_ll(void) {}
static inline void imx6_uart_setup_ll(void) {}
+static inline void imx7_uart_setup_ll(void) {}
static inline void vf610_uart_setup_ll(void) {}
#endif /* CONFIG_DEBUG_LL */
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] ARM: imx7: sabreSD: remove duplicate DT nodes
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
0 siblings, 0 replies; 2+ messages in thread
From: Lucas Stach @ 2017-08-07 14:03 UTC (permalink / raw)
To: barebox
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-07 14:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-07 14:03 [PATCH 1/2] ARM: imx: add stub for imx7_uart_setup_ll Lucas Stach
2017-08-07 14:03 ` [PATCH 2/2] ARM: imx7: sabreSD: remove duplicate DT nodes Lucas Stach
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox