From patchwork Tue Jul 12 15:02:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 589856 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDA2ECCA47F for ; Tue, 12 Jul 2022 15:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234107AbiGLPJq (ORCPT ); Tue, 12 Jul 2022 11:09:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232795AbiGLPJY (ORCPT ); Tue, 12 Jul 2022 11:09:24 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80896C8E88 for ; Tue, 12 Jul 2022 08:02:49 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id bn33so10171272ljb.13 for ; Tue, 12 Jul 2022 08:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ysY8+Szjqk/lrdwwPO/ndEqlhqBj7oxmsr4P9sxksRA=; b=EhCHtHuWeCN/Yu+oALFreHL4jL2A34MqhFjL5bAlqM2YAAkQucb7S9s9BYb50eX6Mo MnnQDw7jLeSXJDdS42W3R7yB1eLVGX47ev55LTPa5YL10rRex80V7S/A+ceQR96GN7zU xiw8+AYyiQHTDYyOEj7hIyQegtTmOty39sSG4MJPsrUghCX/1J+mzFhQMg4f5yOQ2qvE fiMBTr7BZENIs6xAhLMIM4SQ15jEFSu5G7rvCx6ijWXVqPz+qUFPca0AY2BwClkmkn4o erZ+vOVqKgdROsJnaYn5iIxv0WR/HlzCelmVxuKjpFqpw5+MfnzHtbXAdE+zXo0qfIIc DSGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ysY8+Szjqk/lrdwwPO/ndEqlhqBj7oxmsr4P9sxksRA=; b=0/hQwDPMjZSsuJv2RX9W7YSNZi0Huc7eGRVizvjauUEf1gh62ynKu4EgrxTcf3n/ee BF0cF6yxCDRBokaZ71wPwTNKYEyqt5Z9ru+0z3PJbzbgiVTf/0qulIvIpT3UiQNhEXpF kFZbXy+35FyWhACAgXnS0Hwcl9OwMcm9WcEzCoAX0Q6ShxPIX1ylj72hmP5w7V4G9N7m roJ9Vidd/FB2GQB9ufctP69J56ILDxZCB9un3JZfG5NbPoe5bXtsspb9MbTQw+8OHQ3U 0ZhNBSfbFGRBWzbcqkSg8s3g/roE63nTfuZK0Q2nSmPGDHLZ2a5xiPsldNkI2d+0xQki 9eFw== X-Gm-Message-State: AJIora8SzWCSuRr6E+C/RJqfqF/FNLLWG3AG2Ldjm6LElh/10Brs1/ie v+oKnYgUqK3ihkfJL+0H7JwnYg== X-Google-Smtp-Source: AGRyM1uHIlbYFnwjXR/jabbsTH7ryUQs+sGBXXfD4IrrppWQi92rqSKeplNAt5NyiRVNwm6X6omS2w== X-Received: by 2002:a05:651c:504:b0:25b:cb73:52af with SMTP id o4-20020a05651c050400b0025bcb7352afmr13848250ljp.391.1657638168200; Tue, 12 Jul 2022 08:02:48 -0700 (PDT) Received: from krzk-bin.. (fwa5da9-171.bb.online.no. [88.93.169.171]) by smtp.gmail.com with ESMTPSA id 4-20020ac25f44000000b0047f9614203esm2224649lfz.173.2022.07.12.08.02.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 08:02:47 -0700 (PDT) From: Krzysztof Kozlowski To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Adrian Hunter , Bhupesh Sharma , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Krzysztof Kozlowski , Doug Anderson Subject: [PATCH v2 3/3] mmc: sdhci-msm: drop redundant of_device_id entries Date: Tue, 12 Jul 2022 17:02:19 +0200 Message-Id: <20220712150219.20539-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220712150219.20539-1-krzysztof.kozlowski@linaro.org> References: <20220712150219.20539-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This reverts three commits: 1. Revert "mmc: sdhci-msm: Add compatible string check for sdx65" This reverts commit 953706844f0f2fd4dc6984cc010fe6cf51c041f2. 2. Revert "mmc: sdhci-msm: Add compatible string check for sm8150" This reverts commit 5acd6adb65802cc6f9986be3750179a820580d37. 3. Revert "mmc: sdhci-msm: Add SoC specific compatibles" This reverts commit 466614a9765c6fb67e1464d0a3f1261db903834b. The oldest commit 466614a9765c ("mmc: sdhci-msm: Add SoC specific compatibles") did not specify what benefits such multiple compatibles bring, therefore assume there is none. On the other hand such approach brings a lot of churn to driver maintenance by expecting commit for every new compatible, even though it is already covered by the fallback. There is really no sense in duplicating of_device_id for each variant, which is already covered by generic compatible fallback qcom,sdhci-msm-v4 or qcom,sdhci-msm-v5. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Douglas Anderson --- Cc: Konrad Dybcio Cc: Bhupesh Sharma Cc: Doug Anderson --- drivers/mmc/host/sdhci-msm.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index e395411fb6fd..ff9f5b63c337 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -2435,33 +2435,8 @@ static const struct sdhci_msm_variant_info sdm845_sdhci_var = { }; static const struct of_device_id sdhci_msm_dt_match[] = { - /* Following two entries are deprecated (kept only for backward compatibility) */ {.compatible = "qcom,sdhci-msm-v4", .data = &sdhci_msm_mci_var}, {.compatible = "qcom,sdhci-msm-v5", .data = &sdhci_msm_v5_var}, - /* Add entries for sdcc versions less than 5.0 here */ - {.compatible = "qcom,apq8084-sdhci", .data = &sdhci_msm_mci_var}, - {.compatible = "qcom,msm8226-sdhci", .data = &sdhci_msm_mci_var}, - {.compatible = "qcom,msm8916-sdhci", .data = &sdhci_msm_mci_var}, - {.compatible = "qcom,msm8953-sdhci", .data = &sdhci_msm_mci_var}, - {.compatible = "qcom,msm8974-sdhci", .data = &sdhci_msm_mci_var}, - {.compatible = "qcom,msm8992-sdhci", .data = &sdhci_msm_mci_var}, - {.compatible = "qcom,msm8994-sdhci", .data = &sdhci_msm_mci_var}, - {.compatible = "qcom,msm8996-sdhci", .data = &sdhci_msm_mci_var}, - /* - * Add entries for sdcc version 5.0 here. For SDCC version 5.0.0, - * MCI registers are removed from SDCC interface and some registers - * are moved to HC. - */ - {.compatible = "qcom,qcs404-sdhci", .data = &sdhci_msm_v5_var}, - {.compatible = "qcom,sdx55-sdhci", .data = &sdhci_msm_v5_var}, - {.compatible = "qcom,sdx65-sdhci", .data = &sdhci_msm_v5_var}, - {.compatible = "qcom,sdm630-sdhci", .data = &sdhci_msm_v5_var}, - {.compatible = "qcom,sm6125-sdhci", .data = &sdhci_msm_v5_var}, - {.compatible = "qcom,sm6350-sdhci", .data = &sdhci_msm_v5_var}, - {.compatible = "qcom,sm8150-sdhci", .data = &sdhci_msm_v5_var}, - {.compatible = "qcom,sm8250-sdhci", .data = &sdhci_msm_v5_var}, - {.compatible = "qcom,sc7280-sdhci", .data = &sdhci_msm_v5_var}, - /* Add entries where soc specific handling is required, here */ {.compatible = "qcom,sdm845-sdhci", .data = &sdm845_sdhci_var}, {.compatible = "qcom,sc7180-sdhci", .data = &sdm845_sdhci_var}, {},