]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
soc: qcom: pmic_glink: disable UCSI on sc8280xp
authorJohan Hovold <johan+linaro@kernel.org>
Sat, 8 Jun 2024 11:45:29 +0000 (13:45 +0200)
committerBjorn Andersson <andersson@kernel.org>
Fri, 14 Jun 2024 22:47:41 +0000 (17:47 -0500)
Disconnecting an external display triggers a hypervisor reset on the
Lenovo ThinkPad X13s since 6.10-rc1 which enabled UCSI. Disable it again
until the regression has been fixed properly.

Fixes: 3f91a0bf4a0b ("soc: qcom: pmic_glink: reenable UCSI on sc8280xp")
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240608114529.23060-1-johan+linaro@kernel.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/soc/qcom/pmic_glink.c

index 40fb09d69014c70019e030ce553eff5a837c3cf1..65279243072c33e9b17e837ad0afc9b52b27a2b7 100644 (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 },
        {}
 };