From 05a23f1c568b6ab83402aca9e655cddebc862da1 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sun, 12 Jun 2022 16:53:43 +0800
Subject: [PATCH] update linux patch, fix pwm7 & pwm8 overlay result ethernet not work bug
---
bsp/kernel/patch/linux-imx-lf-5.10.52-2.1.0.patch | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/bsp/kernel/patch/linux-imx-lf-5.10.52-2.1.0.patch b/bsp/kernel/patch/linux-imx-lf-5.10.52-2.1.0.patch
index 91db995..42f166e 100644
--- a/bsp/kernel/patch/linux-imx-lf-5.10.52-2.1.0.patch
+++ b/bsp/kernel/patch/linux-imx-lf-5.10.52-2.1.0.patch
@@ -1,7 +1,7 @@
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/igkboard.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/igkboard.dts
--- linux-imx/arch/arm/boot/dts/igkboard.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/igkboard.dts 2022-06-12 13:15:34.158636100 +0800
-@@ -0,0 +1,693 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/igkboard.dts 2022-06-12 16:47:51.001663267 +0800
+@@ -0,0 +1,689 @@
+/*
+ * Device Tree Source for LingYun IGKBoard(IoT Gateway Kit Board)
+ * Based on imx6ul-14x14-evk.dts/imx6ul-14x14-evk.dtsi
@@ -225,18 +225,12 @@
+ pinctrl-0 = <&pinctrl_csi1>;
+ clocks = <&clks IMX6UL_CLK_CSI>;
+ clock-names = "csi_mclk";
-+
-+ DOVDD-supply = <®_3p3v>;
-+ VDD-supply = <®_1p8v>;
-+ AVDD-supply = <®_3p3v>;
-+ DVDD-supply = <®_3p3v>;
-+
+ pwn-gpios = <&gpio5 6 GPIO_ACTIVE_HIGH>;
+ rst-gpios = <&gpio5 5 GPIO_ACTIVE_LOW>;
+ csi_id = <0>;
+ mclk = <24000000>;
+ mclk_source = <0>;
-+ /* rotation = <180>; */
++ // rotation = <180>;
+ status = "disabled"; /* Enable in camera overlay */
+ port {
+ ov5640_ep: endpoint {
@@ -526,6 +520,8 @@
+
+ pinctrl_csi1: csi1grp {
+ fsl,pins = <
++ MX6UL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x10B0 /* CSI_RST */
++ MX6UL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x10B0 /* CSI_PWDN */
+ MX6UL_PAD_CSI_MCLK__CSI_MCLK 0x1b088
+ MX6UL_PAD_CSI_PIXCLK__CSI_PIXCLK 0x1b088
+ MX6UL_PAD_CSI_VSYNC__CSI_VSYNC 0x1b088
@@ -707,8 +703,8 @@
+subdir-$(CONFIG_SOC_IMX6UL) += overlays
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/cam.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/cam.dts
--- linux-imx/arch/arm/boot/dts/overlays/cam.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/cam.dts 2022-06-12 13:00:23.176939473 +0800
-@@ -0,0 +1,16 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/cam.dts 2022-06-12 16:36:33.331873137 +0800
+@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
+ * Author: Guo Wenxue<guowenxue@gmail.com>
@@ -718,6 +714,10 @@
+/plugin/;
+
+/* MIPI-DSI2 camera overlay */
++
++&pxp {
++ status = "okay";
++};
+
+&i2c2 {
+ ov5640@3c {
@@ -951,7 +951,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/pwm7.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm7.dts
--- linux-imx/arch/arm/boot/dts/overlays/pwm7.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm7.dts 2022-06-12 13:31:33.213974113 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm7.dts 2022-06-12 16:34:51.953196201 +0800
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -977,14 +977,14 @@
+ pinctrl-3 = <&pinctrl_pwm7>;
+ pinctrl_pwm7: pwm7grp {
+ fsl,pins = <
-+ MX6UL_PAD_ENET1_TX_CLK__PWM7_OUT 0x110b0
++ MX6UL_PAD_JTAG_TCK__PWM7_OUT 0x110b0
+ >;
+ };
+};
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/pwm8.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm8.dts
--- linux-imx/arch/arm/boot/dts/overlays/pwm8.dts 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm8.dts 2022-06-12 13:31:40.057890125 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm8.dts 2022-06-12 16:35:10.968948011 +0800
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
@@ -1010,7 +1010,7 @@
+ pinctrl-3 = <&pinctrl_pwm8>;
+ pinctrl_pwm8: pwm8grp {
+ fsl,pins = <
-+ MX6UL_PAD_ENET1_RX_ER__PWM8_OUT 0x110b0
++ MX6UL_PAD_JTAG_TRST_B__PWM8_OUT 0x110b0
+ >;
+ };
+};
@@ -1188,7 +1188,7 @@
+
diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/configs/igkboard_defconfig linux-imx-lf-5.10.52-2.1.0/arch/arm/configs/igkboard_defconfig
--- linux-imx/arch/arm/configs/igkboard_defconfig 1970-01-01 08:00:00.000000000 +0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/configs/igkboard_defconfig 2022-06-12 13:26:11.937977945 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/configs/igkboard_defconfig 2022-06-12 16:50:44.937678932 +0800
@@ -0,0 +1,722 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
--
Gitblit v1.9.1