From e77618540841b570ae6688e5f9469c77c0619112 Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Thu, 06 Oct 2022 16:12:01 +0800 Subject: [PATCH] update uboot,linux kernel patch to remove space --- bsp/kernel/patch/linux-imx-lf-5.10.52-2.1.0.patch | 148 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 107 insertions(+), 41 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 6efe569..0e14b5c 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-07-01 23:26:14.474433030 +0800 -@@ -0,0 +1,587 @@ ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/igkboard.dts 2022-07-20 19:47:14.215487408 +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 @@ -149,6 +149,26 @@ + 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"; ++ audio-cpu = <&sai1>; ++ audio-asrc = <&asrc>; ++ audio-codec = <&mqs>; ++ status = "okay"; ++ }; +}; + + @@ -257,26 +277,27 @@ + | 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"; +}; @@ -591,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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/Makefile 2022-07-20 19:47:14.215487408 +0800 @@ -1490,3 +1490,6 @@ aspeed-bmc-opp-zaius.dtb \ aspeed-bmc-portwell-neptune.dtb \ @@ -601,7 +622,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.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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/cam.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -629,7 +650,7 @@ + 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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can1.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -661,7 +682,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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/can2.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -693,7 +714,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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/i2c1.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -725,7 +746,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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/lcd.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -818,7 +839,7 @@ +}; 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-07-01 23:18:56.918832072 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/Makefile 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -842,7 +863,7 @@ + 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-06-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/nbiot-4g.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -880,7 +901,7 @@ + diff -Nuar --no-dereference -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/overlays/pwm7.dts linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm7.dts --- linux-imx/arch/arm/boot/dts/overlays/pwm7.dts 1970-01-01 08:00:00.000000000 +0800 -+++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm7.dts 2022-06-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm7.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -912,7 +933,7 @@ + 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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/pwm8.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -944,7 +965,7 @@ + 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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/spi1.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -987,7 +1008,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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart2.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1017,7 +1038,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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart3.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1048,7 +1069,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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart4.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1079,7 +1100,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-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/uart7.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1110,7 +1131,7 @@ + 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-07-01 23:24:26.823525995 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/boot/dts/overlays/w1.dts 2022-07-20 19:47:14.215487408 +0800 @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2022 LingYun IoT System Studio @@ -1145,8 +1166,8 @@ + 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-07-02 00:03:42.508486161 +0800 -@@ -0,0 +1,725 @@ ++++ linux-imx-lf-5.10.52-2.1.0/arch/arm/configs/igkboard_defconfig 2022-07-24 10:47:11.013928964 +0800 +@@ -0,0 +1,726 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y @@ -1654,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 @@ -1872,20 +1894,52 @@ +# 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-07-24 10:55:55.972627066 +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-07-24 10:55:27.392918113 +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-06-30 22:41:52.453623639 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/drivers/video/backlight/pwm_bl.c 2022-07-20 19:47:14.219487363 +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-30 23:05:52.907066766 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/Makefile 2022-07-24 10:36:33.204084146 +0800 @@ -367,7 +367,8 @@ # Alternatively CROSS_COMPILE can be set in the environment. # Default value for CROSS_COMPILE is not to prefix executables @@ -1893,7 +1947,7 @@ -ARCH ?= $(SUBARCH) +ARCH ?= arm +CROSS_COMPILE?=/opt/buildroot/cortexA7/bin/arm-linux- - + # Architecture as present in compile.h UTS_MACHINE := $(ARCH) @@ -1833,6 +1834,7 @@ @@ -1906,11 +1960,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-30 22:41:52.457623624 +0800 ++++ linux-imx-lf-5.10.52-2.1.0/scripts/Makefile.lib 2022-07-20 19:47:14.223487317 +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 \ @@ -1924,3 +1978,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-07-20 19:47:14.227487272 +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