From 24fcd59701a7877b10829c3506577e7a76ee6e86 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Wed, 13 Apr 2022 23:43:13 +0800
Subject: [PATCH] update linux-imx-igkboard.patch, uart7 and spi1 failed for conflict with lcdif
---
bsp/kernel/patch/linux-imx-igkboard.patch | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/bsp/kernel/patch/linux-imx-igkboard.patch b/bsp/kernel/patch/linux-imx-igkboard.patch
index 7e5579b..7fb2605 100644
--- a/bsp/kernel/patch/linux-imx-igkboard.patch
+++ b/bsp/kernel/patch/linux-imx-igkboard.patch
@@ -1,7 +1,7 @@
diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/igkboard.dts linux-imx-igkboard/arch/arm/boot/dts/igkboard.dts
--- linux-imx/arch/arm/boot/dts/igkboard.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-igkboard/arch/arm/boot/dts/igkboard.dts 2022-04-13 22:54:15.799435539 +0800
-@@ -0,0 +1,802 @@
++++ linux-imx-igkboard/arch/arm/boot/dts/igkboard.dts 2022-04-13 23:40:46.669880257 +0800
+@@ -0,0 +1,796 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for LingYun IGKBoard(IoT Gateway Kit Board)
@@ -185,16 +185,16 @@
+ status = "okay";
+};
+
-+&uart7 { /* failed */
++&uart7 { /* conflict with lcdif */
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart7>;
+ status = "okay";
+};
+
-+&ecspi1 { /* failed */
-+ cs-gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
++&ecspi1 { /* conflict with lcdif */
++ cs-gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>;
++ pinctrl-0 = <&pinctrl_ecspi1>;
+ status = "okay";
+
+ spidev@0 {
@@ -203,7 +203,6 @@
+ spi-max-frequency = <2000000>;
+ };
+};
-+
+
+&pwm7 {
+ #pwm-cells = <2>;
@@ -516,22 +515,17 @@
+
+ pinctrl_uart7: uart7grp {
+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA16__UART7_DCE_TX 0x0b0b0
-+ MX6UL_PAD_LCD_DATA17__UART7_DCE_RX 0x0b0b0
++ MX6UL_PAD_LCD_DATA16__UART7_DCE_TX 0x1b0b1
++ MX6UL_PAD_LCD_DATA17__UART7_DCE_RX 0x1b0b1
+ >;
+ };
+
-+ pinctrl_ecspi1_cs: ecspi1-cs-grp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x70a0 /* SODIMM 86 */
-+ >;
-+ };
-+
+ pinctrl_ecspi1: ecspi1-grp {
+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x000a0 /* SODIMM 88 */
-+ MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI 0x000a0 /* SODIMM 92 */
-+ MX6UL_PAD_LCD_DATA23__ECSPI1_MISO 0x100a0 /* SODIMM 90 */
++ MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x10b0
++ MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI 0x10b0
++ MX6UL_PAD_LCD_DATA23__ECSPI1_MISO 0x10b0
++ MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x10b0
+ >;
+ };
+
@@ -806,7 +800,7 @@
+
diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/Makefile linux-imx-igkboard/arch/arm/boot/dts/Makefile
--- linux-imx/arch/arm/boot/dts/Makefile 2021-09-08 18:41:11.000000000 +0800
-+++ linux-imx-igkboard/arch/arm/boot/dts/Makefile 2022-03-27 22:27:54.456144071 +0800
++++ linux-imx-igkboard/arch/arm/boot/dts/Makefile 2022-04-13 23:15:49.155016887 +0800
@@ -678,6 +678,7 @@
imx6ul-tx6ul-0010.dtb \
imx6ul-tx6ul-0011.dtb \
@@ -817,7 +811,7 @@
imx6ull-14x14-evk-btwifi.dtb \
diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/configs/igkboard_defconfig linux-imx-igkboard/arch/arm/configs/igkboard_defconfig
--- linux-imx/arch/arm/configs/igkboard_defconfig 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-igkboard/arch/arm/configs/igkboard_defconfig 2022-04-13 23:03:32.994230433 +0800
++++ linux-imx-igkboard/arch/arm/configs/igkboard_defconfig 2022-04-13 23:41:00.413708382 +0800
@@ -0,0 +1,722 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
@@ -1543,7 +1537,7 @@
+# CONFIG_FTRACE is not set
diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/Makefile linux-imx-igkboard/Makefile
--- linux-imx/Makefile 2021-09-08 18:41:11.000000000 +0800
-+++ linux-imx-igkboard/Makefile 2022-04-12 22:26:08.385267233 +0800
++++ linux-imx-igkboard/Makefile 2022-04-13 23:15:49.159016848 +0800
@@ -367,7 +367,8 @@
# Alternatively CROSS_COMPILE can be set in the environment.
# Default value for CROSS_COMPILE is not to prefix executables
--
Gitblit v1.9.1