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 | 269 +++++++++++++++++++++++++++++++++++------------------ 1 files changed, 179 insertions(+), 90 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 65df545..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-05 19:34:04.307411774 +0800 -@@ -0,0 +1,704 @@ ++++ 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 @@ -38,14 +38,6 @@ + size = <0xa000000>; + linux,cma-default; + }; -+ }; -+ -+ backlight_display: backlight-display { -+ compatible = "pwm-backlight"; -+ pwms = <&pwm1 0 5000000>; -+ brightness-levels = <0 4 8 16 32 64 128 255>; -+ default-brightness-level = <6>; -+ status = "okay"; + }; + + buzzer: pwm-buzzer { @@ -143,6 +135,15 @@ + regulator-always-on; + }; + ++ backlight_lcd: backlight-lcd { ++ compatible = "pwm-backlight"; ++ pwms = <&pwm1 0 5000000>; ++ brightness-levels = <0 4 8 16 32 64 128 255>; ++ default-brightness-level = <7>; ++ power-supply = <®_3p3v>; ++ status = "disabled"; /* Enable in LCD overlay */ ++ }; ++ +/* + sound-mqs { + compatible = "fsl,imx-audio-mqs"; @@ -158,11 +159,6 @@ +/*+-------------------+ + | Misc Modules | + +-------------------+*/ -+ -+&clks { -+ assigned-clocks = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>; -+ assigned-clock-rates = <786432000>; -+}; + +&snvs_poweroff { + status = "okay"; @@ -192,12 +188,6 @@ + status = "okay"; +}; + -+&wdog1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_wdog>; -+ fsl,ext-reset-output; -+}; -+ +/*+-------------------+ + | Camera Module | + +-------------------+*/ @@ -219,7 +209,7 @@ + interrupt-parent = <&gpio5>; + interrupts = <2 IRQ_TYPE_EDGE_FALLING>; + -+ status = "okay"; ++ status = "disabled"; /* Enable in LCD overlay */ + }; + + rtc@6f { @@ -235,19 +225,13 @@ + 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>; */ -+ status = "okay"; ++ // rotation = <180>; ++ status = "disabled"; /* Enable in camera overlay */ + port { + ov5640_ep: endpoint { + remote-endpoint = <&csi1_ep>; @@ -269,6 +253,12 @@ +/*+-------------------+ + | Audio Module | + +-------------------+*/ ++ ++&clks { ++ assigned-clocks = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>; ++ assigned-clock-rates = <786432000>; ++}; ++ +/* +&mqs { + pinctrl-names = "default"; @@ -400,16 +390,11 @@ +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_extgpio>; -+ pinctrl-1 = <&pinctrl_flexcan1>; -+ pinctrl-2 = <&pinctrl_flexcan2>; -+ pinctrl-3 = <&pinctrl_i2c1>; -+ pinctrl-4 = <&pinctrl_lcdif_dat>; -+ pinctrl-5 = <&pinctrl_pwm>; -+ pinctrl-6 = <&pinctrl_ecspi1_master>; -+ pinctrl-7 = <&pinctrl_uart2>; -+ pinctrl-8 = <&pinctrl_uart3>; -+ pinctrl-9 = <&pinctrl_uart4>; -+ pinctrl-10 = <&pinctrl_uart7>; ++ pinctrl-1 = <&pinctrl_i2c1 &pinctrl_ecspi1_master>; ++ pinctrl-2 = <&pinctrl_flexcan1 &pinctrl_flexcan2>; ++ pinctrl-3 = <&pinctrl_pwm7 &pinctrl_pwm8>; ++ pinctrl-4 = <&pinctrl_uart2 &pinctrl_uart3 &pinctrl_uart4 &pinctrl_uart7>; ++ pinctrl-5 = <&pinctrl_lcdif_dat>; + + pinctrl_extgpio: extgpiogrp { + fsl,pins = < @@ -429,6 +414,15 @@ + >; + }; + ++ pinctrl_ecspi1_master: ecspi1grp1 { ++ fsl,pins = < ++ MX6UL_PAD_LCD_DATA22__GPIO3_IO27 0x17059 /* 19# SPI1_MOSI*/ ++ MX6UL_PAD_LCD_DATA23__GPIO3_IO28 0x17059 /* 21# SPI1_MISO*/ ++ MX6UL_PAD_LCD_DATA20__GPIO3_IO25 0x17059 /* 23# SPI1_SCLK*/ ++ MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x17059 /* 24# SPI1_SS0 */ ++ >; ++ }; ++ + pinctrl_flexcan1: flexcan1grp{ + fsl,pins = < + MX6UL_PAD_UART3_CTS_B__GPIO1_IO26 0x17059 /* 27# CAN1_TX */ @@ -443,19 +437,15 @@ + >; + }; + -+ pinctrl_lcdif_dat: lcdifdatgrp { ++ pinctrl_pwm7: pwm7grp { + fsl,pins = < -+ MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x17059 /* 22# GPIO */ -+ MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x17059 /* 26# GPIO */ ++ MX6UL_PAD_JTAG_TCK__GPIO1_IO14 0x17059 /* 32# PWM7 */ + >; + }; + -+ pinctrl_ecspi1_master: ecspi1grp1 { ++ pinctrl_pwm8: pwm8grp { + fsl,pins = < -+ MX6UL_PAD_LCD_DATA22__GPIO3_IO27 0x17059 /* 19# SPI1_MOSI*/ -+ MX6UL_PAD_LCD_DATA23__GPIO3_IO28 0x17059 /* 21# SPI1_MISO*/ -+ MX6UL_PAD_LCD_DATA20__GPIO3_IO25 0x17059 /* 23# SPI1_SCLK*/ -+ MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x17059 /* 24# SPI1_SS0 */ ++ MX6UL_PAD_JTAG_TRST_B__GPIO1_IO15 0x17059 /* 28# PWM8 */ + >; + }; + @@ -487,19 +477,18 @@ + >; + }; + -+ pinctrl_pwm: pwmgrp { ++ pinctrl_lcdif_dat: lcdifdatgrp { + fsl,pins = < -+ MX6UL_PAD_JTAG_TRST_B__GPIO1_IO15 0x17059 /* 28# PWM8 */ -+ MX6UL_PAD_JTAG_TCK__GPIO1_IO14 0x17059 /* 32# PWM7 */ ++ MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x17059 /* 22# GPIO */ ++ MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x17059 /* 26# GPIO */ + >; + }; +}; + + +/*+--------------------------+ -+ | Pinctrl iomuxc | ++ | Basic pinctrl iomuxc | + +--------------------------+*/ -+ +&iomuxc { + pinctrl-names = "default"; + @@ -531,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 @@ -585,7 +576,7 @@ + + pinctrl_pwm1: pwm1grp { + fsl,pins = < -+ MX6UL_PAD_GPIO1_IO08__PWM1_OUT 0x110b0 ++ MX6UL_PAD_GPIO1_IO08__PWM1_OUT 0x110b0 /* LCD_BRIGHT in schematics */ + >; + }; + @@ -698,17 +689,11 @@ + MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x170f9 + >; + }; -+ -+ pinctrl_wdog: wdoggrp { -+ fsl,pins = < -+ MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0 -+ >; -+ }; +}; + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/Makefile linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/Makefile --- linux-imx/arch/arm/boot/dts/Makefile 2021-09-08 18:41:11.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/Makefile 2022-06-05 19:33:31.155895196 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/Makefile 2022-06-12 13:00:23.176939473 +0800 @@ -1490,3 +1490,6 @@ aspeed-bmc-opp-zaius.dtb \ aspeed-bmc-portwell-neptune.dtb \ @@ -716,9 +701,33 @@ +DTC_FLAGS_igkboard := -@ +dtb-$(CONFIG_SOC_IMX6UL) += igkboard.dtb +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 16:36:33.331873137 +0800 +@@ -0,0 +1,20 @@ ++/* ++ * Copyright (C) 2022 LingYun IoT System Studio ++ * Author: Guo Wenxue<guowenxue@gmail.com> ++ */ ++ ++/dts-v1/; ++/plugin/; ++ ++/* MIPI-DSI2 camera overlay */ ++ ++&pxp { ++ status = "okay"; ++}; ++ ++&i2c2 { ++ ov5640@3c { ++ status = "okay"; ++ }; ++}; ++ diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/can1.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can1.dts --- linux-imx/arch/arm/boot/dts/overlays/can1.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can1.dts 2022-06-05 19:33:31.155895196 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can1.dts 2022-06-12 13:00:23.176939473 +0800 @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -740,7 +749,7 @@ +}; + +&iomuxc { -+ pinctrl-1 = <&pinctrl_flexcan1>; ++ pinctrl-2 = <&pinctrl_flexcan1>; + pinctrl_flexcan1: flexcan1grp{ + fsl,pins = < + MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x1b020 @@ -751,7 +760,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/can2.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can2.dts --- linux-imx/arch/arm/boot/dts/overlays/can2.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can2.dts 2022-06-05 19:33:31.155895196 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can2.dts 2022-06-12 13:00:23.176939473 +0800 @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -784,7 +793,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/i2c1.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/i2c1.dts --- linux-imx/arch/arm/boot/dts/overlays/i2c1.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/i2c1.dts 2022-06-05 19:33:31.155895196 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/i2c1.dts 2022-06-12 13:00:23.176939473 +0800 @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -806,7 +815,7 @@ +}; + +&iomuxc { -+ pinctrl-3 = <&pinctrl_i2c1>; ++ pinctrl-1 = <&pinctrl_i2c1>; + pinctrl_i2c1: i2c1grp { + fsl,pins = < + MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0 @@ -817,7 +826,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/lcd.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/lcd.dts --- linux-imx/arch/arm/boot/dts/overlays/lcd.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/lcd.dts 2022-06-05 19:33:31.155895196 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/lcd.dts 2022-06-12 13:00:23.176939473 +0800 @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -832,12 +841,14 @@ + +/* LCD display overlay */ + -+&backlight_display { ++&backlight_lcd { + status = "okay"; +}; + -+&pxp { /* Pixel Pipeline (PXP) is a memory-to-memory graphics processing */ -+ status = "okay"; ++&i2c2 { ++ gt9xx@5d { ++ status = "okay"; ++ }; +}; + +&lcdif { @@ -876,7 +887,7 @@ +}; + +&iomuxc { -+ pinctrl-4 = <&pinctrl_lcdif_dat>; ++ pinctrl-5 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>; + pinctrl_lcdif_dat: lcdifdatgrp { + fsl,pins = < + MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x79 @@ -912,16 +923,14 @@ + MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x79 + MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x79 + MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x79 -+ /* used for lcd reset */ -+ MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x79 ++ MX6UL_PAD_LCD_RESET__LCDIF_RESET 0x79 + >; + }; +}; -+ diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/Makefile linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/Makefile --- linux-imx/arch/arm/boot/dts/overlays/Makefile 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/Makefile 2022-06-05 19:33:31.155895196 +0800 -@@ -0,0 +1,15 @@ ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/Makefile 2022-06-12 13:21:24.413715140 +0800 +@@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0 + +# required for overlay support @@ -930,16 +939,85 @@ +dtb-y += can1.dtbo +dtb-y += can2.dtbo +dtb-y += i2c1.dtbo -+dtb-y += lcd.dtbo +dtb-y += spi1.dtbo +dtb-y += uart2.dtbo +dtb-y += uart3.dtbo +dtb-y += uart4.dtbo +dtb-y += uart7.dtbo ++dtb-y += pwm7.dtbo ++dtb-y += pwm8.dtbo ++dtb-y += lcd.dtbo ++dtb-y += cam.dtbo ++ +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 16:34:51.953196201 +0800 +@@ -0,0 +1,29 @@ ++/* ++ * Copyright (C) 2022 LingYun IoT System Studio ++ * Author: Guo Wenxue<guowenxue@gmail.com> ++ */ ++ ++/dts-v1/; ++/plugin/; ++ ++#include <dt-bindings/clock/imx6ul-clock.h> ++#include "../imx6ul-pinfunc.h" ++ ++/* 40-pin extended GPIO, PWM7 interfaces */ ++ ++&pwm7 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_pwm7>; ++ clocks = <&clks IMX6UL_CLK_PWM7>, <&clks IMX6UL_CLK_PWM7>; ++ status = "okay"; ++}; ++ ++&iomuxc { ++ pinctrl-3 = <&pinctrl_pwm7>; ++ pinctrl_pwm7: pwm7grp { ++ fsl,pins = < ++ 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 16:35:10.968948011 +0800 +@@ -0,0 +1,29 @@ ++/* ++ * Copyright (C) 2022 LingYun IoT System Studio ++ * Author: Guo Wenxue<guowenxue@gmail.com> ++ */ ++ ++/dts-v1/; ++/plugin/; ++ ++#include <dt-bindings/clock/imx6ul-clock.h> ++#include "../imx6ul-pinfunc.h" ++ ++/* 40-pin extended GPIO, PWM8 interfaces */ ++ ++&pwm8 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_pwm8>; ++ clocks = <&clks IMX6UL_CLK_PWM8>, <&clks IMX6UL_CLK_PWM8>; ++ status = "okay"; ++}; ++ ++&iomuxc { ++ pinctrl-3 = <&pinctrl_pwm8>; ++ pinctrl_pwm8: pwm8grp { ++ fsl,pins = < ++ MX6UL_PAD_JTAG_TRST_B__PWM8_OUT 0x110b0 ++ >; ++ }; ++}; + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/spi1.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/spi1.dts --- linux-imx/arch/arm/boot/dts/overlays/spi1.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/spi1.dts 2022-06-05 19:33:31.155895196 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/spi1.dts 2022-06-12 13:00:23.176939473 +0800 @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -971,7 +1049,7 @@ +}; + +&iomuxc { -+ pinctrl-6 = <&pinctrl_ecspi1_master>; ++ pinctrl-1 = <&pinctrl_ecspi1_master>; + pinctrl_ecspi1_master: ecspi1grp1 { + fsl,pins = < + MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x10b0 @@ -983,7 +1061,7 @@ +}; diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart2.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart2.dts --- linux-imx/arch/arm/boot/dts/overlays/uart2.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart2.dts 2022-06-05 19:33:31.155895196 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart2.dts 2022-06-12 13:00:23.176939473 +0800 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1004,7 +1082,7 @@ +}; + +&iomuxc { -+ pinctrl-7 = <&pinctrl_uart2>; ++ pinctrl-4 = <&pinctrl_uart2>; + pinctrl_uart2: uart2grp { + fsl,pins = < + MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1 @@ -1014,7 +1092,7 @@ +}; diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart3.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart3.dts --- linux-imx/arch/arm/boot/dts/overlays/uart3.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart3.dts 2022-06-05 19:33:31.155895196 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart3.dts 2022-06-12 13:00:23.176939473 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1035,7 +1113,7 @@ +}; + +&iomuxc { -+ pinctrl-8 = <&pinctrl_uart3>; ++ pinctrl-4 = <&pinctrl_uart3>; + pinctrl_uart3: uart3grp { + fsl,pins = < + MX6UL_PAD_UART3_TX_DATA__UART3_DCE_TX 0x1b0b1 @@ -1046,7 +1124,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart4.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart4.dts --- linux-imx/arch/arm/boot/dts/overlays/uart4.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart4.dts 2022-06-05 19:33:31.155895196 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart4.dts 2022-06-12 13:00:23.176939473 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1067,7 +1145,7 @@ +}; + +&iomuxc { -+ pinctrl-9 = <&pinctrl_uart4>; ++ pinctrl-4 = <&pinctrl_uart4>; + pinctrl_uart4: uart4grp { + fsl,pins = < + MX6UL_PAD_UART4_TX_DATA__UART4_DCE_TX 0x1b0b1 @@ -1078,7 +1156,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart7.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart7.dts --- linux-imx/arch/arm/boot/dts/overlays/uart7.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart7.dts 2022-06-05 19:33:31.155895196 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart7.dts 2022-06-12 13:00:23.176939473 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1099,7 +1177,7 @@ +}; + +&iomuxc { -+ pinctrl-10 = <&pinctrl_uart7>; ++ pinctrl-4 = <&pinctrl_uart7>; + pinctrl_uart7: uart7grp { + fsl,pins = < + MX6UL_PAD_LCD_DATA16__UART7_DCE_TX 0x1b0b1 @@ -1110,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-05 19:34:16.991228563 +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 @@ -1834,9 +1912,20 @@ +# CONFIG_SCHED_DEBUG is not set +# CONFIG_DEBUG_PREEMPT is not set +# CONFIG_FTRACE is not set +diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/drivers/video/backlight/pwm_bl.c linux-imx-lf-5.10.52-2.1.0/drivers/video/backlight/pwm_bl.c +--- linux-imx/drivers/video/backlight/pwm_bl.c 2021-09-08 18:41:11.000000000 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/drivers/video/backlight/pwm_bl.c 2022-06-12 13:00:23.176939473 +0800 +@@ -558,6 +558,7 @@ + if (!state.period && (data->pwm_period_ns > 0)) + state.period = data->pwm_period_ns; + ++ state.enabled = true; /* Add by guowenxue to enalbe backlight as default */ + ret = pwm_apply_state(pb->pwm, &state); + if (ret) { + dev_err(&pdev->dev, "failed to apply initial PWM state: %d\n", diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/Makefile linux-imx-lf-5.10.52-2.1.0/Makefile --- linux-imx/Makefile 2021-09-08 18:41:11.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/Makefile 2022-06-05 19:33:31.159895137 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/Makefile 2022-06-12 13:00:23.180939431 +0800 @@ -367,7 +367,8 @@ # Alternatively CROSS_COMPILE can be set in the environment. # Default value for CROSS_COMPILE is not to prefix executables @@ -1857,7 +1946,7 @@ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/scripts/Makefile.lib linux-imx-lf-5.10.52-2.1.0/scripts/Makefile.lib --- linux-imx/scripts/Makefile.lib 2021-09-08 18:41:11.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/scripts/Makefile.lib 2022-06-05 19:33:31.155895196 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/scripts/Makefile.lib 2022-06-12 13:00:23.176939473 +0800 @@ -325,6 +325,16 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE $(call if_changed_dep,dtc) -- Gitblit v1.9.1