mmc: dw_mmc: rockchip: use common_caps
authorJohn Keeping <john@metanate.com>
Wed, 24 Nov 2021 18:46:01 +0000 (18:46 +0000)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 14 Dec 2021 20:35:25 +0000 (21:35 +0100)
The capabilities for all instances are the same, so use common_caps
instead of caps/num_caps to remove the dependency on the mshcN device
tree alias.

Signed-off-by: John Keeping <john@metanate.com>
Tested-by: Nicolas Frattaroli <frattaroli.nicolas@gmail.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Link: https://lore.kernel.org/r/20211124184603.3897245-4-john@metanate.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/dw_mmc-rockchip.c

index d36991acd6df4dbc369f9309b317fe2859db9894..95d0ec0f5f3a4b1ba1f3310a9c0d0e64f156f223 100644 (file)
@@ -300,21 +300,12 @@ static int dw_mci_rockchip_init(struct dw_mci *host)
        return 0;
 }
 
-/* Common capabilities of RK3288 SoC */
-static unsigned long dw_mci_rk3288_dwmmc_caps[4] = {
-       MMC_CAP_CMD23,
-       MMC_CAP_CMD23,
-       MMC_CAP_CMD23,
-       MMC_CAP_CMD23,
-};
-
 static const struct dw_mci_drv_data rk2928_drv_data = {
        .init                   = dw_mci_rockchip_init,
 };
 
 static const struct dw_mci_drv_data rk3288_drv_data = {
-       .caps                   = dw_mci_rk3288_dwmmc_caps,
-       .num_caps               = ARRAY_SIZE(dw_mci_rk3288_dwmmc_caps),
+       .common_caps            = MMC_CAP_CMD23,
        .set_ios                = dw_mci_rk3288_set_ios,
        .execute_tuning         = dw_mci_rk3288_execute_tuning,
        .parse_dt               = dw_mci_rk3288_parse_dt,