From ebbc324cef6966f7c3aabbe5d4bcf1049dc6b9d5 Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Thu, 06 Oct 2022 12:05:23 +0800 Subject: [PATCH] update linux-imx-lf-5.15.32-2.0.0.patch, fix lcd bug --- bsp/kernel/patch/linux-imx-lf-5.15.32-2.0.0.patch | 57 ++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 23 deletions(-) diff --git a/bsp/kernel/patch/linux-imx-lf-5.15.32-2.0.0.patch b/bsp/kernel/patch/linux-imx-lf-5.15.32-2.0.0.patch index f9d7aea..375ce63 100644 --- a/bsp/kernel/patch/linux-imx-lf-5.15.32-2.0.0.patch +++ b/bsp/kernel/patch/linux-imx-lf-5.15.32-2.0.0.patch @@ -1,6 +1,6 @@ diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/igkboard.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/igkboard.dts 2022-09-04 20:14:37.277129185 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/igkboard.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,603 @@ +/* + * Device Tree Source for LingYun IGKBoard(IoT Gateway Kit Board) @@ -197,7 +197,7 @@ + status = "okay"; +}; + -+&pwm2 { ++&pwm2 { + #pwm-cells = <2>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm2>; @@ -490,7 +490,7 @@ + + pinctrl_pwm1: pwm1grp { + fsl,pins = < -+ MX6UL_PAD_GPIO1_IO08__PWM1_OUT 0x110b0 ++ MX6UL_PAD_GPIO1_IO08__PWM1_OUT 0x110b0 + >; + }; + @@ -521,7 +521,7 @@ + MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059 + MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059 + MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059 -+ MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x17059 ++ MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x17059 + >; + }; + @@ -608,7 +608,7 @@ \ No newline at end of file diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/Makefile linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/Makefile --- linux-imx/arch/arm/boot/dts/Makefile 2022-07-22 03:24:17.000000000 +0800 -+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/Makefile 2022-09-04 20:14:37.277129185 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/Makefile 2022-10-06 10:55:47.564618629 +0800 @@ -1586,3 +1586,6 @@ aspeed-bmc-portwell-neptune.dtb \ aspeed-bmc-quanta-q71l.dtb \ @@ -618,7 +618,7 @@ +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.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/cam.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/cam.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -646,7 +646,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/can1.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/can1.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/can1.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -678,7 +678,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/can2.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/can2.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/can2.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -710,7 +710,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/i2c1.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/i2c1.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/i2c1.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -742,7 +742,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/lcd.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/lcd.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/lcd.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -835,7 +835,7 @@ +}; diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/Makefile linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/Makefile 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/Makefile 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0 +# required for overlay support @@ -858,7 +858,7 @@ \ No newline at end of file diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/nbiot-4g.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/nbiot-4g.dts --- linux-imx/arch/arm/boot/dts/overlays/nbiot-4g.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/nbiot-4g.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/nbiot-4g.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -896,7 +896,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/pwm7.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/pwm7.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/pwm7.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -928,7 +928,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/pwm8.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/pwm8.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/pwm8.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -960,7 +960,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/spi1.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/spi1.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/spi1.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1003,7 +1003,7 @@ +}; diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart2.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/uart2.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart2.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1033,7 +1033,7 @@ +}; diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart3.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/uart3.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart3.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1064,7 +1064,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart4.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/uart4.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart4.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1095,7 +1095,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/uart7.dts linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/boot/dts/overlays/uart7.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/uart7.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1126,7 +1126,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/w1.dts linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/w1.dts --- linux-imx/arch/arm/boot/dts/overlays/w1.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/w1.dts 2022-09-04 20:14:37.285129086 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/boot/dts/overlays/w1.dts 2022-10-06 10:55:47.564618629 +0800 @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1161,7 +1161,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/configs/igkboard_defconfig linux-imx-lf-5.15.32-2.0.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.15.32-2.0.0/arch/arm/configs/igkboard_defconfig 2022-09-22 21:44:18.136657352 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/arch/arm/configs/igkboard_defconfig 2022-10-06 11:05:22.312555493 +0800 @@ -0,0 +1,587 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y @@ -1750,16 +1750,27 @@ +# 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.15.32-2.0.0/drivers/video/backlight/pwm_bl.c +--- linux-imx/drivers/video/backlight/pwm_bl.c 2022-07-22 03:24:23.000000000 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/drivers/video/backlight/pwm_bl.c 2022-10-06 11:02:43.047970154 +0800 +@@ -552,6 +552,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.15.32-2.0.0/Makefile --- linux-imx/Makefile 2022-07-22 03:24:17.000000000 +0800 -+++ linux-imx-lf-5.15.32-2.0.0/Makefile 2022-09-22 21:40:24.053255857 +0800 ++++ linux-imx-lf-5.15.32-2.0.0/Makefile 2022-10-06 10:55:47.568618548 +0800 @@ -382,6 +382,8 @@ # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile ARCH ?= $(SUBARCH) +ARCH = arm +CROSS_COMPILE?=/opt/buildroot/cortexA7/bin/arm-linux- - + # Architecture as present in compile.h UTS_MACHINE := $(ARCH) @@ -1880,6 +1882,7 @@ -- Gitblit v1.9.1