Merge pull request #1888 from r3claimer/next

SM8250: Update kernel to 6.17
This commit is contained in:
r3claimer
2025-09-30 07:12:45 -07:00
committed by GitHub
6 changed files with 282 additions and 172 deletions

View File

@@ -60,18 +60,18 @@
|Nintendo|Famicom (famicom)|1983|`famicom`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>**mednafen:** nes<br>|
|Nintendo|Famicom Disk System (fds)|1986|`fds`|.fds .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>**mednafen:** nes<br>|
|Nintendo|Game &amp; Watch (gameandwatch)|1980|`gameandwatch`|.mgw .zip .7z|**retroarch:** gw<br>**retroarch:** mame<br>|
|Nintendo|Game Boy (gb)|1989|`gb`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>**mednafen:** gb<br>|
|Nintendo|Game Boy (Hacks) (gbh)|1989|`gbh`|.gb .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>**mednafen:** gb<br>|
|Nintendo|Game Boy Advance (gba)|2001|`gba`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>**nanoboyadvance:** nanoboyadvance-sa<br>**mednafen:** gba<br>|
|Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>**mednafen:** gba<br>|
|Nintendo|Game Boy Advance video (gbav)|2001|`gbav`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>**mednafen:** gba<br>|
|Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>**mednafen:** gb<br>|
|Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>**mednafen:** gb<br>|
|Nintendo|Game Boy (gb)|1989|`gb`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>**mednafen:** gb<br>**skyemu:** skyemu-sa<br>|
|Nintendo|Game Boy (Hacks) (gbh)|1989|`gbh`|.gb .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>**mednafen:** gb<br>**skyemu:** skyemu-sa<br>|
|Nintendo|Game Boy Advance (gba)|2001|`gba`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>**nanoboyadvance:** nanoboyadvance-sa<br>**mednafen:** gba<br>**skyemu:** skyemu-sa<br>|
|Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>**mednafen:** gba<br>**skyemu:** skyemu-sa<br>|
|Nintendo|Game Boy Advance video (gbav)|2001|`gbav`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**retroarch:** gpsp<br>**mednafen:** gba<br>**skyemu:** skyemu-sa<br>|
|Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>**mednafen:** gb<br>**skyemu:** skyemu-sa<br>|
|Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>**retroarch:** DoubleCherryGB<br>**mednafen:** gb<br>**skyemu:** skyemu-sa<br>|
|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .iso .gcz .ciso .wbfs .rvz .dol .m3u|**dolphin:** dolphin-qt-gc (default)<br>**dolphin:** dolphin-sa-gc<br>**retroarch:** dolphin<br>|
|Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>**mednafen:** nesh<br>|
|Nintendo|Nintendo 3DS (3ds)|2010|`3ds`|.3ds .3dsx .elf .axf .cci .cxi .app|**azahar:** azahar-sa (default)<br>|
|Nintendo|Nintendo 64 (n64)|1996|`n64`|.z64 .n64 .v64 .zip .7z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** parallel_n64<br>**mupen64plus:** mupen64plus-sa<br>**daedalusx64:** daedalusx64-sa<br>|
|Nintendo|Nintendo DS (nds)|2005|`nds`|.nds .zip .7z|**melonds:** melonds-sa (default)<br>**retroarch:** melonds<br>**retroarch:** melondsds<br>**retroarch:** desmume<br>|
|Nintendo|Nintendo DS (nds)|2005|`nds`|.nds .zip .7z|**melonds:** melonds-sa (default)<br>**skyemu:** skyemu-sa<br>**retroarch:** melonds<br>**retroarch:** melondsds<br>**retroarch:** desmume<br>|
|Nintendo|Nintendo Entertainment System (nes)|1985|`nes`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>**mednafen:** nes<br>|
|Nintendo|Pokémon Mini (pokemini)|2001|`pokemini`|.min .zip .7z|**retroarch:** pokemini (default)<br>|
|Nintendo|Satellaview (satellaview)|1995|`satellaview`|.smc .fig .bs .sfc .bsx .swc .zip .7z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>|
@@ -113,7 +113,7 @@
|SNK|Neo Geo CD (neocd)|1994|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
|SNK|Neo Geo Pocket (ngp)|1998|`ngp`|.ngp .ngc .zip .7z|**retroarch:** beetle_ngp (default)<br>**retroarch:** race<br>**mednafen:** ngp<br>|
|SNK|Neo Geo Pocket Color (ngpc)|1999|`ngpc`|.ngp .ngc .zip .7z|**retroarch:** beetle_ngp (default)<br>**retroarch:** race<br>**mednafen:** ngp<br>|
|Sony|PlayStation (psx)|1994|`psx`|.bin .cue .img .mdf .pbp .toc .cbn .m3u .ccd .chd .iso|**retroarch:** pcsx_rearmed32 (default)<br>**retroarch:** pcsx_rearmed<br>**retroarch:** beetle_psx<br>**mednafen:** psx<br>**duckstation:** duckstation-sa<br>**retroarch:** duckstation<br>**retroarch:** swanstation<br>|
|Sony|PlayStation (psx)|1994|`psx`|.bin .cue .img .mdf .pbp .toc .cbn .m3u .ccd .chd .iso|**retroarch:** pcsx_rearmed32 (default)<br>**retroarch:** pcsx_rearmed<br>**retroarch:** beetle_psx<br>**mednafen:** psx<br>**duckstation:** duckstation-sa<br>**retroarch:** swanstation<br>|
|Sony|PlayStation 2 (ps2)|2000|`ps2`|.iso .mdf .nrg .bin .img .dump .gz .cso .chd|**aethersx2:** aethersx2-sa (default)<br>|
|Sony|PlayStation 3 (ps3)|2006|`ps3`|.ps3 .psn .m3u|**rpcs3:** rpcs3-sa (default)<br>|
|Sony|PlayStation Portable (psp)|2004|`psp`|.iso .cso .pbp .chd|**ppsspp:** ppsspp-sa (default)<br>|

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,7 @@
diff -rupbN linux.orig/drivers/power/supply/Kconfig linux/drivers/power/supply/Kconfig
--- linux.orig/drivers/power/supply/Kconfig 2024-11-29 14:02:17.419100354 +0000
+++ linux/drivers/power/supply/Kconfig 2024-11-29 21:54:28.363367313 +0000
@@ -1008,6 +1008,23 @@ config CHARGER_QCOM_SMB2
--- linux.orig/drivers/power/supply/Kconfig 2025-09-29 12:48:19.609606572 +0000
+++ linux/drivers/power/supply/Kconfig 2025-09-29 12:52:27.826638655 +0000
@@ -1064,6 +1064,23 @@ config CHARGER_QCOM_SMB2
adds support for the SMB2 switch mode battery charger found
in PMI8998 and related PMICs.
@@ -26,19 +26,19 @@ diff -rupbN linux.orig/drivers/power/supply/Kconfig linux/drivers/power/supply/K
tristate "Mitsumi MM8013 fuel gauge driver"
depends on I2C
diff -rupbN linux.orig/drivers/power/supply/Makefile linux/drivers/power/supply/Makefile
--- linux.orig/drivers/power/supply/Makefile 2024-11-29 14:02:17.419100354 +0000
+++ linux/drivers/power/supply/Makefile 2024-11-29 21:55:06.444313166 +0000
@@ -116,4 +116,6 @@ obj-$(CONFIG_BATTERY_SURFACE) += surface
--- linux.orig/drivers/power/supply/Makefile 2025-09-29 12:48:19.609606572 +0000
+++ linux/drivers/power/supply/Makefile 2025-09-29 12:58:22.118192478 +0000
@@ -121,4 +121,6 @@ obj-$(CONFIG_BATTERY_SURFACE) += surface
obj-$(CONFIG_CHARGER_SURFACE) += surface_charger.o
obj-$(CONFIG_BATTERY_UG3105) += ug3105_battery.o
obj-$(CONFIG_CHARGER_QCOM_SMB2) += qcom_pmi8998_charger.o
obj-$(CONFIG_CHARGER_QCOM_SMB2) += qcom_smbx.o
+obj-$(CONFIG_CHARGER_QCOM_SMB5) += qcom_pm8150b_charger.o
+obj-$(CONFIG_BATTERY_QCOM_FG) += qcom_fg.o
obj-$(CONFIG_FUEL_GAUGE_MM8013) += mm8013.o
diff -rupbN linux.orig/drivers/power/supply/qcom_fg.c linux/drivers/power/supply/qcom_fg.c
--- linux.orig/drivers/power/supply/qcom_fg.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/power/supply/qcom_fg.c 2024-11-29 21:56:13.189971778 +0000
@@ -0,0 +1,1364 @@
+++ linux/drivers/power/supply/qcom_fg.c 2025-09-29 13:59:01.326700781 +0000
@@ -0,0 +1,1366 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Copyright (c) 2020, The Linux Foundation. All rights reserved. */
+
@@ -1242,7 +1242,8 @@ diff -rupbN linux.orig/drivers/power/supply/qcom_fg.c linux/drivers/power/supply
+ }
+
+ supply_config.drv_data = chip;
+ supply_config.of_node = pdev->dev.of_node;
+ //supply_config.fwnode = pdev->dev.of_node;
+ supply_config.fwnode = dev_fwnode(&pdev->dev);
+
+ chip->batt_psy = devm_power_supply_register(chip->dev,
+ &batt_psy_desc, &supply_config);
@@ -1345,8 +1346,9 @@ diff -rupbN linux.orig/drivers/power/supply/qcom_fg.c linux/drivers/power/supply
+ }
+
+ /* Optional: Get charger power supply for status checking */
+ chip->chg_psy = power_supply_get_by_phandle(chip->dev->of_node,
+ chip->chg_psy = power_supply_get_by_reference(dev_fwnode(chip->dev),
+ "power-supplies");
+
+ if (IS_ERR(chip->chg_psy)) {
+ ret = PTR_ERR(chip->chg_psy);
+ dev_warn(chip->dev, "Failed to get charger supply: %d\n", ret);
@@ -1405,7 +1407,7 @@ diff -rupbN linux.orig/drivers/power/supply/qcom_fg.c linux/drivers/power/supply
+MODULE_LICENSE("GPL v2");
diff -rupbN linux.orig/drivers/power/supply/qcom_pm8150b_charger.c linux/drivers/power/supply/qcom_pm8150b_charger.c
--- linux.orig/drivers/power/supply/qcom_pm8150b_charger.c 1970-01-01 00:00:00.000000000 +0000
+++ linux/drivers/power/supply/qcom_pm8150b_charger.c 2024-11-29 21:56:52.042937680 +0000
+++ linux/drivers/power/supply/qcom_pm8150b_charger.c 2025-09-29 13:35:08.289792859 +0000
@@ -0,0 +1,940 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
@@ -2264,7 +2266,7 @@ diff -rupbN linux.orig/drivers/power/supply/qcom_pm8150b_charger.c linux/drivers
+ return rc;
+
+ supply_config.drv_data = chip;
+ supply_config.of_node = pdev->dev.of_node;
+ supply_config.fwnode = dev_fwnode(&pdev->dev);
+
+ desc = devm_kzalloc(chip->dev, sizeof(smb5_psy_desc), GFP_KERNEL);
+ if (!desc)

View File

@@ -1,18 +1,6 @@
From ef5a3345d6af58fbfa5d9b1ae2df11d6ac259498 Mon Sep 17 00:00:00 2001
From: spycat88 <spycat88@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:18:25 +0000
Subject: [PATCH] drivers: use soc serial for wifi and bluetooth
---
drivers/bluetooth/btqca.c | 100 ++++++++++++++++++++++-
drivers/net/wireless/ath/ath11k/mac.c | 109 ++++++++++++++++++++++++--
drivers/soc/qcom/socinfo.c | 10 +++
3 files changed, 209 insertions(+), 10 deletions(-)
diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index dfbbac92242a..dbe838040a67 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
diff -rupbN linux.orig/drivers/bluetooth/btqca.c linux/drivers/bluetooth/btqca.c
--- linux.orig/drivers/bluetooth/btqca.c 2025-09-29 12:48:18.093601442 +0000
+++ linux/drivers/bluetooth/btqca.c 2025-09-29 13:03:15.325682481 +0000
@@ -13,6 +13,78 @@
#include "btqca.h"
@@ -92,7 +80,7 @@ index dfbbac92242a..dbe838040a67 100644
int qca_read_soc_version(struct hci_dev *hdev, struct qca_btsoc_version *ver,
enum qca_btsoc_type soc_type)
{
@@ -668,7 +740,7 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr)
@@ -714,7 +786,7 @@ int qca_set_bdaddr_rome(struct hci_dev *
}
EXPORT_SYMBOL_GPL(qca_set_bdaddr_rome);
@@ -101,7 +89,7 @@ index dfbbac92242a..dbe838040a67 100644
{
struct hci_rp_read_bd_addr *bda;
struct sk_buff *skb;
@@ -739,6 +811,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
@@ -790,6 +862,7 @@ int qca_uart_setup(struct hci_dev *hdev,
u8 rom_ver = 0;
u32 soc_ver;
u16 boardid = 0;
@@ -109,7 +97,7 @@ index dfbbac92242a..dbe838040a67 100644
bt_dev_dbg(hdev, "QCA setup on UART");
@@ -918,9 +991,30 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
@@ -993,9 +1066,30 @@ int qca_uart_setup(struct hci_dev *hdev,
break;
}
@@ -119,14 +107,14 @@ index dfbbac92242a..dbe838040a67 100644
+ err = generate_bdaddr_from_serial(hdev, &generated_bdaddr);
+ if (err) {
+ bt_dev_err(hdev, "Failed to generate BD_ADDR from serial number");
+ return err;
return err;
+ }
+
+ /* Set the generated BD_ADDR */
+ err = qca_set_bdaddr(hdev, &generated_bdaddr);
+ if (err) {
+ bt_dev_err(hdev, "Failed to set the generated BD_ADDR from serial number");
return err;
+ return err;
+ }
+
+ /* Update hdev->public_addr and hdev->bdaddr */
@@ -142,11 +130,10 @@ index dfbbac92242a..dbe838040a67 100644
bt_dev_info(hdev, "QCA setup on UART is completed");
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index f8068d2e848c..4f7ffc140596 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -165,6 +165,91 @@ static const struct ieee80211_channel ath11k_6ghz_channels[] = {
diff -rupbN linux.orig/drivers/net/wireless/ath/ath11k/mac.c linux/drivers/net/wireless/ath/ath11k/mac.c
--- linux.orig/drivers/net/wireless/ath/ath11k/mac.c 2025-09-29 12:48:19.413605908 +0000
+++ linux/drivers/net/wireless/ath/ath11k/mac.c 2025-09-29 13:05:05.964239071 +0000
@@ -165,6 +165,91 @@ static const struct ieee80211_channel at
CHAN6G(2, 5935, 0),
};
@@ -238,50 +225,43 @@ index f8068d2e848c..4f7ffc140596 100644
static struct ieee80211_rate ath11k_legacy_rates[] = {
{ .bitrate = 10,
.hw_value = ATH11K_HW_RATE_CCK_LP_1M },
@@ -10312,6 +10397,7 @@ int ath11k_mac_register(struct ath11k_base *ab)
@@ -10515,6 +10600,7 @@ int ath11k_mac_register(struct ath11k_ba
int i;
int ret;
u8 mac_addr[ETH_ALEN] = {0};
u8 mac_addr[ETH_ALEN] = {};
+ struct macaddr_t generated_macaddr;
if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags))
return 0;
@@ -10329,14 +10415,23 @@ int ath11k_mac_register(struct ath11k_base *ab)
@@ -10532,6 +10618,10 @@ int ath11k_mac_register(struct ath11k_ba
for (i = 0; i < ab->num_radios; i++) {
pdev = &ab->pdevs[i];
ar = pdev->ar;
- if (ab->pdevs_macaddr_valid) {
- ether_addr_copy(ar->mac_addr, pdev->mac_addr);
+
+ ret = generate_macaddr_from_serial(ar, &generated_macaddr);
+ if (ret) {
+ ath11k_err(ab, "Failed to generate MAC_ADDR from serial number, falling back");
+ if (ab->pdevs_macaddr_valid) {
+ ether_addr_copy(ar->mac_addr, pdev->mac_addr);
+ } else {
+ if (is_zero_ether_addr(mac_addr))
+ ether_addr_copy(ar->mac_addr, ab->mac_addr);
+ else
+ ether_addr_copy(ar->mac_addr, mac_addr);
if (ab->pdevs_macaddr_valid) {
ether_addr_copy(ar->mac_addr, pdev->mac_addr);
} else {
@@ -10539,7 +10629,12 @@ int ath11k_mac_register(struct ath11k_ba
ether_addr_copy(ar->mac_addr, ab->mac_addr);
else
ether_addr_copy(ar->mac_addr, mac_addr);
- ar->mac_addr[4] += i;
+ ar->mac_addr[4] += i; /* adjust offset per radio */
+ }
} else {
- if (is_zero_ether_addr(mac_addr))
- ether_addr_copy(ar->mac_addr, ab->mac_addr);
- else
- ether_addr_copy(ar->mac_addr, mac_addr);
- ar->mac_addr[4] += i;
+ } else {
+ /* If successful, use the newly generated MAC address. */
+ ath11k_reverse_mac(ar->mac_addr, generated_macaddr.b);
+ ath11k_info(ab, "MAC_ADDR set to %pMR", generated_macaddr.b);
}
idr_init(&ar->txmgmt_idr);
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
index ecfd3da9d5e8..238f804e7fe0 100644
--- a/drivers/soc/qcom/socinfo.c
+++ b/drivers/soc/qcom/socinfo.c
@@ -163,6 +163,10 @@ struct smem_image_version {
diff -rupbN linux.orig/drivers/soc/qcom/socinfo.c linux/drivers/soc/qcom/socinfo.c
--- linux.orig/drivers/soc/qcom/socinfo.c 2025-09-29 12:48:19.737607005 +0000
+++ linux/drivers/soc/qcom/socinfo.c 2025-09-29 13:03:15.325682481 +0000
@@ -171,6 +171,10 @@ struct smem_image_version {
};
#endif /* CONFIG_DEBUG_FS */
@@ -292,7 +272,7 @@ index ecfd3da9d5e8..238f804e7fe0 100644
struct qcom_socinfo {
struct soc_device *soc_dev;
struct soc_device_attribute attr;
@@ -795,6 +799,9 @@ static int qcom_socinfo_probe(struct platform_device *pdev)
@@ -817,6 +821,9 @@ static int qcom_socinfo_probe(struct pla
le32_to_cpu(info->serial_num));
if (!qs->attr.serial_number)
return -ENOMEM;
@@ -302,7 +282,7 @@ index ecfd3da9d5e8..238f804e7fe0 100644
}
qs->soc_dev = soc_device_register(&qs->attr);
@@ -818,6 +825,9 @@ static void qcom_socinfo_remove(struct platform_device *pdev)
@@ -840,6 +847,9 @@ static void qcom_socinfo_remove(struct p
soc_device_unregister(qs->soc_dev);
socinfo_debugfs_exit(qs);
@@ -312,6 +292,3 @@ index ecfd3da9d5e8..238f804e7fe0 100644
}
static struct platform_driver qcom_socinfo_driver = {
--
2.34.1

View File

@@ -0,0 +1,13 @@
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index b30aea8b05409094837ad494389d7c22fa1ba7dd..9bcb2c4c34388f343fb93083977b8d2e9a724bb3 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -4687,6 +4687,8 @@ mdss: display-subsystem@ae00000 {
iommus = <&apps_smmu 0x820 0x402>;
+ resets = <&dispcc DISP_CC_MDSS_CORE_BCR>;
+
status = "disabled";
#address-cells = <2>;

View File

@@ -31,7 +31,10 @@ case ${DEVICE} in
;;
*)
case ${DEVICE} in
SM8250|SM8550|H700)
SM8250)
PKG_VERSION="6.17"
;;
SM8550|H700)
PKG_VERSION="6.16.9"
;;
*)