From f65620d524df2a16958a4be9adc4845ced887902 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Mon, 06 Nov 2023 15:57:08 +0800
Subject: [PATCH] add linux-imx-lf-6.1.36-2.1.0.patch and remove unused old linux kernel patch
---
kernel/patches/igkboard-6ull/linux-imx-lf-6.1.36-2.1.0.patch | 1467 ++++++++++++++++++++++++++++------------------------------
1 files changed, 706 insertions(+), 761 deletions(-)
diff --git a/kernel/patches/igkboard-6ull/linux-imx-lf-5.15.32-2.0.0.patch b/kernel/patches/igkboard-6ull/linux-imx-lf-6.1.36-2.1.0.patch
similarity index 75%
rename from kernel/patches/igkboard-6ull/linux-imx-lf-5.15.32-2.0.0.patch
rename to kernel/patches/igkboard-6ull/linux-imx-lf-6.1.36-2.1.0.patch
index a5a8521..01d5f68 100644
--- a/kernel/patches/igkboard-6ull/linux-imx-lf-5.15.32-2.0.0.patch
+++ b/kernel/patches/igkboard-6ull/linux-imx-lf-6.1.36-2.1.0.patch
@@ -1,9 +1,577 @@
-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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/igkboard.dts 2022-11-28 06:04:24.463613926 -0800
-@@ -0,0 +1,609 @@
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/adc.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/adc.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/adc.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/adc.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,27 @@
+/*
-+ * Device Tree Source for LingYun IGKBoard(IoT Gateway Kit Board)
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++/dts-v1/;
++/plugin/;
++
++#include "../imx6ul-pinfunc.h"
++
++/* 40-pin extended GPIO, ADC interfaces */
++
++&adc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_adc1>;
++ num-channels = <5>;
++ vref-supply = <®_peri_3v3>;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_adc1: adc1grp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0 /* ADC1_1 --->TS_YN */
++ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0xb0 /* ADC1_4 --->TS_XP */
++ >;
++ };
++};
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/cam.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/cam.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/cam.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/cam.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,24 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++
++/dts-v1/;
++/plugin/;
++
++/* MIPI-DSI2 camera overlay */
++
++&pxp { /* Pixel Pipeline (PXP) is a memory-to-memory graphics processing */
++ status = "okay";
++};
++
++&csi {
++ status = "okay";
++};
++
++&i2c2 {
++ ov5640@3c {
++ status = "okay";
++ };
++};
++
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/can1.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/can1.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/can1.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/can1.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,28 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include "../imx6ul-pinfunc.h"
++
++/* 40-pin extended GPIO, CAN1 interfaces */
++
++&can1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_flexcan1>;
++ xceiver-supply = <®_can_3v3>;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_flexcan1: flexcan1grp{
++ fsl,pins = <
++ MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x1b020
++ MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX 0x1b020
++ >;
++ };
++};
++
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/can2.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/can2.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/can2.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/can2.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,28 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include "../imx6ul-pinfunc.h"
++
++/* 40-pin extended GPIO, CAN2 interfaces */
++
++&can2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_flexcan2>;
++ xceiver-supply = <®_can_3v3>;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_flexcan2: flexcan2grp{
++ fsl,pins = <
++ MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX 0x1b020
++ MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX 0x1b020
++ >;
++ };
++};
++
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/i2c1.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/i2c1.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/i2c1.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/i2c1.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,28 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include "../imx6ul-pinfunc.h"
++
++/* 40-pin extended GPIO, I2C1 interfaces */
++
++&i2c1 {
++ clock-frequency = <100000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c1>;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_i2c1: i2c1grp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0
++ MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b0
++ >;
++ };
++};
++
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/lcd.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/lcd.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/lcd.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/lcd.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,82 @@
++/*
++ * 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"
++
++/* LCD DRM display overlay */
++
++&backlight_lcd {
++ status = "okay";
++};
++
++&i2c2 {
++ gt9xx@5d {
++ status = "okay";
++ };
++};
++
++&lcdif {
++ assigned-clocks = <&clks IMX6UL_CLK_LCDIF_PRE_SEL>;
++ assigned-clock-parents = <&clks IMX6UL_CLK_PLL5_VIDEO_DIV>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>;
++ status = "okay";
++
++ port {
++ display_output: endpoint {
++ remote-endpoint = <&panel_input>;
++ };
++ };
++};
++
++&panel {
++ compatible = "lingyun,igkboard-6ull-panel", "panel-simple";
++ backlight = <&backlight_lcd>;
++ power-supply = <®_3p3v>;
++ status = "okay";
++
++ port {
++ panel_input: endpoint {
++ remote-endpoint = <&display_output>;
++ };
++ };
++};
++
++&iomuxc {
++ pinctrl_lcdif_dat: lcdifdatgrp {
++ fsl,pins = <
++ MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x79
++ MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x79
++ MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x79
++ MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x79
++ MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x79
++ MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x79
++ MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x79
++ MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x79
++ MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x79
++ MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x79
++ MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x79
++ MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x79
++ MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x79
++ MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x79
++ MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x79
++ MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x79
++ >;
++ };
++
++ pinctrl_lcdif_ctrl: lcdifctrlgrp {
++ fsl,pins = <
++ MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x79
++ MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x79
++ MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x79
++ MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x79
++ MX6UL_PAD_LCD_RESET__LCDIF_RESET 0x79
++ >;
++ };
++};
+\ No newline at end of file
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/Makefile linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/Makefile
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/Makefile 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/Makefile 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,19 @@
++# SPDX-License-Identifier: GPL-2.0
++# required for overlay support
++
++DTC_FLAGS += -@
++dtb-y += can1.dtbo
++dtb-y += can2.dtbo
++dtb-y += i2c1.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 += w1.dtbo
++dtb-y += lcd.dtbo
++dtb-y += cam.dtbo
++dtb-y += nbiot-4g.dtbo
++dtb-y += adc.dtbo
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/nbiot-4g.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/nbiot-4g.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/nbiot-4g.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/nbiot-4g.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,34 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include "../imx6ul-pinfunc.h"
++
++/* NB-IoT/4G module use UART8 interfaces, conflict with SPI interface */
++
++&uart8 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_spi_uart8 &pinctrl_nbiot_ctrl>;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_spi_uart8: spi_uart8_grp {
++ fsl,pins = <
++ MX6UL_PAD_LCD_DATA20__UART8_DCE_TX 0x1b0b1 /* MRXD */
++ MX6UL_PAD_LCD_DATA21__UART8_DCE_RX 0x1b0b1 /* MTXD */
++ >;
++ };
++
++ pinctrl_nbiot_ctrl: nbiot_ctrl_grp {
++ fsl,pins = <
++ MX6UL_PAD_LCD_DATA22__GPIO3_IO27 0x17059 /* NB_PWREN/4G_RESET */
++ MX6UL_PAD_JTAG_TRST_B__GPIO1_IO15 0x17059 /* NB_MRST/4G_POWER_KEY */
++ >;
++ };
++};
++
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/pwm7.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/pwm7.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/pwm7.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/pwm7.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,28 @@
++/*
++ * 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_pwm7: pwm7grp {
++ fsl,pins = <
++ MX6UL_PAD_JTAG_TCK__PWM7_OUT 0x110b0
++ >;
++ };
++};
++
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/pwm8.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/pwm8.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/pwm8.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/pwm8.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,28 @@
++/*
++ * 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, conflict with NB-IoT */
++
++&pwm8 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm8_nbiot>;
++ clocks = <&clks IMX6UL_CLK_PWM8>, <&clks IMX6UL_CLK_PWM8>;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_pwm8_nbiot: pwm8nbiotgrp {
++ fsl,pins = <
++ MX6UL_PAD_JTAG_TRST_B__PWM8_OUT 0x110b0
++ >;
++ };
++};
++
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/spi1.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/spi1.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/spi1.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/spi1.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,39 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include <dt-bindings/gpio/gpio.h>
++#include "../imx6ul-pinfunc.h"
++
++/* 40-pin extended GPIO, SPI1 interfaces, conflict with UART8 */
++
++&ecspi1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_spi_uart8>;
++ cs-gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
++ status = "okay";
++
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ spidev0: spi@0 {
++ reg = <0>;
++ compatible = "semtech,sx1301";
++ spi-max-frequency = <1000000>;
++ };
++};
++
++&iomuxc {
++ pinctrl_spi_uart8: spi_uart8_grp {
++ fsl,pins = <
++ 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
++ >;
++ };
++};
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/uart2.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/uart2.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/uart2.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/uart2.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,26 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include "../imx6ul-pinfunc.h"
++
++/* 40-pin extended GPIO, UART2 interfaces */
++
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2>;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_uart2: uart2grp {
++ fsl,pins = <
++ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1
++ MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1
++ >;
++ };
++};
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/uart3.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/uart3.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/uart3.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/uart3.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,27 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include "../imx6ul-pinfunc.h"
++
++/* 40-pin extended GPIO, UART3 interfaces */
++
++&uart3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart3>;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_uart3: uart3grp {
++ fsl,pins = <
++ MX6UL_PAD_UART3_TX_DATA__UART3_DCE_TX 0x1b0b1
++ MX6UL_PAD_UART3_RX_DATA__UART3_DCE_RX 0x1b0b1
++ >;
++ };
++};
++
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/uart4.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/uart4.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/uart4.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/uart4.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,27 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include "../imx6ul-pinfunc.h"
++
++/* 40-pin extended GPIO, UART4 interfaces */
++
++&uart4 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart4>;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_uart4: uart4grp {
++ fsl,pins = <
++ MX6UL_PAD_UART4_TX_DATA__UART4_DCE_TX 0x1b0b1
++ MX6UL_PAD_UART4_RX_DATA__UART4_DCE_RX 0x1b0b1
++ >;
++ };
++};
++
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/uart7.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/uart7.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/uart7.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/uart7.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,27 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include "../imx6ul-pinfunc.h"
++
++/* 40-pin extended GPIO, UART7 interfaces, conflict with LCD display */
++
++&uart7 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart7>;
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_uart7: uart7grp {
++ fsl,pins = <
++ MX6UL_PAD_LCD_DATA16__UART7_DCE_TX 0x1b0b1
++ MX6UL_PAD_LCD_DATA17__UART7_DCE_RX 0x1b0b1
++ >;
++ };
++};
++
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull/w1.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/w1.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull/w1.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull/w1.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,31 @@
++/*
++ * Copyright (C) 2022 LingYun IoT System Studio
++ * Author: Guo Wenxue<guowenxue@gmail.com>
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include <dt-bindings/gpio/gpio.h>
++#include "../imx6ul-pinfunc.h"
++
++/* W1(DS18B20) on 40Pin Header Pin#7 (GPIO1_IO18) */
++
++&w1 {
++ compatible = "w1-gpio";
++ status = "okay";
++
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_w1>;
++ gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
++};
++
++
++&iomuxc {
++ pinctrl_w1: w1grp {
++ fsl,pins = <
++ MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x110b0
++ >;
++ };
++};
++
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/igkboard-6ull.dts linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull.dts
+--- linux-imx/arch/arm/boot/dts/igkboard-6ull.dts 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/igkboard-6ull.dts 2023-11-06 15:16:50.916823305 +0800
+@@ -0,0 +1,604 @@
++/*
++ * Device Tree Source for LingYun IGKBoard-6ULL(IoT Gateway Kit Board based on i.MX6ULL)
+ * Based on imx6ul-14x14-evk.dts/imx6ul-14x14-evk.dtsi
+ *
+ * Copyright (C) 2022 LingYun IoT System Studio.
@@ -16,7 +584,7 @@
+
+/ {
+ model = "LingYun IoT System Studio IoT Gateway Board";
-+ compatible = "fsl,imx6ull-14x14-evk", "fsl,imx6ull";
++ compatible = "lingyun,igkboard-6ull", "fsl,imx6ull";
+
+ chosen {
+ stdout-path = &uart1;
@@ -406,12 +974,6 @@
+&iomuxc {
+ pinctrl-names = "default";
+
-+ pinctrl_camera_clock: cameraclockgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_CSI_MCLK__CSI_MCLK 0x1b088
-+ >;
-+ };
-+
+ pinctrl_gpio_leds: gpio-leds {
+ fsl,pins = <
+ MX6UL_PAD_NAND_DQS__GPIO4_IO16 0x17059 /* led run */
@@ -442,6 +1004,7 @@
+ fsl,pins = <
+ MX6UL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x17059 /* CSI_RST */
+ MX6UL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x17059 /* CSI_PWDN */
++ MX6UL_PAD_CSI_MCLK__CSI_MCLK 0x1b088
+ MX6UL_PAD_CSI_PIXCLK__CSI_PIXCLK 0x1b088
+ MX6UL_PAD_CSI_VSYNC__CSI_VSYNC 0x1b088
+ MX6UL_PAD_CSI_HSYNC__CSI_HSYNC 0x1b088
@@ -611,682 +1174,22 @@
+
+};
+
-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 2022-11-28 06:08:27.847623408 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/Makefile 2022-11-28 06:04:23.919613905 -0800
-@@ -1586,3 +1586,6 @@
- aspeed-bmc-portwell-neptune.dtb \
- aspeed-bmc-quanta-q71l.dtb \
- aspeed-bmc-supermicro-x11spi.dtb
-+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/adc.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/adc.dts
---- linux-imx/arch/arm/boot/dts/overlays/adc.dts 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/adc.dts 2022-11-28 06:04:26.879614021 -0800
-@@ -0,0 +1,27 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+/dts-v1/;
-+/plugin/;
+diff -Nuar --no-dereference linux-imx/arch/arm/boot/dts/Makefile linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/Makefile
+--- linux-imx/arch/arm/boot/dts/Makefile 2023-11-02 19:16:16.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/boot/dts/Makefile 2023-11-06 15:18:03.133120462 +0800
+@@ -1749,3 +1749,8 @@
+ aspeed-bmc-vegman-n110.dtb \
+ aspeed-bmc-vegman-rx20.dtb \
+ aspeed-bmc-vegman-sx20.dtb
+
-+#include "../imx6ul-pinfunc.h"
++DTC_FLAGS_igkboard-6ull := -@
++dtb-$(CONFIG_SOC_IMX6UL) += igkboard-6ull.dtb
++subdir-$(CONFIG_SOC_IMX6UL) += igkboard-6ull
+
-+/* 40-pin extended GPIO, ADC interfaces */
-+
-+&adc1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_adc1>;
-+ num-channels = <5>;
-+ vref-supply = <®_peri_3v3>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl_adc1: adc1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_GPIO1_IO01__GPIO1_IO01 0xb0 /* ADC1_1 --->TS_YN */
-+ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0xb0 /* ADC1_4 --->TS_XP */
-+ >;
-+ };
-+};
-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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/cam.dts 2022-11-28 06:04:26.883614021 -0800
-@@ -0,0 +1,24 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/* MIPI-DSI2 camera overlay */
-+
-+&pxp { /* Pixel Pipeline (PXP) is a memory-to-memory graphics processing */
-+ status = "okay";
-+};
-+
-+&csi {
-+ 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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can1.dts 2022-11-28 06:04:26.883614021 -0800
-@@ -0,0 +1,28 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "../imx6ul-pinfunc.h"
-+
-+/* 40-pin extended GPIO, CAN1 interfaces */
-+
-+&can1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_flexcan1>;
-+ xceiver-supply = <®_can_3v3>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl_flexcan1: flexcan1grp{
-+ fsl,pins = <
-+ MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x1b020
-+ MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX 0x1b020
-+ >;
-+ };
-+};
-+
-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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can2.dts 2022-11-28 06:04:26.883614021 -0800
-@@ -0,0 +1,28 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "../imx6ul-pinfunc.h"
-+
-+/* 40-pin extended GPIO, CAN2 interfaces */
-+
-+&can2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_flexcan2>;
-+ xceiver-supply = <®_can_3v3>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl_flexcan2: flexcan2grp{
-+ fsl,pins = <
-+ MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX 0x1b020
-+ MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX 0x1b020
-+ >;
-+ };
-+};
-+
-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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/i2c1.dts 2022-11-28 06:04:26.887614021 -0800
-@@ -0,0 +1,28 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "../imx6ul-pinfunc.h"
-+
-+/* 40-pin extended GPIO, I2C1 interfaces */
-+
-+&i2c1 {
-+ clock-frequency = <100000>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0
-+ MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b0
-+ >;
-+ };
-+};
-+
-diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/lcd_drm.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/lcd_drm.dts
---- linux-imx/arch/arm/boot/dts/overlays/lcd_drm.dts 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/lcd_drm.dts 2022-11-28 06:04:26.887614021 -0800
-@@ -0,0 +1,82 @@
-+/*
-+ * 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"
-+
-+/* LCD DRM display overlay */
-+
-+&backlight_lcd {
-+ status = "okay";
-+};
-+
-+&i2c2 {
-+ gt9xx@5d {
-+ status = "okay";
-+ };
-+};
-+
-+&lcdif {
-+ assigned-clocks = <&clks IMX6UL_CLK_LCDIF_PRE_SEL>;
-+ assigned-clock-parents = <&clks IMX6UL_CLK_PLL5_VIDEO_DIV>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>;
-+ status = "okay";
-+
-+ port {
-+ display_output: endpoint {
-+ remote-endpoint = <&panel_input>;
-+ };
-+ };
-+};
-+
-+&panel {
-+ compatible = "fsl,imx6ull-panel", "panel-simple";
-+ backlight = <&backlight_lcd>;
-+ power-supply = <®_3p3v>;
-+ status = "okay";
-+
-+ port {
-+ panel_input: endpoint {
-+ remote-endpoint = <&display_output>;
-+ };
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl_lcdif_dat: lcdifdatgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x79
-+ MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x79
-+ MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x79
-+ MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x79
-+ MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x79
-+ MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x79
-+ MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x79
-+ MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x79
-+ MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x79
-+ MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x79
-+ MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x79
-+ MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x79
-+ MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x79
-+ MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x79
-+ MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x79
-+ MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x79
-+ >;
-+ };
-+
-+ pinctrl_lcdif_ctrl: lcdifctrlgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x79
-+ MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x79
-+ MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x79
-+ MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x79
-+ MX6UL_PAD_LCD_RESET__LCDIF_RESET 0x79
-+ >;
-+ };
-+};
-+
-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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/lcd.dts 2022-11-28 06:04:26.887614021 -0800
-@@ -0,0 +1,89 @@
-+/*
-+ * 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"
-+
-+/* LCD display overlay */
-+
-+&backlight_lcd {
-+ status = "okay";
-+};
-+
-+&i2c2 {
-+ gt9xx@5d {
-+ status = "okay";
-+ };
-+};
-+
-+&lcdif {
-+ assigned-clocks = <&clks IMX6UL_CLK_LCDIF_PRE_SEL>;
-+ assigned-clock-parents = <&clks IMX6UL_CLK_PLL5_VIDEO_DIV>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>;
-+ display = <&display0>;
-+ status = "okay";
-+
-+ display0: display@0 {
-+ bits-per-pixel = <16>;
-+ bus-width = <16>;
-+
-+ display-timings {
-+ native-mode = <&timing0>;
-+
-+ timing0: timing0 {
-+ clock-frequency = <30000000>;
-+ hactive = <800>;
-+ vactive = <480>;
-+ hfront-porch = <40>;
-+ hback-porch = <88>;
-+ hsync-len = <48>;
-+ vback-porch = <32>;
-+ vfront-porch = <13>;
-+ vsync-len = <3>;
-+ hsync-active = <0>;
-+ vsync-active = <0>;
-+ de-active = <1>;
-+ pixelclk-active = <0>;
-+ };
-+ };
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl_lcdif_dat: lcdifdatgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x79
-+ MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x79
-+ MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x79
-+ MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x79
-+ MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x79
-+ MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x79
-+ MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x79
-+ MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x79
-+ MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x79
-+ MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x79
-+ MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x79
-+ MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x79
-+ MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x79
-+ MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x79
-+ MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x79
-+ MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x79
-+ >;
-+ };
-+
-+ pinctrl_lcdif_ctrl: lcdifctrlgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x79
-+ MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x79
-+ MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x79
-+ MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/Makefile 2022-11-28 06:04:26.879614021 -0800
-@@ -0,0 +1,20 @@
-+# SPDX-License-Identifier: GPL-2.0
-+# required for overlay support
-+
-+DTC_FLAGS += -@
-+dtb-y += can1.dtbo
-+dtb-y += can2.dtbo
-+dtb-y += i2c1.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 += w1.dtbo
-+dtb-y += lcd.dtbo
-+dtb-y += cam.dtbo
-+dtb-y += nbiot-4g.dtbo
-+dtb-y += adc.dtbo
-+dtb-y += lcd_drm.dtbo
-diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/nbiot-4g.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/nbiot-4g.dts
---- linux-imx/arch/arm/boot/dts/overlays/nbiot-4g.dts 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/nbiot-4g.dts 2022-11-28 06:04:26.891614021 -0800
-@@ -0,0 +1,34 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "../imx6ul-pinfunc.h"
-+
-+/* NB-IoT/4G module use UART8 interfaces, conflict with SPI interface */
-+
-+&uart8 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_spi_uart8 &pinctrl_nbiot_ctrl>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl_spi_uart8: spi_uart8_grp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA20__UART8_DCE_TX 0x1b0b1 /* MRXD */
-+ MX6UL_PAD_LCD_DATA21__UART8_DCE_RX 0x1b0b1 /* MTXD */
-+ >;
-+ };
-+
-+ pinctrl_nbiot_ctrl: nbiot_ctrl_grp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA22__GPIO3_IO27 0x17059 /* NB_PWREN/4G_RESET */
-+ MX6UL_PAD_JTAG_TRST_B__GPIO1_IO15 0x17059 /* NB_MRST/4G_POWER_KEY */
-+ >;
-+ };
-+};
-+
-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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm7.dts 2022-11-28 06:04:26.891614021 -0800
-@@ -0,0 +1,28 @@
-+/*
-+ * 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_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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm8.dts 2022-11-28 06:04:26.895614021 -0800
-@@ -0,0 +1,28 @@
-+/*
-+ * 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, conflict with NB-IoT */
-+
-+&pwm8 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm8_nbiot>;
-+ clocks = <&clks IMX6UL_CLK_PWM8>, <&clks IMX6UL_CLK_PWM8>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl_pwm8_nbiot: pwm8nbiotgrp {
-+ 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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/spi1.dts 2022-11-28 06:04:26.895614021 -0800
-@@ -0,0 +1,39 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include "../imx6ul-pinfunc.h"
-+
-+/* 40-pin extended GPIO, SPI1 interfaces, conflict with UART8 */
-+
-+&ecspi1 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_spi_uart8>;
-+ cs-gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
-+ status = "okay";
-+
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ spidev0: spi@0 {
-+ reg = <0>;
-+ compatible = "semtech,sx1301";
-+ spi-max-frequency = <1000000>;
-+ };
-+};
-+
-+&iomuxc {
-+ pinctrl_spi_uart8: spi_uart8_grp {
-+ fsl,pins = <
-+ 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
-+ >;
-+ };
-+};
-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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart2.dts 2022-11-28 06:04:26.895614021 -0800
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "../imx6ul-pinfunc.h"
-+
-+/* 40-pin extended GPIO, UART2 interfaces */
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1
-+ MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1
-+ >;
-+ };
-+};
-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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart3.dts 2022-11-28 06:04:26.899614021 -0800
-@@ -0,0 +1,27 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "../imx6ul-pinfunc.h"
-+
-+/* 40-pin extended GPIO, UART3 interfaces */
-+
-+&uart3 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART3_TX_DATA__UART3_DCE_TX 0x1b0b1
-+ MX6UL_PAD_UART3_RX_DATA__UART3_DCE_RX 0x1b0b1
-+ >;
-+ };
-+};
-+
-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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart4.dts 2022-11-28 06:04:26.899614021 -0800
-@@ -0,0 +1,27 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "../imx6ul-pinfunc.h"
-+
-+/* 40-pin extended GPIO, UART4 interfaces */
-+
-+&uart4 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart4>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl_uart4: uart4grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART4_TX_DATA__UART4_DCE_TX 0x1b0b1
-+ MX6UL_PAD_UART4_RX_DATA__UART4_DCE_RX 0x1b0b1
-+ >;
-+ };
-+};
-+
-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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart7.dts 2022-11-28 06:04:26.899614021 -0800
-@@ -0,0 +1,27 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "../imx6ul-pinfunc.h"
-+
-+/* 40-pin extended GPIO, UART7 interfaces, conflict with LCD display */
-+
-+&uart7 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart7>;
-+ status = "okay";
-+};
-+
-+&iomuxc {
-+ pinctrl_uart7: uart7grp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA16__UART7_DCE_TX 0x1b0b1
-+ MX6UL_PAD_LCD_DATA17__UART7_DCE_RX 0x1b0b1
-+ >;
-+ };
-+};
-+
-diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/w1.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/w1.dts
---- linux-imx/arch/arm/boot/dts/overlays/w1.dts 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/w1.dts 2022-11-28 06:04:26.903614021 -0800
-@@ -0,0 +1,31 @@
-+/*
-+ * Copyright (C) 2022 LingYun IoT System Studio
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include "../imx6ul-pinfunc.h"
-+
-+/* W1(DS18B20) on 40Pin Header Pin#7 (GPIO1_IO18) */
-+
-+&w1 {
-+ compatible = "w1-gpio";
-+ status = "okay";
-+
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_w1>;
-+ gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
-+};
-+
-+
-+&iomuxc {
-+ pinctrl_w1: w1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x110b0
-+ >;
-+ };
-+};
-+
-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 1969-12-31 16:00:00.000000000 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/configs/igkboard_defconfig 2022-11-28 06:04:27.851614058 -0800
-@@ -0,0 +1,587 @@
+diff -Nuar --no-dereference linux-imx/arch/arm/configs/igkboard-6ull_defconfig linux-imx-lf-6.1.36-2.1.0/arch/arm/configs/igkboard-6ull_defconfig
+--- linux-imx/arch/arm/configs/igkboard-6ull_defconfig 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/arch/arm/configs/igkboard-6ull_defconfig 2023-11-06 15:27:28.409402087 +0800
+@@ -0,0 +1,604 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
@@ -1351,8 +1254,6 @@
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
-+CONFIG_TLS=y
-+CONFIG_TLS_DEVICE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
@@ -1533,9 +1434,6 @@
+CONFIG_GPIO_PCF857X=y
+CONFIG_GPIO_STMPE=y
+CONFIG_GPIO_74X164=y
-+CONFIG_W1=y
-+CONFIG_W1_MASTER_GPIO=y
-+CONFIG_W1_SLAVE_THERM=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
@@ -1850,10 +1748,7 @@
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
-+CONFIG_CRYPTO_USER_API_HASH=m
-+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
-+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m
@@ -1874,99 +1769,149 @@
+# 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/gpu/drm/mxsfb/mxsfb_drv.c linux-imx-lf-5.10.52-2.1.0/drivers/gpu/drm/mxsfb/mxsfb_drv.c
---- linux-imx/drivers/gpu/drm/mxsfb/mxsfb_drv.c 2022-11-28 06:08:47.387624169 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/drivers/gpu/drm/mxsfb/mxsfb_drv.c 2022-11-28 06:04:49.967614920 -0800
-@@ -407,7 +407,7 @@
- .probe = mxsfb_probe,
++
++# enable AF_ALG
++CONFIG_CRYPTO_USER_API_HASH=m
++CONFIG_CRYPTO_USER_API_SKCIPHER=m
++CONFIG_CRYPTO_USER_API_AEAD=m
++
++# enable KTLS
++CONFIG_TLS=y
++CONFIG_TLS_DEVICE=y
++
++#enable trust based hardware key
++CONFIG_TRUSTED_KEYS=m
++CONFIG_TRUSTED_KEYS_TPM=n
++CONFIG_TRUSTED_KEYS_TEE=n
++CONFIG_TRUSTED_KEYS_CAAM=n
++CONFIG_TRUSTED_KEYS_DCP=y
++
++# Custom Addition of Linke
++# enable one wire device driver
++CONFIG_W1=y
++CONFIG_W1_MASTER_GPIO=y
++CONFIG_W1_SLAVE_THERM=y
++
++# enable drm to realize fb
++CONFIG_DRM_MXSFB=y
+diff -Nuar --no-dereference linux-imx/drivers/gpu/drm/mxsfb/mxsfb_drv.c linux-imx-lf-6.1.36-2.1.0/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+--- linux-imx/drivers/gpu/drm/mxsfb/mxsfb_drv.c 2023-11-02 19:16:20.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/drivers/gpu/drm/mxsfb/mxsfb_drv.c 2023-11-06 15:53:47.190930928 +0800
+@@ -370,7 +370,7 @@
+ if (ret)
+ goto err_unload;
+
+- drm_fbdev_generic_setup(drm, 32);
++ drm_fbdev_generic_setup(drm, 16); /* modify color depth to support RGB565 LCD by guowenxue */
+
+ return 0;
+
+@@ -426,7 +426,7 @@
.remove = mxsfb_remove,
+ .shutdown = mxsfb_shutdown,
.driver = {
- .name = "mxsfb",
+ .name = "mxsfb-drm",
.of_match_table = mxsfb_dt_ids,
.pm = &mxsfb_pm_ops,
},
-diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/drivers/gpu/drm/panel/panel-simple.c linux-imx-lf-5.10.52-2.1.0/drivers/gpu/drm/panel/panel-simple.c
---- linux-imx/drivers/gpu/drm/panel/panel-simple.c 2022-11-28 06:08:48.747624222 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/drivers/gpu/drm/panel/panel-simple.c 2022-11-28 06:04:51.015614961 -0800
-@@ -4502,8 +4502,37 @@
+diff -Nuar --no-dereference linux-imx/drivers/gpu/drm/panel/panel-simple.c linux-imx-lf-6.1.36-2.1.0/drivers/gpu/drm/panel/panel-simple.c
+--- linux-imx/drivers/gpu/drm/panel/panel-simple.c 2023-11-02 19:16:20.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/drivers/gpu/drm/panel/panel-simple.c 2023-11-06 15:22:10.121834728 +0800
+@@ -4024,8 +4024,33 @@
.bus_format = MEDIA_BUS_FMT_RGB888_1X24,
};
-+static const struct drm_display_mode fsl_imx6ull_panel_mode[] = {
-+ {
-+ .clock = 30000,
-+ .hdisplay = 800,
-+ .hsync_start = 800 + 40,
-+ .hsync_end = 800 + 40 + 48,
-+ .htotal = 800 + 40 + 48 + 88,
-+ .vdisplay = 480,
-+ .vsync_start = 480 + 13,
-+ .vsync_end = 480 + 13 + 3,
-+ .vtotal = 480 + 13 + 3 + 32,
-+ .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC,
-+ },
++static const struct drm_display_mode igkboard_6ull_panel_mode[] = {
++ {
++ .clock = 30000,
++ .hdisplay = 800,
++ .hsync_start = 800 + 40,
++ .hsync_end = 800 + 40 + 48,
++ .htotal = 800 + 40 + 48 + 88,
++ .vdisplay = 480,
++ .vsync_start = 480 + 13,
++ .vsync_end = 480 + 13 + 3,
++ .vtotal = 480 + 13 + 3 + 32,
++ .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC,
++ },
+};
+
-+static const struct panel_desc fsl_imx6ull_panel = {
-+ .modes = fsl_imx6ull_panel_mode,
-+ .num_modes = 1,
-+ .bpc = 8,
-+ .size = {
-+ .width = 110,
-+ .height = 60,
-+ },
-+ .bus_format = MEDIA_BUS_FMT_RGB565_1X16,
++static const struct panel_desc igkboard_6ull_panel = {
++ .modes = igkboard_6ull_panel_mode,
++ .num_modes = 1,
++ .bpc = 8,
++ .bus_format = MEDIA_BUS_FMT_RGB565_1X16,
+};
+
static const struct of_device_id platform_of_match[] = {
{
-+ .compatible = "fsl,imx6ull-panel",
-+ .data = &fsl_imx6ull_panel,
++ .compatible = "lingyun,igkboard-6ull-panel",
++ .data = &igkboard_6ull_panel,
+ }, {
.compatible = "ampire,am-1280800n3tzqw-t00h",
.data = &ire_am_1280800n3tzqw_t00h,
}, {
-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 2022-11-28 06:09:10.931625086 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/drivers/video/backlight/pwm_bl.c 2022-11-28 06:05:23.943616244 -0800
-@@ -552,6 +552,7 @@
- if (!state.period && (data->pwm_period_ns > 0))
- state.period = data->pwm_period_ns;
+diff -Nuar --no-dereference linux-imx/drivers/video/backlight/pwm_bl.c linux-imx-lf-6.1.36-2.1.0/drivers/video/backlight/pwm_bl.c
+--- linux-imx/drivers/video/backlight/pwm_bl.c 2023-11-02 19:16:23.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/drivers/video/backlight/pwm_bl.c 2023-11-06 15:23:41.654067332 +0800
+@@ -53,7 +53,7 @@
+ if (err < 0)
+ dev_err(pb->dev, "failed to enable power supply\n");
-+ 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/drivers/video/fbdev/mxsfb.c linux-imx-lf-5.10.52-2.1.0/drivers/video/fbdev/mxsfb.c
---- linux-imx/drivers/video/fbdev/mxsfb.c 2022-11-28 06:09:11.115625093 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/drivers/video/fbdev/mxsfb.c 2022-11-28 06:05:24.299616257 -0800
+- state.enabled = true;
++ state.enabled = true; /* enalbe backlight as default */
+ pwm_apply_state(pb->pwm, &state);
+
+ if (pb->post_pwm_on_delay)
+diff -Nuar --no-dereference linux-imx/drivers/video/fbdev/core/fbcon.c linux-imx-lf-6.1.36-2.1.0/drivers/video/fbdev/core/fbcon.c
+--- linux-imx/drivers/video/fbdev/core/fbcon.c 2023-11-02 19:16:23.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/drivers/video/fbdev/core/fbcon.c 2023-11-06 15:25:02.898865305 +0800
+@@ -345,6 +345,7 @@
+ return color;
+ }
+
++#if 0 /* comment by guowenxue */
+ static void fb_flashcursor(struct work_struct *work)
+ {
+ struct fbcon_ops *ops = container_of(work, struct fbcon_ops, cursor_work.work);
+@@ -384,6 +385,9 @@
+ queue_delayed_work(system_power_efficient_wq, &ops->cursor_work,
+ ops->cur_blink_jiffies);
+ }
++#else
++static void fb_flashcursor(struct work_struct *work) {}
++#endif
+
+ static void fbcon_add_cursor_work(struct fb_info *info)
+ {
+@@ -1301,6 +1305,7 @@
+ ops->clear_margins(vc, info, margin_color, bottom_only);
+ }
+
++#if 0 /* comment by guowenxue */
+ static void fbcon_cursor(struct vc_data *vc, int mode)
+ {
+ struct fb_info *info = fbcon_info_from_console(vc->vc_num);
+@@ -1325,6 +1330,9 @@
+ ops->cursor(vc, info, mode, get_color(vc, info, c, 1),
+ get_color(vc, info, c, 0));
+ }
++#else
++static void fbcon_cursor(struct vc_data *vc, int mode) {}
++#endif
+
+ static int scrollback_phys_max = 0;
+ static int scrollback_max = 0;
+diff -Nuar --no-dereference linux-imx/drivers/video/fbdev/mxsfb.c linux-imx-lf-6.1.36-2.1.0/drivers/video/fbdev/mxsfb.c
+--- linux-imx/drivers/video/fbdev/mxsfb.c 2023-11-02 19:16:23.000000000 +0800
++++ linux-imx-lf-6.1.36-2.1.0/drivers/video/fbdev/mxsfb.c 2023-11-06 15:25:54.296899119 +0800
@@ -1586,7 +1586,7 @@
static const struct of_device_id mxsfb_dt_ids[] = {
{ .compatible = "fsl,imx23-lcdif", .data = &mxsfb_devtype[0], },
- { .compatible = "fsl,imx28-lcdif", .data = &mxsfb_devtype[1], },
-+ // { .compatible = "fsl,imx28-lcdif", .data = &mxsfb_devtype[1], },
++ //{ .compatible = "fsl,imx28-lcdif", .data = &mxsfb_devtype[1], }, /* Use DRM driver as default */
{ .compatible = "fsl,imx7ulp-lcdif", .data = &mxsfb_devtype[2], },
{ /* sentinel */ }
};
-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 2022-11-28 06:08:27.447623392 -0800
-+++ linux-imx-lf-5.10.52-2.1.0/Makefile 2022-11-28 06:04:21.247613801 -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/gcc-arm-10.3-2021.07/bin/arm-none-linux-gnueabihf-
-
- # Architecture as present in compile.h
- UTS_MACHINE := $(ARCH)
-@@ -1880,6 +1882,7 @@
- \( -name '*.[aios]' -o -name '*.ko' -o -name '.*.cmd' \
- -o -name '*.ko.*' \
- -o -name '*.dtb' -o -name '*.dtbo' -o -name '*.dtb.S' -o -name '*.dt.yaml' \
-+ -o -name '*.dtbo' \
- -o -name '*.dwo' -o -name '*.lst' \
- -o -name '*.su' -o -name '*.mod' \
- -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
--
Gitblit v1.9.1