Skip to content

Commit d8eb522

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents f8fee97 + e227c11 commit d8eb522

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Documentation/devicetree/bindings/cache/qcom,llcc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ allOf:
6666
compatible:
6767
contains:
6868
enum:
69-
- qcom,qdu1000-llcc
7069
- qcom,sc7180-llcc
7170
- qcom,sm6350-llcc
7271
then:
@@ -104,6 +103,7 @@ allOf:
104103
compatible:
105104
contains:
106105
enum:
106+
- qcom,qdu1000-llcc
107107
- qcom,sc8180x-llcc
108108
- qcom,sc8280xp-llcc
109109
- qcom,x1e80100-llcc

drivers/soc/qcom/pmic_glink.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,11 +348,15 @@ static void pmic_glink_remove(struct platform_device *pdev)
348348
mutex_unlock(&__pmic_glink_lock);
349349
}
350350

351+
static const unsigned long pmic_glink_sc8280xp_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) |
352+
BIT(PMIC_GLINK_CLIENT_ALTMODE);
353+
351354
static const unsigned long pmic_glink_sm8450_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) |
352355
BIT(PMIC_GLINK_CLIENT_ALTMODE) |
353356
BIT(PMIC_GLINK_CLIENT_UCSI);
354357

355358
static const struct of_device_id pmic_glink_of_match[] = {
359+
{ .compatible = "qcom,sc8280xp-pmic-glink", .data = &pmic_glink_sc8280xp_client_mask },
356360
{ .compatible = "qcom,pmic-glink", .data = &pmic_glink_sm8450_client_mask },
357361
{}
358362
};

0 commit comments

Comments
 (0)