Merge remote-tracking branch 'remotes/codeaurora/imx_4.14.98_2.3.0' into toradex_4.14-2.3.x-imx

4 files changed, 72 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ce4496481f76..a75056b166b3 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -611,7 +611,10 @@ dtb-$(CONFIG_SOC_IMX6ULL) += \
 	imx6ulz-14x14-evk-btwifi.dtb \
 	imx6ulz-14x14-evk-btwifi-oob.dtb \
 	imx6ulz-14x14-evk-emmc.dtb \
-	imx6ulz-14x14-evk-gpmi-weim.dtb
+	imx6ulz-14x14-evk-gpmi-weim.dtb \
+	imx6ulz-lite-evk.dtb \
+	imx6ulz-lite-evk-btwifi.dtb \
+	imx6ulz-lite-evk-btwifi-oob.dtb
 dtb-$(CONFIG_SOC_IMX6SLL) += \
 	imx6sll-lpddr2-arm2.dtb \
 	imx6sll-lpddr3-arm2.dtb \
diff --git a/arch/arm/boot/dts/imx6ulz-lite-evk-btwifi-oob.dts b/arch/arm/boot/dts/imx6ulz-lite-evk-btwifi-oob.dts
new file mode 100644
index 000000000000..e7ddeaa2a16d
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ulz-lite-evk-btwifi-oob.dts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020 NXP
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6ulz-lite-evk-btwifi.dts"
+
+&pinctrl_wifi {
+	fsl,pins = <
+		/* MUXing for WL_HOST_WAKE */
+		MX6UL_PAD_ENET2_RX_ER__GPIO2_IO15  0x13041
+	>;
+};
+
+&brcmf {
+	interrupt-parent = <&gpio2>;
+	interrupts = <15 IRQ_TYPE_LEVEL_HIGH>;
+	interrupt-names = "host-wake";
+};
diff --git a/arch/arm/boot/dts/imx6ulz-lite-evk-btwifi.dts b/arch/arm/boot/dts/imx6ulz-lite-evk-btwifi.dts
new file mode 100644
index 000000000000..98f498ae4655
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ulz-lite-evk-btwifi.dts
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2020 NXP
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6ulz-lite-evk.dts"
+#include "imx6ul-evk-btwifi.dtsi"
diff --git a/arch/arm/boot/dts/imx6ulz-lite-evk.dts b/arch/arm/boot/dts/imx6ulz-lite-evk.dts
new file mode 100644
index 000000000000..ce52209d2e18
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ulz-lite-evk.dts
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020 NXP
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/dts-v1/;
+
+#include "imx6ull-9x9-evk.dts"
+
+/ {
+	model = "Freescale i.MX6 ULZ Lite EVK Board";
+
+	aliases {
+		/delete-property/ can0;
+		/delete-property/ can1;
+		/delete-property/ ethernet0;
+		/delete-property/ ethernet1;
+	};
+
+	/delete-node/ backlight;
+	/delete-node/ pxp_v4l2;
+};
+
+/delete-node/ &csi;
+/delete-node/ &fec1;
+/delete-node/ &fec2;
+/delete-node/ &flexcan1;
+/delete-node/ &flexcan2;
+/delete-node/ &lcdif;
+/delete-node/ &ov5640;
+/delete-node/ &pxp;
+/delete-node/ &reg_can_3v3;
+/delete-node/ &tsc;