From be3e07fa577093a15ad3a898ea8426df3d27028f Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 4 Sep 2024 06:27:29 -0400 Subject: [PATCH] Fixes for 5.4 Signed-off-by: Sasha Levin --- ...ation-quirks-add-quirk-for-orangepi-.patch | 41 ++++++++++++ ...nal-for-substituting-empty-acpi-func.patch | 39 +++++++++++ ...-usb-qmi_wwan-add-meig-smart-srm825l.patch | 64 +++++++++++++++++++ queue-5.4/series | 3 + 4 files changed, 147 insertions(+) create mode 100644 queue-5.4/drm-panel-orientation-quirks-add-quirk-for-orangepi-.patch create mode 100644 queue-5.4/i2c-fix-conditional-for-substituting-empty-acpi-func.patch create mode 100644 queue-5.4/net-usb-qmi_wwan-add-meig-smart-srm825l.patch create mode 100644 queue-5.4/series diff --git a/queue-5.4/drm-panel-orientation-quirks-add-quirk-for-orangepi-.patch b/queue-5.4/drm-panel-orientation-quirks-add-quirk-for-orangepi-.patch new file mode 100644 index 00000000000..b0c9f7bac68 --- /dev/null +++ b/queue-5.4/drm-panel-orientation-quirks-add-quirk-for-orangepi-.patch @@ -0,0 +1,41 @@ +From 84c4d7eab393881b559d670d0e70ee3a338199c7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 15 Jul 2024 11:57:49 +0700 +Subject: drm: panel-orientation-quirks: Add quirk for OrangePi Neo + +From: Philip Mueller + +[ Upstream commit d60c429610a14560085d98fa6f4cdb43040ca8f0 ] + +This adds a DMI orientation quirk for the OrangePi Neo Linux Gaming +Handheld. + +Signed-off-by: Philip Mueller +Reviewed-by: Hans de Goede +Signed-off-by: Hans de Goede +Link: https://patchwork.freedesktop.org/patch/msgid/20240715045818.1019979-1-philm@manjaro.org +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/gpu/drm/drm_panel_orientation_quirks.c b/drivers/gpu/drm/drm_panel_orientation_quirks.c +index 43de9dfcba19a..f1091cb87de0c 100644 +--- a/drivers/gpu/drm/drm_panel_orientation_quirks.c ++++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c +@@ -318,6 +318,12 @@ static const struct dmi_system_id orientation_data[] = { + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "ONE XPLAYER"), + }, + .driver_data = (void *)&lcd1600x2560_leftside_up, ++ }, { /* OrangePi Neo */ ++ .matches = { ++ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "OrangePi"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "NEO-01"), ++ }, ++ .driver_data = (void *)&lcd1200x1920_rightside_up, + }, { /* Samsung GalaxyBook 10.6 */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), +-- +2.43.0 + diff --git a/queue-5.4/i2c-fix-conditional-for-substituting-empty-acpi-func.patch b/queue-5.4/i2c-fix-conditional-for-substituting-empty-acpi-func.patch new file mode 100644 index 00000000000..30a1d58fe7e --- /dev/null +++ b/queue-5.4/i2c-fix-conditional-for-substituting-empty-acpi-func.patch @@ -0,0 +1,39 @@ +From 1d53e6552a38b009bdc1c5403f3a4fc8ab903645 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 2 Aug 2024 16:22:14 +0100 +Subject: i2c: Fix conditional for substituting empty ACPI functions + +From: Richard Fitzgerald + +[ Upstream commit f17c06c6608ad4ecd2ccf321753fb511812d821b ] + +Add IS_ENABLED(CONFIG_I2C) to the conditional around a bunch of ACPI +functions. + +The conditional around these functions depended only on CONFIG_ACPI. +But the functions are implemented in I2C core, so are only present if +CONFIG_I2C is enabled. + +Signed-off-by: Richard Fitzgerald +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + include/linux/i2c.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/linux/i2c.h b/include/linux/i2c.h +index af2b799d7a665..fee64a24f9877 100644 +--- a/include/linux/i2c.h ++++ b/include/linux/i2c.h +@@ -979,7 +979,7 @@ static inline int of_i2c_get_board_info(struct device *dev, + struct acpi_resource; + struct acpi_resource_i2c_serialbus; + +-#if IS_ENABLED(CONFIG_ACPI) ++#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_I2C) + bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares, + struct acpi_resource_i2c_serialbus **i2c); + u32 i2c_acpi_find_bus_speed(struct device *dev); +-- +2.43.0 + diff --git a/queue-5.4/net-usb-qmi_wwan-add-meig-smart-srm825l.patch b/queue-5.4/net-usb-qmi_wwan-add-meig-smart-srm825l.patch new file mode 100644 index 00000000000..45b3e0ec065 --- /dev/null +++ b/queue-5.4/net-usb-qmi_wwan-add-meig-smart-srm825l.patch @@ -0,0 +1,64 @@ +From 93aa59bcf362f57f5b09a28845bc61343275bfb0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 3 Aug 2024 15:46:51 +0800 +Subject: net: usb: qmi_wwan: add MeiG Smart SRM825L + +From: ZHANG Yuntian + +[ Upstream commit 1ca645a2f74a4290527ae27130c8611391b07dbf ] + +Add support for MeiG Smart SRM825L which is based on Qualcomm 315 chip. + +T: Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=5000 MxCh= 0 +D: Ver= 3.20 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 9 #Cfgs= 1 +P: Vendor=2dee ProdID=4d22 Rev= 4.14 +S: Manufacturer=MEIG +S: Product=LTE-A Module +S: SerialNumber=6f345e48 +C:* #Ifs= 6 Cfg#= 1 Atr=80 MxPwr=896mA +I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option +E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=82(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option +E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=84(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=03(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option +E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=86(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=04(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) +E: Ad=05(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=88(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan +E: Ad=89(I) Atr=03(Int.) MxPS= 8 Ivl=32ms +E: Ad=8e(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=0f(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms + +Signed-off-by: ZHANG Yuntian +Link: https://patch.msgid.link/D1EB81385E405DFE+20240803074656.567061-1-yt@radxa.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/usb/qmi_wwan.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c +index 3e219cf4dd851..cce5ee84d29d3 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -1387,6 +1387,7 @@ static const struct usb_device_id products[] = { + {QMI_FIXED_INTF(0x2692, 0x9025, 4)}, /* Cellient MPL200 (rebranded Qualcomm 05c6:9025) */ + {QMI_QUIRK_SET_DTR(0x1546, 0x1342, 4)}, /* u-blox LARA-L6 */ + {QMI_QUIRK_SET_DTR(0x33f8, 0x0104, 4)}, /* Rolling RW101 RMNET */ ++ {QMI_FIXED_INTF(0x2dee, 0x4d22, 5)}, /* MeiG Smart SRM825L */ + + /* 4. Gobi 1000 devices */ + {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ +-- +2.43.0 + diff --git a/queue-5.4/series b/queue-5.4/series new file mode 100644 index 00000000000..e6bf9abc19c --- /dev/null +++ b/queue-5.4/series @@ -0,0 +1,3 @@ +drm-panel-orientation-quirks-add-quirk-for-orangepi-.patch +i2c-fix-conditional-for-substituting-empty-acpi-func.patch +net-usb-qmi_wwan-add-meig-smart-srm825l.patch -- 2.47.3