]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
soc: qcom: ubwc: Remove redundant x1e80100_data
authorKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Wed, 25 Mar 2026 12:08:47 +0000 (13:08 +0100)
committerBjorn Andersson <andersson@kernel.org>
Wed, 25 Mar 2026 22:56:39 +0000 (17:56 -0500)
UBWC data for X1E80100 is exactly the same as one for SM8550, so reduce
code duplication by reusing older entry.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Cc: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260325120846.139836-2-krzysztof.kozlowski@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/soc/qcom/ubwc_config.c

index 8304463f238a6e9e6e5b5d1df2ea912a6e5c575d..e63daf748e303602870c3d2c15676a8d48ed1eb8 100644 (file)
@@ -217,17 +217,6 @@ static const struct qcom_ubwc_cfg_data sm8750_data = {
        .macrotile_mode = true,
 };
 
-static const struct qcom_ubwc_cfg_data x1e80100_data = {
-       .ubwc_enc_version = UBWC_4_0,
-       .ubwc_dec_version = UBWC_4_3,
-       .ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 |
-                       UBWC_SWIZZLE_ENABLE_LVL3,
-       .ubwc_bank_spread = true,
-       /* TODO: highest_bank_bit = 15 for LP_DDR4 */
-       .highest_bank_bit = 16,
-       .macrotile_mode = true,
-};
-
 static const struct qcom_ubwc_cfg_data glymur_data = {
        .ubwc_enc_version = UBWC_5_0,
        .ubwc_dec_version = UBWC_5_0,
@@ -293,8 +282,8 @@ static const struct of_device_id qcom_ubwc_configs[] __maybe_unused = {
        { .compatible = "qcom,sm8550", .data = &sm8550_data, },
        { .compatible = "qcom,sm8650", .data = &sm8550_data, },
        { .compatible = "qcom,sm8750", .data = &sm8750_data, },
-       { .compatible = "qcom,x1e80100", .data = &x1e80100_data, },
-       { .compatible = "qcom,x1p42100", .data = &x1e80100_data, },
+       { .compatible = "qcom,x1e80100", .data = &sm8550_data, },
+       { .compatible = "qcom,x1p42100", .data = &sm8550_data, },
        { }
 };