From b2b582833aaa8cc9d9d6e152d014f7129e0c5c43 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sun, 09 Oct 2022 13:53:00 +0800
Subject: [PATCH] update linux-imx-lf-5.10.52-2.1.0.patch to support yocto
---
bsp/kernel/patch/linux-imx-lf-5.10.52-2.1.0.patch | 520 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 320 insertions(+), 200 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 1a81a5a..8037445 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,18 +1,18 @@
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 00:55:03.361803601 +0800
-@@ -0,0 +1,688 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/igkboard.dts 2022-10-09 13:19:22.622732242 +0800
+@@ -0,0 +1,608 @@
+/*
+ * Device Tree Source for LingYun IGKBoard(IoT Gateway Kit Board)
+ * Based on imx6ul-14x14-evk.dts/imx6ul-14x14-evk.dtsi
+ *
+ * Copyright (C) 2022 LingYun IoT System Studio.
-+ * Author: Guo Wenxue<guowenxue@gmail.com>
++ * Author: Guo Wenxue<guowenxue@gmail.com>
+ */
+
+/dts-v1/;
+
-+#include "imx6ul.dtsi"
++#include "imx6ull.dtsi"
+
+/ {
+ model = "LingYun IoT System Studio IoT Gateway Board";
@@ -144,21 +144,37 @@
+ status = "disabled"; /* Enable in LCD overlay */
+ };
+
-+/*
++ /* 1-Wire sentinel for overlay */
++ w1: w1 {
++ compatible = "w1-gpio";
++ status = "disabled";
++ };
++
++ mqs: mqs {
++ #sound-dai-cells = <0>;
++ compatible = "fsl,imx6sx-mqs";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_mqs>;
++ clocks = <&clks IMX6UL_CLK_SAI1>;
++ clock-names = "mclk";
++ gpr = <&gpr>;
++ status = "okay";
++ };
++
+ sound-mqs {
+ compatible = "fsl,imx-audio-mqs";
+ model = "mqs-audio";
-+ cpu-dai = <&sai1>;
-+ asrc-controller = <&asrc>;
++ audio-cpu = <&sai1>;
++ audio-asrc = <&asrc>;
+ audio-codec = <&mqs>;
+ status = "okay";
+ };
-+*/
+};
+
-+/*+-------------------+
-+ | Misc Modules |
-+ +-------------------+*/
++
++/*+--------------+
++ | Misc Modules |
++ +--------------+*/
+
+&snvs_poweroff {
+ status = "okay";
@@ -188,9 +204,10 @@
+ status = "okay";
+};
+
-+/*+-------------------+
-+ | Camera Module |
-+ +-------------------+*/
++
++/*+---------------+
++ | Camera Module |
++ +---------------+*/
+
+&i2c2 {
+ clock-frequency = <100000>;
@@ -237,7 +254,7 @@
+ mclk = <24000000>;
+ mclk_source = <0>;
+ /* rotation = <180>; */
-+ status = "disabled"; /* Enable in camera overlay */
++ status = "disabled"; /* Enable in CAM overlay */
+ port {
+ ov5640_ep: endpoint {
+ remote-endpoint = <&csi1_ep>;
@@ -246,8 +263,8 @@
+ };
+};
+
-+&csi { /* camera ov5640 */
-+ status = "okay";
++&csi {
++ status = "disabled"; /* Enable in CAM overlay */
+ port {
+ csi1_ep: endpoint {
+ remote-endpoint = <&ov5640_ep>;
@@ -256,39 +273,39 @@
+};
+
+
-+/*+-------------------+
-+ | Audio Module |
-+ +-------------------+*/
++/*+--------------+
++ | Audio Module |
++ +--------------+*/
++
++/* Refrence: https://www.toradex.com/zh-cn/blog/colibri-imx6ull-kuo-zhan-yin-pin-jie-ma-qi-max98357a
++ * +--------------------+--------------------+-----------------------+---------------------+
++ * | Audio Sample Rates | Bit Clock | PLL4_AUDIO_DIV(512) | CLK_SAI1(/16) |
++ * +--------------------+--------------------+-----------------------+---------------------+
++ * | 16bit,2Ch,48KHz | 16x2x48000=1536000 | 1536000x512=786432000 | 1536000x16=24576000 |
++ * +--------------------+--------------------+-----------------------+---------------------+
++ * | 16bit,2Ch,44.1KHz | 16x2x44100=1411200 | 1411200x512=722534400 | 1411200x16=22579200 |
++ * +--------------------+--------------------+-----------------------+---------------------+
++ */
+
+&clks {
+ assigned-clocks = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
-+ assigned-clock-rates = <786432000>;
++ //assigned-clock-rates = <786432000>; // 16bit,2Ch,48KHz
++ assigned-clock-rates = <722534400>; // 16bit,2Ch,44.1KHz
+};
-+
-+/*
-+&mqs {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_mqs>;
-+ clocks = <&clks IMX6UL_CLK_SAI1>;
-+ clock-names = "mclk";
-+ status = "okay";
-+};
-+*/
+
+&sai1 {
-+ assigned-clocks = <&clks IMX6UL_CLK_SAI1_SEL>,
-+ <&clks IMX6UL_CLK_SAI1>;
++ assigned-clocks = <&clks IMX6UL_CLK_SAI1_SEL>, <&clks IMX6UL_CLK_SAI1>;
+ assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
-+ assigned-clock-rates = <0>, <24576000>;
++ //assigned-clock-rates = <0>, <24576000>; // 16bit,2Ch,48KHz
++ assigned-clock-rates = <0>, <22579200>; // 16bit,2Ch,44.1KHz
+ fsl,sai-mclk-direction-output;
+ status = "okay";
+};
+
+
-+
-+/*+-------------------+
-+ | Ethernet Modules |
-+ +-------------------+*/
++/*+------------------+
++ | Ethernet Modules |
++ +------------------+*/
+
+&fec1 { /* eth0 */
+ pinctrl-names = "default";
@@ -334,10 +351,9 @@
+};
+
+
-+
-+/*+-------------------+
-+ | USB interface |
-+ +-------------------+*/
++/*+---------------+
++ | USB interface |
++ +---------------+*/
+
+&usbotg1 {
+ dr_mode = "otg";
@@ -361,9 +377,9 @@
+};
+
+
-+/*+-------------------+
-+ | USDCHC interface |
-+ +-------------------+*/
++/*+------------------+
++ | USDCHC interface |
++ +------------------+*/
+
+&usdhc1 { /* tf card slot */
+ pinctrl-names = "default", "state_100mhz", "state_200mhz";
@@ -389,107 +405,9 @@
+};
+
+
-+/*+------------------------------+
-+ | 40 Pin Header GPIO iomuxc |
-+ +------------------------------+*/
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_extgpio>;
-+ pinctrl-1 = <&pinctrl_i2c1 &pinctrl_ecspi1_master>;
-+ pinctrl-2 = <&pinctrl_flexcan1 &pinctrl_flexcan2>;
-+ pinctrl-3 = <&pinctrl_pwm>;
-+ pinctrl-4 = <&pinctrl_uart2 &pinctrl_uart3 &pinctrl_uart4 &pinctrl_uart7>;
-+ pinctrl-5 = <&pinctrl_lcdif_dat>;
-+
-+ pinctrl_extgpio: extgpiogrp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART1_CTS_B__GPIO1_IO18 0x17059 /* 7# GPIO */
-+ MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x17059 /* 35# GPIO */
-+ MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x17059 /* 37# GPIO */
-+ MX6UL_PAD_JTAG_TMS__GPIO1_IO11 0x17059 /* 36# GPIO */
-+ MX6UL_PAD_JTAG_MOD__GPIO1_IO10 0x17059 /* 38# GPIO */
-+ MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x17059 /* 40# GPIO */
-+ >;
-+ };
-+
-+ pinctrl_i2c1: i2c1grp {
-+ fsl,pins = <
-+ MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0x17059 /* 3# I2C1_SDA */
-+ MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x17059 /* 5# I2C1_SCL */
-+ >;
-+ };
-+
-+ 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 */
-+ MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x17059 /* 29# CAN1_RX */
-+ >;
-+ };
-+
-+ pinctrl_flexcan2: flexcan2grp{
-+ fsl,pins = <
-+ MX6UL_PAD_UART2_CTS_B__GPIO1_IO22 0x17059 /* 31# CAN2_TX */
-+ MX6UL_PAD_UART2_RTS_B__GPIO1_IO23 0x17059 /* 33# CAN2_RX */
-+ >;
-+ };
-+
-+ pinctrl_pwm: pwmgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_JTAG_TRST_B__GPIO1_IO15 0x17059 /* 28# PWM8 */
-+ MX6UL_PAD_JTAG_TCK__GPIO1_IO14 0x17059 /* 32# PWM7 */
-+ >;
-+ };
-+
-+ pinctrl_uart2: uart2grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART2_TX_DATA__GPIO1_IO20 0x17059 /* 8# UART2_TX */
-+ MX6UL_PAD_UART2_RX_DATA__GPIO1_IO21 0x17059 /* 10# UART2_RX */
-+ >;
-+ };
-+
-+ pinctrl_uart3: uart3grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x17059 /* 11# UART3_TX */
-+ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x17059 /* 12# UART3_RX */
-+ >;
-+ };
-+
-+ pinctrl_uart4: uart4grp {
-+ fsl,pins = <
-+ MX6UL_PAD_UART4_TX_DATA__GPIO1_IO28 0x17059 /* 13# UART4_TX */
-+ MX6UL_PAD_UART4_RX_DATA__GPIO1_IO29 0x17059 /* 15# UART4_RX */
-+ >;
-+ };
-+
-+ pinctrl_uart7: uart7grp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA16__GPIO3_IO21 0x17059 /* 16# UART7_TX */
-+ MX6UL_PAD_LCD_DATA17__GPIO3_IO22 0x17059 /* 18# UART7_RX */
-+ >;
-+ };
-+
-+ pinctrl_lcdif_dat: lcdifdatgrp {
-+ fsl,pins = <
-+ MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x17059 /* 22# GPIO */
-+ MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x17059 /* 26# GPIO */
-+ >;
-+ };
-+};
-+
-+
-+/*+--------------------------+
-+ | Basic pinctrl iomuxc |
-+ +--------------------------+*/
++/*+----------------------+
++ | Basic pinctrl iomuxc |
++ +----------------------+*/
+&iomuxc {
+ pinctrl-names = "default";
+
@@ -521,6 +439,8 @@
+
+ pinctrl_csi1: csi1grp {
+ 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
@@ -692,7 +612,7 @@
+
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-11 23:31:44.840599746 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/Makefile 2022-10-09 13:19:22.622732242 +0800
@@ -1490,3 +1490,6 @@
aspeed-bmc-opp-zaius.dtb \
aspeed-bmc-portwell-neptune.dtb \
@@ -702,8 +622,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 00:16:12.099379575 +0800
-@@ -0,0 +1,16 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/cam.dts 2022-10-09 13:19:22.626732206 +0800
+@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
+ * Author: Guo Wenxue<guowenxue@gmail.com>
@@ -714,6 +634,14 @@
+
+/* 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";
@@ -722,8 +650,8 @@
+
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-11 23:31:44.840599746 +0800
-@@ -0,0 +1,29 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can1.dts 2022-10-09 13:19:22.626732206 +0800
+@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
+ * Author: Guo Wenxue<guowenxue@gmail.com>
@@ -744,7 +672,6 @@
+};
+
+&iomuxc {
-+ pinctrl-2 = <&pinctrl_flexcan1>;
+ pinctrl_flexcan1: flexcan1grp{
+ fsl,pins = <
+ MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x1b020
@@ -755,8 +682,8 @@
+
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-11 23:31:44.840599746 +0800
-@@ -0,0 +1,29 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can2.dts 2022-10-09 13:19:22.626732206 +0800
+@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
+ * Author: Guo Wenxue<guowenxue@gmail.com>
@@ -777,7 +704,6 @@
+};
+
+&iomuxc {
-+ pinctrl-2 = <&pinctrl_flexcan2>;
+ pinctrl_flexcan2: flexcan2grp{
+ fsl,pins = <
+ MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX 0x1b020
@@ -788,8 +714,8 @@
+
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-11 23:31:44.840599746 +0800
-@@ -0,0 +1,29 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/i2c1.dts 2022-10-09 13:19:22.626732206 +0800
+@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
+ * Author: Guo Wenxue<guowenxue@gmail.com>
@@ -810,7 +736,6 @@
+};
+
+&iomuxc {
-+ pinctrl-1 = <&pinctrl_i2c1>;
+ pinctrl_i2c1: i2c1grp {
+ fsl,pins = <
+ MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0
@@ -821,8 +746,8 @@
+
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-12 00:05:07.087247158 +0800
-@@ -0,0 +1,99 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/lcd.dts 2022-10-09 13:19:22.626732206 +0800
+@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
+ * Author: Guo Wenxue<guowenxue@gmail.com>
@@ -850,8 +775,7 @@
+ 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>;
++ pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>;
+ display = <&display0>;
+ status = "okay";
+
@@ -882,7 +806,6 @@
+};
+
+&iomuxc {
-+ pinctrl-5 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>;
+ pinctrl_lcdif_dat: lcdifdatgrp {
+ fsl,pins = <
+ MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x79
@@ -901,14 +824,6 @@
+ MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x79
+ MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x79
+ MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x79
-+ MX6UL_PAD_LCD_DATA16__LCDIF_DATA16 0x79
-+ MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x79
-+ MX6UL_PAD_LCD_DATA18__LCDIF_DATA18 0x79
-+ MX6UL_PAD_LCD_DATA19__LCDIF_DATA19 0x79
-+ MX6UL_PAD_LCD_DATA20__LCDIF_DATA20 0x79
-+ MX6UL_PAD_LCD_DATA21__LCDIF_DATA21 0x79
-+ MX6UL_PAD_LCD_DATA22__LCDIF_DATA22 0x79
-+ MX6UL_PAD_LCD_DATA23__LCDIF_DATA23 0x79
+ >;
+ };
+
@@ -924,8 +839,8 @@
+};
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-12 00:16:27.339271593 +0800
-@@ -0,0 +1,16 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/Makefile 2022-10-09 13:19:22.626732206 +0800
+@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: GPL-2.0
+
+# required for overlay support
@@ -939,13 +854,119 @@
+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
++
+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 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/nbiot-4g.dts 2022-10-09 13:19:22.626732206 +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 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-10-09 13:19:22.626732206 +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 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-10-09 13:19:22.626732206 +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 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-11 23:31:44.840599746 +0800
-@@ -0,0 +1,40 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/spi1.dts 2022-10-09 13:19:22.626732206 +0800
+@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
+ * Author: Guo Wenxue<guowenxue@gmail.com>
@@ -957,11 +978,11 @@
+#include <dt-bindings/gpio/gpio.h>
+#include "../imx6ul-pinfunc.h"
+
-+/* 40-pin extended GPIO, SPI1 interfaces, conflict with LCD display */
++/* 40-pin extended GPIO, SPI1 interfaces, conflict with UART8 */
+
+&ecspi1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1_master>;
++ pinctrl-0 = <&pinctrl_spi_uart8>;
+ cs-gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
+ status = "okay";
+
@@ -976,8 +997,7 @@
+};
+
+&iomuxc {
-+ pinctrl-1 = <&pinctrl_ecspi1_master>;
-+ pinctrl_ecspi1_master: ecspi1grp1 {
++ pinctrl_spi_uart8: spi_uart8_grp {
+ fsl,pins = <
+ MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x10b0
+ MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI 0x10b0
@@ -988,8 +1008,8 @@
+};
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-11 23:31:44.840599746 +0800
-@@ -0,0 +1,27 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart2.dts 2022-10-09 13:19:22.626732206 +0800
+@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
+ * Author: Guo Wenxue<guowenxue@gmail.com>
@@ -1009,7 +1029,6 @@
+};
+
+&iomuxc {
-+ pinctrl-4 = <&pinctrl_uart2>;
+ pinctrl_uart2: uart2grp {
+ fsl,pins = <
+ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1
@@ -1019,8 +1038,8 @@
+};
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-11 23:31:44.840599746 +0800
-@@ -0,0 +1,28 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart3.dts 2022-10-09 13:19:22.626732206 +0800
+@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
+ * Author: Guo Wenxue<guowenxue@gmail.com>
@@ -1040,7 +1059,6 @@
+};
+
+&iomuxc {
-+ pinctrl-4 = <&pinctrl_uart3>;
+ pinctrl_uart3: uart3grp {
+ fsl,pins = <
+ MX6UL_PAD_UART3_TX_DATA__UART3_DCE_TX 0x1b0b1
@@ -1051,8 +1069,8 @@
+
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-11 23:31:44.840599746 +0800
-@@ -0,0 +1,28 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart4.dts 2022-10-09 13:19:22.626732206 +0800
+@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
+ * Author: Guo Wenxue<guowenxue@gmail.com>
@@ -1072,7 +1090,6 @@
+};
+
+&iomuxc {
-+ pinctrl-4 = <&pinctrl_uart4>;
+ pinctrl_uart4: uart4grp {
+ fsl,pins = <
+ MX6UL_PAD_UART4_TX_DATA__UART4_DCE_TX 0x1b0b1
@@ -1083,8 +1100,8 @@
+
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-11 23:31:44.840599746 +0800
-@@ -0,0 +1,28 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart7.dts 2022-10-09 13:19:22.626732206 +0800
+@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 LingYun IoT System Studio
+ * Author: Guo Wenxue<guowenxue@gmail.com>
@@ -1104,7 +1121,6 @@
+};
+
+&iomuxc {
-+ pinctrl-4 = <&pinctrl_uart7>;
+ pinctrl_uart7: uart7grp {
+ fsl,pins = <
+ MX6UL_PAD_LCD_DATA16__UART7_DCE_TX 0x1b0b1
@@ -1113,10 +1129,45 @@
+ };
+};
+
+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 1970-01-01 08:00:00.000000000 +0800
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/w1.dts 2022-10-09 13:19:22.626732206 +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 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 00:42:07.385407198 +0800
-@@ -0,0 +1,722 @@
++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/configs/igkboard_defconfig 2022-10-09 13:20:51.349955648 +0800
+@@ -0,0 +1,726 @@
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
@@ -1365,6 +1416,9 @@
+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
@@ -1621,10 +1675,11 @@
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_FSL_ASRC=y
-+CONFIG_SND_SOC_FSL_SAI=y
+CONFIG_SND_SOC_FSL_MQS=y
+CONFIG_SND_SOC_FSL_RPMSG=y
+CONFIG_SND_IMX_SOC=y
++CONFIG_SND_SOC_FSL_ASOC_CARD=y
++CONFIG_SND_SOC_AC97_CODEC=y
+CONFIG_SND_SIMPLE_CARD=y
+CONFIG_HID_MULTITOUCH=y
+CONFIG_USB=y
@@ -1839,20 +1894,73 @@
+# 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/bluetooth/btrtl.c linux-imx-lf-5.10.52-2.1.0/drivers/bluetooth/btrtl.c
+--- linux-imx/drivers/bluetooth/btrtl.c 2021-09-08 18:41:11.000000000 +0800
++++ linux-imx-lf-5.10.52-2.1.0/drivers/bluetooth/btrtl.c 2022-10-09 13:19:22.626732206 +0800
+@@ -136,12 +136,12 @@
+ .fw_name = "rtl_bt/rtl8761a_fw.bin",
+ .cfg_name = "rtl_bt/rtl8761a_config" },
+
+- /* 8761B */
++ /* 8761BU */
+ { IC_INFO(RTL_ROM_LMP_8761A, 0xb),
+ .config_needed = false,
+ .has_rom_version = true,
+- .fw_name = "rtl_bt/rtl8761b_fw.bin",
+- .cfg_name = "rtl_bt/rtl8761b_config" },
++ .fw_name = "rtl_bt/rtl8761bu_fw.bin",
++ .cfg_name = "rtl_bt/rtl8761bu_config" },
+
+ /* 8822C with UART interface */
+ { .match_flags = IC_MATCH_FL_LMPSUBV | IC_MATCH_FL_HCIREV |
+diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/drivers/bluetooth/btusb.c linux-imx-lf-5.10.52-2.1.0/drivers/bluetooth/btusb.c
+--- linux-imx/drivers/bluetooth/btusb.c 2021-09-08 18:41:11.000000000 +0800
++++ linux-imx-lf-5.10.52-2.1.0/drivers/bluetooth/btusb.c 2022-10-09 13:19:22.626732206 +0800
+@@ -419,6 +419,9 @@
+ { USB_DEVICE(0x0bda, 0xb009), .driver_info = BTUSB_REALTEK },
+ { USB_DEVICE(0x2ff8, 0xb011), .driver_info = BTUSB_REALTEK },
+
++ /* Additional Realtek 8761B Bluetooth devices */
++ { USB_DEVICE(0x2357, 0x0604), .driver_info = BTUSB_REALTEK },
++
+ /* Additional Realtek 8821AE Bluetooth devices */
+ { USB_DEVICE(0x0b05, 0x17dc), .driver_info = BTUSB_REALTEK },
+ { USB_DEVICE(0x13d3, 0x3414), .driver_info = BTUSB_REALTEK },
+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-10-09 13:19:22.626732206 +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-11 23:31:44.844599695 +0800
++++ linux-imx-lf-5.10.52-2.1.0/Makefile 2022-10-09 13:20:41.118045212 +0800
@@ -367,7 +367,8 @@
# Alternatively CROSS_COMPILE can be set in the environment.
# 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-
-
++CROSS_COMPILE ?= arm-linux-gnueabihf-
+
# Architecture as present in compile.h
UTS_MACHINE := $(ARCH)
-@@ -1833,6 +1834,7 @@
+@@ -1353,6 +1354,9 @@
+ %.dtb: include/config/kernel.release scripts_dtc
+ $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
+
++%.dtbo: include/config/kernel.release scripts_dtc
++ $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
++
+ PHONY += dtbs dtbs_install dtbs_check
+ dtbs: include/config/kernel.release scripts_dtc
+ $(Q)$(MAKE) $(build)=$(dtstree)
+@@ -1833,6 +1837,7 @@
\( -name '*.[aios]' -o -name '*.ko' -o -name '.*.cmd' \
-o -name '*.ko.*' \
-o -name '*.dtb' -o -name '*.dtb.S' -o -name '*.dt.yaml' \
@@ -1862,11 +1970,11 @@
-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-11 23:31:44.840599746 +0800
++++ linux-imx-lf-5.10.52-2.1.0/scripts/Makefile.lib 2022-10-09 13:19:22.630732171 +0800
@@ -325,6 +325,16 @@
$(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE
$(call if_changed_dep,dtc)
-
+
+quiet_cmd_dtco = DTCO $@
+cmd_dtco = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+ $(DTC) -O dtb -o $@ -b 0 \
@@ -1880,3 +1988,15 @@
DT_CHECKER ?= dt-validate
DT_BINDING_DIR := Documentation/devicetree/bindings
# DT_TMP_SCHEMA may be overridden from Documentation/devicetree/bindings/Makefile
+diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/sound/soc/fsl/fsl_sai.c linux-imx-lf-5.10.52-2.1.0/sound/soc/fsl/fsl_sai.c
+--- linux-imx/sound/soc/fsl/fsl_sai.c 2021-09-08 18:41:11.000000000 +0800
++++ linux-imx-lf-5.10.52-2.1.0/sound/soc/fsl/fsl_sai.c 2022-10-09 13:19:22.630732171 +0800
+@@ -1349,7 +1349,7 @@
+ sai->bus_clk = NULL;
+ }
+
+- for (i = 0; i < FSL_SAI_MCLK_MAX; i++) {
++ for (i = 1; i < FSL_SAI_MCLK_MAX; i++) {
+ sprintf(tmp, "mclk%d", i);
+ sai->mclk_clk[i] = devm_clk_get(&pdev->dev, tmp);
+ if (IS_ERR(sai->mclk_clk[i])) {
--
Gitblit v1.9.1