From b651cc5aeb1108fc83cc1cbc7b327c4a65388c43 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 13 Jul 2020 10:29:26 -0500 Subject: Update patches and set order of patches for qmi_wwan.c --- .../0001-linux-4.9-quectel_qmi_wwan_support.patch | 12 ++++++++++++ .../0002-linux-4.9-telit_print_qmi_wwan.patch | 21 +++++++++++++++++++++ .../linux-4.9-quectel_qmi_wwan_support.patch | 12 ------------ .../linux-4.9-telit_print_qmi_wwan.patch | 21 --------------------- recipes-kernel/linux/linux-at91_4.9.87.bb | 4 ++-- 5 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 recipes-kernel/linux/linux-at91-4.9.87/0001-linux-4.9-quectel_qmi_wwan_support.patch create mode 100644 recipes-kernel/linux/linux-at91-4.9.87/0002-linux-4.9-telit_print_qmi_wwan.patch delete mode 100644 recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-quectel_qmi_wwan_support.patch delete mode 100644 recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-telit_print_qmi_wwan.patch (limited to 'recipes-kernel/linux') diff --git a/recipes-kernel/linux/linux-at91-4.9.87/0001-linux-4.9-quectel_qmi_wwan_support.patch b/recipes-kernel/linux/linux-at91-4.9.87/0001-linux-4.9-quectel_qmi_wwan_support.patch new file mode 100644 index 0000000..6c78c81 --- /dev/null +++ b/recipes-kernel/linux/linux-at91-4.9.87/0001-linux-4.9-quectel_qmi_wwan_support.patch @@ -0,0 +1,12 @@ +Patch for QMI WWAN Driver to support the Quectel EG95 device. +================================================================================== +--- a/drivers/net/usb/qmi_wwan.c 2019-06-25 18:33:52.000000000 +0300 ++++ b/drivers/net/usb/qmi_wwan.c 2019-06-25 18:38:06.858767868 +0300 +@@ -945,6 +945,7 @@ static const struct usb_device_id products[] = { + {QMI_FIXED_INTF(0x1e0e, 0x9001, 5)}, /* SIMCom 7230E */ + {QMI_QUIRK_SET_DTR(0x2c7c, 0x0125, 4)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */ + {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */ ++ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */ + {QMI_FIXED_INTF(0x2c7c, 0x0296, 4)}, /* Quectel BG96 */ + {QMI_QUIRK_SET_DTR(0x2c7c, 0x0306, 4)}, /* Quectel EP06 Mini PCIe */ + diff --git a/recipes-kernel/linux/linux-at91-4.9.87/0002-linux-4.9-telit_print_qmi_wwan.patch b/recipes-kernel/linux/linux-at91-4.9.87/0002-linux-4.9-telit_print_qmi_wwan.patch new file mode 100644 index 0000000..7ed5c9b --- /dev/null +++ b/recipes-kernel/linux/linux-at91-4.9.87/0002-linux-4.9-telit_print_qmi_wwan.patch @@ -0,0 +1,21 @@ +Telit LE920A4 uses the same pid 0x1201 of LE920, but modem +implementation is different, since it requires DTR to be set for +answering to qmi messages. + +This patch replaces QMI_FIXED_INTF with QMI_QUIRK_SET_DTR: tests on +LE920 have been performed in order to verify backward compatibility. +Signed-off-by: 's avatarDaniele Palmas +Signed-off-by: 's avatarDavid S. Miller +diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c +index 156f7f85e4860d682d679df68bfe8cfe2a3d4b3b..2474618404f5e592c0fe56d38c30c8988e1ed8ef 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -908,7 +908,7 @@ static const struct usb_device_id products[] = { + {QMI_FIXED_INTF(0x1bc7, 0x1100, 3)}, /* Telit ME910 */ + {QMI_FIXED_INTF(0x1bc7, 0x1101, 3)}, /* Telit ME910 dual modem */ + {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */ +- {QMI_FIXED_INTF(0x1bc7, 0x1201, 2)}, /* Telit LE920 */ ++ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1201, 2)}, /* Telit LE920, LE920A4 */ + {QMI_FIXED_INTF(0x1c9e, 0x9b01, 3)}, /* XS Stick W100-2 from 4G Systems */ + {QMI_FIXED_INTF(0x0b3c, 0xc000, 4)}, /* Olivetti Olicard 100 */ + {QMI_FIXED_INTF(0x0b3c, 0xc001, 4)}, /* Olivetti Olicard 120 */ diff --git a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-quectel_qmi_wwan_support.patch b/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-quectel_qmi_wwan_support.patch deleted file mode 100644 index 6c78c81..0000000 --- a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-quectel_qmi_wwan_support.patch +++ /dev/null @@ -1,12 +0,0 @@ -Patch for QMI WWAN Driver to support the Quectel EG95 device. -================================================================================== ---- a/drivers/net/usb/qmi_wwan.c 2019-06-25 18:33:52.000000000 +0300 -+++ b/drivers/net/usb/qmi_wwan.c 2019-06-25 18:38:06.858767868 +0300 -@@ -945,6 +945,7 @@ static const struct usb_device_id products[] = { - {QMI_FIXED_INTF(0x1e0e, 0x9001, 5)}, /* SIMCom 7230E */ - {QMI_QUIRK_SET_DTR(0x2c7c, 0x0125, 4)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */ - {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */ -+ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */ - {QMI_FIXED_INTF(0x2c7c, 0x0296, 4)}, /* Quectel BG96 */ - {QMI_QUIRK_SET_DTR(0x2c7c, 0x0306, 4)}, /* Quectel EP06 Mini PCIe */ - diff --git a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-telit_print_qmi_wwan.patch b/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-telit_print_qmi_wwan.patch deleted file mode 100644 index f3795b7..0000000 --- a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-telit_print_qmi_wwan.patch +++ /dev/null @@ -1,21 +0,0 @@ -Telit LE920A4 uses the same pid 0x1201 of LE920, but modem -implementation is different, since it requires DTR to be set for -answering to qmi messages. - -This patch replaces QMI_FIXED_INTF with QMI_QUIRK_SET_DTR: tests on -LE920 have been performed in order to verify backward compatibility. -Signed-off-by: 's avatarDaniele Palmas -Signed-off-by: 's avatarDavid S. Miller -diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c -index 156f7f85e4860d682d679df68bfe8cfe2a3d4b3b..2474618404f5e592c0fe56d38c30c8988e1ed8ef 100644 ---- a/drivers/net/usb/qmi_wwan.c -+++ b/drivers/net/usb/qmi_wwan.c -@@ -908,7 +908,7 @@ static const struct usb_device_id products[] = { - {QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */ - {QMI_QUIRK_SET_DTR(0x1bc7, 0x1040, 2)}, /* Telit LE922A */ - {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */ -- {QMI_FIXED_INTF(0x1bc7, 0x1201, 2)}, /* Telit LE920 */ -+ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1201, 2)}, /* Telit LE920, LE920A4 */ - {QMI_FIXED_INTF(0x1c9e, 0x9b01, 3)}, /* XS Stick W100-2 from 4G Systems */ - {QMI_FIXED_INTF(0x0b3c, 0xc000, 4)}, /* Olivetti Olicard 100 */ - {QMI_FIXED_INTF(0x0b3c, 0xc001, 4)}, /* Olivetti Olicard 120 */ diff --git a/recipes-kernel/linux/linux-at91_4.9.87.bb b/recipes-kernel/linux/linux-at91_4.9.87.bb index e433d22..6929d40 100644 --- a/recipes-kernel/linux/linux-at91_4.9.87.bb +++ b/recipes-kernel/linux/linux-at91_4.9.87.bb @@ -42,12 +42,12 @@ COMMON_PATCHES = " \ file://linux-4.9-cdc-acm-ignore-exar-devices.patch \ file://EXTRAVERSION.patch \ file://linux-4.9-ledtrig-netdev.patch \ - file://linux-4.9-telit_print_qmi_wwan.patch \ file://linux-4.9-addl-time-for-pmeccerrloc.patch \ file://950-0090-OF-DT-Overlay-configfs-interface.patch \ file://linux-4.9-led-core-Fix-brightness-setting-when-setting-delay_off-0.patch \ file://linux-4.9-linux4sam-usb-serial-option.patch \ - file://linux-4.9-quectel_qmi_wwan_support.patch \ + file://0001-linux-4.9-quectel_qmi_wwan_support.patch \ + file://0002-linux-4.9-telit_print_qmi_wwan.patch \ " -- cgit v1.2.3 From 2188ab4cbd1320b42d7e358e89c82df6d33fa0c4 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 13 Jul 2020 17:46:42 -0500 Subject: Add KERNEL_REVISION variable and fix up STAGING_KERNEL_BUILDDIR for modules --- recipes-kernel/linux/linux-at91_4.9.87.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'recipes-kernel/linux') diff --git a/recipes-kernel/linux/linux-at91_4.9.87.bb b/recipes-kernel/linux/linux-at91_4.9.87.bb index 6929d40..0fa6005 100644 --- a/recipes-kernel/linux/linux-at91_4.9.87.bb +++ b/recipes-kernel/linux/linux-at91_4.9.87.bb @@ -20,6 +20,7 @@ KERNEL_EXTRA_ARGS ="LOADADDR=0x20008000" PR = "r11" KERNEL_VERSION = "${PV}" +KERNEL_REVISION = "${PR}" EXTRAVERSION = "" SAMV = "linux4sam_5.8" @@ -99,8 +100,11 @@ do_deploy_append() { fi } -# Kernel PR is used for MLINUX_KERNEL_EXTRA_VERSION; share it here: +# Files needed to build external kernel modules. do_shared_workdir_append() { + install -d -m 755 ${STAGING_KERNEL_BUILDDIR}/include/config + cp -a ${B}/include/config ${STAGING_KERNEL_BUILDDIR}/include/ + cp -a ${B}/scripts ${STAGING_KERNEL_BUILDDIR} echo ${PR} > ${STAGING_KERNEL_BUILDDIR}/mlinux_pr } @@ -109,7 +113,7 @@ kernel_do_configure_append() { cd ${S}; git status; cd - } -KERNEL_MODULE_PACKAGE_SUFFIX="" +# KERNEL_MODULE_PACKAGE_SUFFIX="" COMPATIBLE_MACHINE = "(mtcdt|mtrv1|mtr|mtcap|mths)" -- cgit v1.2.3 From 65db7e22511e68d55204f7349e68f1e585f8a270 Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 14 Jul 2020 09:32:56 -0500 Subject: Remove KERNEL_MODULE_PACKAGE_SUFFIX for in-source-tree kernel modules --- recipes-kernel/linux/linux-at91_4.9.87.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-kernel/linux') diff --git a/recipes-kernel/linux/linux-at91_4.9.87.bb b/recipes-kernel/linux/linux-at91_4.9.87.bb index 0fa6005..a3b2e83 100644 --- a/recipes-kernel/linux/linux-at91_4.9.87.bb +++ b/recipes-kernel/linux/linux-at91_4.9.87.bb @@ -113,7 +113,7 @@ kernel_do_configure_append() { cd ${S}; git status; cd - } -# KERNEL_MODULE_PACKAGE_SUFFIX="" +KERNEL_MODULE_PACKAGE_SUFFIX="" COMPATIBLE_MACHINE = "(mtcdt|mtrv1|mtr|mtcap|mths)" -- cgit v1.2.3