summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris Offouga <offougajoris@gmail.com>2020-01-29 22:06:00 +0100
committerStefano Babic <sbabic@denx.de>2020-02-09 14:59:54 +0100
commitb3ebcc76872829c11a505738ca63e0b44f653404 (patch)
treee03ee6a844bfc9f7c79072c4dafcf44fa8a9e39e
parent2140cae4e8cb86b01c8254078f3fdb51ec807656 (diff)
downloadu-boot-b3ebcc76872829c11a505738ca63e0b44f653404.tar.gz
arm: dts: imx7s-warp7: Move u-boot specific node in u-boot.dtsi
These nodes are not in upstream kernel, so move these in u-boot.dtsi Signed-off-by: Joris Offouga <offougajoris@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
-rw-r--r--arch/arm/dts/imx7s-warp-u-boot.dtsi10
-rw-r--r--arch/arm/dts/imx7s-warp.dts9
2 files changed, 10 insertions, 9 deletions
diff --git a/arch/arm/dts/imx7s-warp-u-boot.dtsi b/arch/arm/dts/imx7s-warp-u-boot.dtsi
new file mode 100644
index 0000000000..6319840b1c
--- /dev/null
+++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi
@@ -0,0 +1,10 @@
+/ {
+ aliases {
+ mmc0 = &usdhc3;
+ usb0 = &usbotg1;
+ };
+
+ chosen {
+ stdout-path = &uart1;
+ };
+};
diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts
index db5ef67eb1..f7ba2c0a24 100644
--- a/arch/arm/dts/imx7s-warp.dts
+++ b/arch/arm/dts/imx7s-warp.dts
@@ -17,15 +17,6 @@
reg = <0x80000000 0x20000000>;
};
- aliases {
- mmc0 = &usdhc3;
- usb0 = &usbotg1;
- };
-
- chosen {
- stdout-path = &uart1;
- };
-
gpio-keys {
compatible = "gpio-keys";
pinctrl-0 = <&pinctrl_gpio>;