From e632fdc9ff4880ae65706fcd8f5d950ff26c7c7e Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Tue, 08 Oct 2024 16:42:08 +0800
Subject: [PATCH] update linux kernel patch, fix dtc compile bug
---
bsp/kernel/patches/loragw/linux-at91-linux4sam-6.1.patch | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/bsp/kernel/patches/loragw/linux-at91-linux4sam-6.1.patch b/bsp/kernel/patches/loragw/linux-at91-linux4sam-6.1.patch
index 3bb90aa..37c5f20 100644
--- a/bsp/kernel/patches/loragw/linux-at91-linux4sam-6.1.patch
+++ b/bsp/kernel/patches/loragw/linux-at91-linux4sam-6.1.patch
@@ -1,6 +1,6 @@
diff -Nuar -x include-prefixes -x .gitignore linux-at91/arch/arm/boot/dts/at91sam9x35ek.dts linux-at91-loragw/arch/arm/boot/dts/at91sam9x35ek.dts
--- linux-at91/arch/arm/boot/dts/at91sam9x35ek.dts 2019-07-10 18:07:41.000000000 +0800
-+++ linux-at91-loragw/arch/arm/boot/dts/at91sam9x35ek.dts 2024-05-22 15:51:24.600628467 +0800
++++ linux-at91-loragw/arch/arm/boot/dts/at91sam9x35ek.dts 2024-10-08 15:53:07.131777488 +0800
@@ -22,24 +22,24 @@
status = "okay";
};
@@ -33,7 +33,7 @@
};
diff -Nuar -x include-prefixes -x .gitignore linux-at91/arch/arm/boot/dts/at91sam9x5cm.dtsi linux-at91-loragw/arch/arm/boot/dts/at91sam9x5cm.dtsi
--- linux-at91/arch/arm/boot/dts/at91sam9x5cm.dtsi 2019-07-10 18:07:41.000000000 +0800
-+++ linux-at91-loragw/arch/arm/boot/dts/at91sam9x5cm.dtsi 2024-05-22 15:51:24.600628467 +0800
++++ linux-at91-loragw/arch/arm/boot/dts/at91sam9x5cm.dtsi 2024-10-08 15:53:07.131777488 +0800
@@ -42,10 +42,17 @@
atmel,pins = <AT91_PIOB 18 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PB18 multidrive, conflicts with led */
};
@@ -180,7 +180,7 @@
};
diff -Nuar -x include-prefixes -x .gitignore linux-at91/arch/arm/boot/dts/at91sam9x5.dtsi linux-at91-loragw/arch/arm/boot/dts/at91sam9x5.dtsi
--- linux-at91/arch/arm/boot/dts/at91sam9x5.dtsi 2019-07-10 18:07:41.000000000 +0800
-+++ linux-at91-loragw/arch/arm/boot/dts/at91sam9x5.dtsi 2024-05-22 15:51:24.600628467 +0800
++++ linux-at91-loragw/arch/arm/boot/dts/at91sam9x5.dtsi 2024-10-08 15:53:07.135777407 +0800
@@ -713,8 +713,8 @@
i2c_gpio0 {
pinctrl_i2c_gpio0: i2c_gpio0-0 {
@@ -205,7 +205,7 @@
i2c-gpio,scl-open-drain;
diff -Nuar -x include-prefixes -x .gitignore linux-at91/arch/arm/boot/dts/at91sam9x5ek.dtsi linux-at91-loragw/arch/arm/boot/dts/at91sam9x5ek.dtsi
--- linux-at91/arch/arm/boot/dts/at91sam9x5ek.dtsi 2019-07-10 18:07:41.000000000 +0800
-+++ linux-at91-loragw/arch/arm/boot/dts/at91sam9x5ek.dtsi 2024-05-22 15:51:24.600628467 +0800
++++ linux-at91-loragw/arch/arm/boot/dts/at91sam9x5ek.dtsi 2024-10-08 15:53:07.135777407 +0800
@@ -24,7 +24,7 @@
&pinctrl_board_mmc0
&pinctrl_mmc0_slot0_clk_cmd_dat0
@@ -269,7 +269,7 @@
diff -Nuar -x include-prefixes -x .gitignore linux-at91/arch/arm/configs/loragw_defconfig linux-at91-loragw/arch/arm/configs/loragw_defconfig
--- linux-at91/arch/arm/configs/loragw_defconfig 1970-01-01 08:00:00.000000000 +0800
-+++ linux-at91-loragw/arch/arm/configs/loragw_defconfig 2024-05-22 16:40:37.467522135 +0800
++++ linux-at91-loragw/arch/arm/configs/loragw_defconfig 2024-10-08 15:56:53.791404675 +0800
@@ -0,0 +1,439 @@
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
@@ -712,7 +712,7 @@
+CONFIG_DEBUG_USER=y
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/net/usb/ec20/GobiUSBNet.c linux-at91-loragw/drivers/net/usb/ec20/GobiUSBNet.c
--- linux-at91/drivers/net/usb/ec20/GobiUSBNet.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux-at91-loragw/drivers/net/usb/ec20/GobiUSBNet.c 2024-05-22 15:51:24.604628419 +0800
++++ linux-at91-loragw/drivers/net/usb/ec20/GobiUSBNet.c 2024-10-08 15:53:07.135777407 +0800
@@ -0,0 +1,1700 @@
+/*===========================================================================
+FILE:
@@ -2416,7 +2416,7 @@
+
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/net/usb/ec20/Kconfig linux-at91-loragw/drivers/net/usb/ec20/Kconfig
--- linux-at91/drivers/net/usb/ec20/Kconfig 1970-01-01 08:00:00.000000000 +0800
-+++ linux-at91-loragw/drivers/net/usb/ec20/Kconfig 2024-05-22 15:51:24.604628419 +0800
++++ linux-at91-loragw/drivers/net/usb/ec20/Kconfig 2024-10-08 15:53:07.135777407 +0800
@@ -0,0 +1,13 @@
+#
+# Quectel EC20 GobiNet driver configuration
@@ -2433,7 +2433,7 @@
+ If unsure, say N.
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/net/usb/ec20/Makefile linux-at91-loragw/drivers/net/usb/ec20/Makefile
--- linux-at91/drivers/net/usb/ec20/Makefile 1970-01-01 08:00:00.000000000 +0800
-+++ linux-at91-loragw/drivers/net/usb/ec20/Makefile 2024-05-22 15:51:24.604628419 +0800
++++ linux-at91-loragw/drivers/net/usb/ec20/Makefile 2024-10-08 15:53:07.135777407 +0800
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_EC20_GOBINET) += GobiNet.o
@@ -2441,7 +2441,7 @@
+
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/net/usb/ec20/QMI.c linux-at91-loragw/drivers/net/usb/ec20/QMI.c
--- linux-at91/drivers/net/usb/ec20/QMI.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux-at91-loragw/drivers/net/usb/ec20/QMI.c 2024-05-22 15:51:24.604628419 +0800
++++ linux-at91-loragw/drivers/net/usb/ec20/QMI.c 2024-10-08 15:53:07.135777407 +0800
@@ -0,0 +1,1386 @@
+/*===========================================================================
+FILE:
@@ -3831,7 +3831,7 @@
+}
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/net/usb/ec20/QMIDevice.c linux-at91-loragw/drivers/net/usb/ec20/QMIDevice.c
--- linux-at91/drivers/net/usb/ec20/QMIDevice.c 1970-01-01 08:00:00.000000000 +0800
-+++ linux-at91-loragw/drivers/net/usb/ec20/QMIDevice.c 2024-05-22 15:51:24.604628419 +0800
++++ linux-at91-loragw/drivers/net/usb/ec20/QMIDevice.c 2024-10-08 15:53:07.139777327 +0800
@@ -0,0 +1,4096 @@
+/*===========================================================================
+FILE:
@@ -7931,7 +7931,7 @@
+}
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/net/usb/ec20/QMIDevice.h linux-at91-loragw/drivers/net/usb/ec20/QMIDevice.h
--- linux-at91/drivers/net/usb/ec20/QMIDevice.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux-at91-loragw/drivers/net/usb/ec20/QMIDevice.h 2024-05-22 15:51:24.604628419 +0800
++++ linux-at91-loragw/drivers/net/usb/ec20/QMIDevice.h 2024-10-08 15:53:07.139777327 +0800
@@ -0,0 +1,345 @@
+/*===========================================================================
+FILE:
@@ -8280,7 +8280,7 @@
+int QMIWDASetDataFormat( sGobiUSBNet * pDev );
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/net/usb/ec20/QMI.h linux-at91-loragw/drivers/net/usb/ec20/QMI.h
--- linux-at91/drivers/net/usb/ec20/QMI.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux-at91-loragw/drivers/net/usb/ec20/QMI.h 2024-05-22 15:51:24.608628371 +0800
++++ linux-at91-loragw/drivers/net/usb/ec20/QMI.h 2024-10-08 15:53:07.139777327 +0800
@@ -0,0 +1,328 @@
+/*===========================================================================
+FILE:
@@ -8612,7 +8612,7 @@
+
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/net/usb/ec20/Structs.h linux-at91-loragw/drivers/net/usb/ec20/Structs.h
--- linux-at91/drivers/net/usb/ec20/Structs.h 1970-01-01 08:00:00.000000000 +0800
-+++ linux-at91-loragw/drivers/net/usb/ec20/Structs.h 2024-05-22 15:51:24.608628371 +0800
++++ linux-at91-loragw/drivers/net/usb/ec20/Structs.h 2024-10-08 15:53:07.139777327 +0800
@@ -0,0 +1,442 @@
+/*===========================================================================
+FILE:
@@ -9058,7 +9058,7 @@
+
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/net/usb/Kconfig linux-at91-loragw/drivers/net/usb/Kconfig
--- linux-at91/drivers/net/usb/Kconfig 2019-07-10 18:07:41.000000000 +0800
-+++ linux-at91-loragw/drivers/net/usb/Kconfig 2024-05-22 15:51:24.608628371 +0800
++++ linux-at91-loragw/drivers/net/usb/Kconfig 2024-10-08 15:53:07.139777327 +0800
@@ -613,4 +613,6 @@
To compile this driver as a module, choose M here: the
module will be called ch9200.
@@ -9068,7 +9068,7 @@
endif # USB_NET_DRIVERS
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/net/usb/Makefile linux-at91-loragw/drivers/net/usb/Makefile
--- linux-at91/drivers/net/usb/Makefile 2019-07-10 18:07:41.000000000 +0800
-+++ linux-at91-loragw/drivers/net/usb/Makefile 2024-05-22 15:51:24.608628371 +0800
++++ linux-at91-loragw/drivers/net/usb/Makefile 2024-10-08 15:53:07.139777327 +0800
@@ -40,3 +40,4 @@
obj-$(CONFIG_USB_NET_QMI_WWAN) += qmi_wwan.o
obj-$(CONFIG_USB_NET_CDC_MBIM) += cdc_mbim.o
@@ -9076,7 +9076,7 @@
+obj-$(CONFIG_EC20_GOBINET) += ec20/
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/net/usb/qmi_wwan.c linux-at91-loragw/drivers/net/usb/qmi_wwan.c
--- linux-at91/drivers/net/usb/qmi_wwan.c 2019-07-10 18:07:41.000000000 +0800
-+++ linux-at91-loragw/drivers/net/usb/qmi_wwan.c 2024-05-22 15:51:24.608628371 +0800
++++ linux-at91-loragw/drivers/net/usb/qmi_wwan.c 2024-10-08 15:53:07.139777327 +0800
@@ -1325,8 +1325,10 @@
{QMI_GOBI_DEVICE(0x05c6, 0x9225)}, /* Sony Gobi 2000 Modem device (N0279, VU730) */
{QMI_GOBI_DEVICE(0x05c6, 0x9245)}, /* Samsung Gobi 2000 Modem device (VL176) */
@@ -9090,7 +9090,7 @@
{QMI_GOBI_DEVICE(0x05c6, 0x9275)}, /* iRex Technologies Gobi 2000 Modem device (VR307) */
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/usb/serial/option.c linux-at91-loragw/drivers/usb/serial/option.c
--- linux-at91/drivers/usb/serial/option.c 2019-07-10 18:07:41.000000000 +0800
-+++ linux-at91-loragw/drivers/usb/serial/option.c 2024-05-22 15:51:24.608628371 +0800
++++ linux-at91-loragw/drivers/usb/serial/option.c 2024-10-08 15:53:07.139777327 +0800
@@ -1774,7 +1774,7 @@
{ USB_DEVICE(ALINK_VENDOR_ID, ALINK_PRODUCT_PH300) },
{ USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) },
@@ -9102,7 +9102,7 @@
.driver_info = RSVD(7) },
diff -Nuar -x include-prefixes -x .gitignore linux-at91/drivers/usb/serial/qcserial.c linux-at91-loragw/drivers/usb/serial/qcserial.c
--- linux-at91/drivers/usb/serial/qcserial.c 2019-07-10 18:07:41.000000000 +0800
-+++ linux-at91-loragw/drivers/usb/serial/qcserial.c 2024-05-22 15:51:24.608628371 +0800
++++ linux-at91-loragw/drivers/usb/serial/qcserial.c 2024-10-08 15:53:07.139777327 +0800
@@ -88,7 +88,9 @@
{USB_DEVICE(0x03f0, 0x241d)}, /* HP Gobi 2000 QDL device (VP412) */
{USB_DEVICE(0x03f0, 0x251d)}, /* HP Gobi 2000 Modem device (VP412) */
@@ -9115,7 +9115,7 @@
{USB_DEVICE(0x05c6, 0x9234)}, /* Top Global Gobi 2000 QDL device (VR306) */
diff -Nuar -x include-prefixes -x .gitignore linux-at91/linuxrom-loragw.its linux-at91-loragw/linuxrom-loragw.its
--- linux-at91/linuxrom-loragw.its 1970-01-01 08:00:00.000000000 +0800
-+++ linux-at91-loragw/linuxrom-loragw.its 2024-05-22 16:38:16.409073258 +0800
++++ linux-at91-loragw/linuxrom-loragw.its 2024-10-08 15:53:07.139777327 +0800
@@ -0,0 +1,37 @@
+/* U-Boot uImage source file for LoRaWAN Gateway board with AT91SAM9X35 */
+
@@ -9154,3 +9154,15 @@
+ };
+ };
+};
+diff -Nuar -x include-prefixes -x .gitignore linux-at91/scripts/dtc/dtc-lexer.l linux-at91-loragw/scripts/dtc/dtc-lexer.l
+--- linux-at91/scripts/dtc/dtc-lexer.l 2019-07-10 18:07:41.000000000 +0800
++++ linux-at91-loragw/scripts/dtc/dtc-lexer.l 2024-10-08 16:38:32.557221250 +0800
+@@ -38,7 +38,7 @@
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+
+-YYLTYPE yylloc;
++extern YYLTYPE yylloc;
+ extern bool treesource_error;
+
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
--
Gitblit v1.9.1