Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 05:45:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qualcomm driver fixes for v6.10

Browse Source 
UCSI support is disabled on SC8280XP while being debugged, as it's
 causing the system to crash. A recent LLCC QDU1000 binding change is
 reverted, to allow expressing the LLCC memory regions.
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCAAzFiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmaDb9AVHGFuZGVyc3Nv
 bkBrZXJuZWwub3JnAAoJEAsfOT8Nma3F25AP/2r6dgLZZBRIqRGdJNnGYwQL/A0Z
 d+YVNUAZHuGEhBo0DLZ+wKKppjpe5qbjAhv6z+iICYoQJfmpKehDvARDuJ1i2zOI
 Y+ui6BiHzbkwk67oGNco5KfcUPMzpUvlLqwl6q36q0PH0AtjUIsAkdH+8I5T6wJF
 7dumDE0blAtO24qtomPOCLZ80bBKsTkILUPWi1AlPtkb7hCjDyjP1zdka8aDVsvd
 AQI1wyv3Z8q6KVbvNLfkrJ986BtYFU0suJhFQMKM64dFYrxpZf1VWoQjQstO6vSf
 SGcDn6OqaM7UC17dN2yJeTko5ORCzWBb9l1eByYeqiW+SH69lQjIUSQ/95QRkzTn
 IcBP27uuCYBmt/GZx+9mOqwp5OBWSpFFfYlhMm3TjYgTofxDrZG2KFLMCIjYx23n
 MH04e61qSHS52jiT2NMbBR4sekZYLe8r4Q5NkGfY6IUZwWvIpA0fYu83QpP98ghQ
 Rb2QG+bAUM0mzl30vhB+CqjtbK5eMHq+ZGyBxOqzygXLv6AXY6PmNcCqcaFwa9Uw
 X46WN3r3lYqSMUSvEK7RDb33jkP08IkVG0EM8/v1/i/hzEAyBXA51OOKnutSQ3pu
 7+qooZBiwSgFf8ryO9KQvw+oHhd4ECW0xL7vzbFmAm7Dy0FZwLUogsWWAOVSYIGC
 LycLmCGjN4xTQA9I
 =NpMV
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmaL9OUACgkQYKtH/8kJ
 Uif6VRAAqGuEP9KBoYQshddtKhlIVJMtd9RIwORJdnriV74trlbmV+KCMpHLAHel
 dHj876nguD9rYpahegubyyyffX2Zs7V69W0XHDDnSJDD8VUEgQG79Ze+Y/jxq2hb
 71Q7BWnyMIUGh3PD/jMD8ILL+7+oUfOpRwb9nH13439n2QqLDJNZtphAhpdqCK5Y
 vt75XM32rILyYk9M4nXMPVM2SOX2ZW8JHFqHFiSh6pMNxxhqfR7dMPCx/JjpdRyP
 NlpndZa01qDMMBjD6/GjizM1XV1oMTqrhLTsS1XAQot/vYWlR5O8osSKZ9EbDQEZ
 jrRpPykgHVgaPnQrsOAR0gKEPqCRBr76rBo6umYomuinyluT90mUTRC8t5RAiCuk
 ltgDp/HDnFkkkiee3tAGapC35bFp7EkyjYLryH3bT9ZxWlNpvLtk9SDwSjPwJDvA
 WfORdzpIM/J05quZc4rQkBhPHu5P7Ihpft8LqHahq45LVtbZrJ6S6x2YqYZE9GK2
 xyLrS7Gbdp9ABpY7JE3BZEmFsfC+434q0P3B0RkMaWzjfl1JBP6FiRxFmEHUiaWS
 7zTQmdHuxKBxb+bv5ZI1g1EzrFBn3uSjwLwzzjUH6A3Put5PKPsvFmURee8Ysz9S
 ZEs3HOgtJo4tN3iPs+wSfzJbcCpVwdWfxkYw/Ua2XyxGLTijmyo=
 =AHIN
 -----END PGP SIGNATURE-----

Merge tag 'qcom-drivers-fixes-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm driver fixes for v6.10

UCSI support is disabled on SC8280XP while being debugged, as it's
causing the system to crash. A recent LLCC QDU1000 binding change is
reverted, to allow expressing the LLCC memory regions.

* tag 'qcom-drivers-fixes-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  Revert "dt-bindings: cache: qcom,llcc: correct QDU1000 reg entries"
  soc: qcom: pmic_glink: disable UCSI on sc8280xp

Link: https://lore.kernel.org/r/20240702031157.341031-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-07-08 16:17:08 +02:00
commit d8eb522fa3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/cache/qcom,llcc.yaml vendored
View File

@ -66,7 +66,6 @@ allOf:
compatible:
contains:
enum:
- qcom,qdu1000-llcc
- qcom,sc7180-llcc
- qcom,sm6350-llcc
then:
@ -104,6 +103,7 @@ allOf:
compatible:
contains:
enum:
- qcom,qdu1000-llcc
- qcom,sc8180x-llcc
- qcom,sc8280xp-llcc
- qcom,x1e80100-llcc

4
drivers/soc/qcom/pmic_glink.c
View File

@ -348,11 +348,15 @@ static void pmic_glink_remove(struct platform_device *pdev)
mutex_unlock(&__pmic_glink_lock);
}
static const unsigned long pmic_glink_sc8280xp_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) |
BIT(PMIC_GLINK_CLIENT_ALTMODE);
static const unsigned long pmic_glink_sm8450_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) |
BIT(PMIC_GLINK_CLIENT_ALTMODE) |
BIT(PMIC_GLINK_CLIENT_UCSI);
static const struct of_device_id pmic_glink_of_match[] = {
{ .compatible = "qcom,sc8280xp-pmic-glink", .data = &pmic_glink_sc8280xp_client_mask },
{ .compatible = "qcom,pmic-glink", .data = &pmic_glink_sm8450_client_mask },
{}
};