Commit d8eb522f authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'qcom-drivers-fixes-for-6.10' of...

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.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f8fee978 e227c111
...@@ -66,7 +66,6 @@ allOf: ...@@ -66,7 +66,6 @@ allOf:
compatible: compatible:
contains: contains:
enum: enum:
- qcom,qdu1000-llcc
- qcom,sc7180-llcc - qcom,sc7180-llcc
- qcom,sm6350-llcc - qcom,sm6350-llcc
then: then:
...@@ -104,6 +103,7 @@ allOf: ...@@ -104,6 +103,7 @@ allOf:
compatible: compatible:
contains: contains:
enum: enum:
- qcom,qdu1000-llcc
- qcom,sc8180x-llcc - qcom,sc8180x-llcc
- qcom,sc8280xp-llcc - qcom,sc8280xp-llcc
- qcom,x1e80100-llcc - qcom,x1e80100-llcc
......
...@@ -348,11 +348,15 @@ static void pmic_glink_remove(struct platform_device *pdev) ...@@ -348,11 +348,15 @@ static void pmic_glink_remove(struct platform_device *pdev)
mutex_unlock(&__pmic_glink_lock); 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) | static const unsigned long pmic_glink_sm8450_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) |
BIT(PMIC_GLINK_CLIENT_ALTMODE) | BIT(PMIC_GLINK_CLIENT_ALTMODE) |
BIT(PMIC_GLINK_CLIENT_UCSI); BIT(PMIC_GLINK_CLIENT_UCSI);
static const struct of_device_id pmic_glink_of_match[] = { 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 }, { .compatible = "qcom,pmic-glink", .data = &pmic_glink_sm8450_client_mask },
{} {}
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment