mmc: mtk-sd: Reorder of_device_id and platform data by name

Both of_device_id compatible strings and platform data were partially
ordered by name. Fix the ordering.

This commit brings no functional changes.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220915120923.86038-2-angelogioacchino.delregno@collabora.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index 69d78604d1fc3f2d09ab507965ee9825de0a0789..572eb5d48813b344e330c2edceff974754665bf8 100644 (file)
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -474,33 +474,20 @@ struct msdc_host {
        struct cqhci_host *cq_host;
 };
 
-static const struct mtk_mmc_compatible mt8135_compat = {
-       .clk_div_bits = 8,
+static const struct mtk_mmc_compatible mt2701_compat = {
+       .clk_div_bits = 12,
        .recheck_sdio_irq = true,
        .hs400_tune = false,
-       .pad_tune_reg = MSDC_PAD_TUNE,
-       .async_fifo = false,
-       .data_tune = false,
-       .busy_check = false,
-       .stop_clk_fix = false,
-       .enhance_rx = false,
-       .support_64g = false,
-};
-
-static const struct mtk_mmc_compatible mt8173_compat = {
-       .clk_div_bits = 8,
-       .recheck_sdio_irq = true,
-       .hs400_tune = true,
-       .pad_tune_reg = MSDC_PAD_TUNE,
-       .async_fifo = false,
-       .data_tune = false,
+       .pad_tune_reg = MSDC_PAD_TUNE0,
+       .async_fifo = true,
+       .data_tune = true,
        .busy_check = false,
        .stop_clk_fix = false,
        .enhance_rx = false,
        .support_64g = false,
 };
 
-static const struct mtk_mmc_compatible mt8183_compat = {
+static const struct mtk_mmc_compatible mt2712_compat = {
        .clk_div_bits = 12,
        .recheck_sdio_irq = false,
        .hs400_tune = false,
@@ -513,20 +500,7 @@ static const struct mtk_mmc_compatible mt8183_compat = {
        .support_64g = true,
 };
 
-static const struct mtk_mmc_compatible mt2701_compat = {
-       .clk_div_bits = 12,
-       .recheck_sdio_irq = true,
-       .hs400_tune = false,
-       .pad_tune_reg = MSDC_PAD_TUNE0,
-       .async_fifo = true,
-       .data_tune = true,
-       .busy_check = false,
-       .stop_clk_fix = false,
-       .enhance_rx = false,
-       .support_64g = false,
-};
-
-static const struct mtk_mmc_compatible mt2712_compat = {
+static const struct mtk_mmc_compatible mt6779_compat = {
        .clk_div_bits = 12,
        .recheck_sdio_irq = false,
        .hs400_tune = false,
@@ -539,6 +513,19 @@ static const struct mtk_mmc_compatible mt2712_compat = {
        .support_64g = true,
 };
 
+static const struct mtk_mmc_compatible mt7620_compat = {
+       .clk_div_bits = 8,
+       .recheck_sdio_irq = true,
+       .hs400_tune = false,
+       .pad_tune_reg = MSDC_PAD_TUNE,
+       .async_fifo = false,
+       .data_tune = false,
+       .busy_check = false,
+       .stop_clk_fix = false,
+       .enhance_rx = false,
+       .use_internal_cd = true,
+};
+
 static const struct mtk_mmc_compatible mt7622_compat = {
        .clk_div_bits = 12,
        .recheck_sdio_irq = true,
@@ -552,31 +539,33 @@ static const struct mtk_mmc_compatible mt7622_compat = {
        .support_64g = false,
 };
 
-static const struct mtk_mmc_compatible mt8516_compat = {
-       .clk_div_bits = 12,
+static const struct mtk_mmc_compatible mt8135_compat = {
+       .clk_div_bits = 8,
        .recheck_sdio_irq = true,
        .hs400_tune = false,
-       .pad_tune_reg = MSDC_PAD_TUNE0,
-       .async_fifo = true,
-       .data_tune = true,
-       .busy_check = true,
-       .stop_clk_fix = true,
+       .pad_tune_reg = MSDC_PAD_TUNE,
+       .async_fifo = false,
+       .data_tune = false,
+       .busy_check = false,
+       .stop_clk_fix = false,
+       .enhance_rx = false,
+       .support_64g = false,
 };
 
-static const struct mtk_mmc_compatible mt7620_compat = {
+static const struct mtk_mmc_compatible mt8173_compat = {
        .clk_div_bits = 8,
        .recheck_sdio_irq = true,
-       .hs400_tune = false,
+       .hs400_tune = true,
        .pad_tune_reg = MSDC_PAD_TUNE,
        .async_fifo = false,
        .data_tune = false,
        .busy_check = false,
        .stop_clk_fix = false,
        .enhance_rx = false,
-       .use_internal_cd = true,
+       .support_64g = false,
 };
 
-static const struct mtk_mmc_compatible mt6779_compat = {
+static const struct mtk_mmc_compatible mt8183_compat = {
        .clk_div_bits = 12,
        .recheck_sdio_irq = false,
        .hs400_tune = false,
@@ -589,16 +578,28 @@ static const struct mtk_mmc_compatible mt6779_compat = {
        .support_64g = true,
 };
 
+static const struct mtk_mmc_compatible mt8516_compat = {
+       .clk_div_bits = 12,
+       .recheck_sdio_irq = true,
+       .hs400_tune = false,
+       .pad_tune_reg = MSDC_PAD_TUNE0,
+       .async_fifo = true,
+       .data_tune = true,
+       .busy_check = true,
+       .stop_clk_fix = true,
+};
+
 static const struct of_device_id msdc_of_ids[] = {
-       { .compatible = "mediatek,mt8135-mmc", .data = &mt8135_compat},
-       { .compatible = "mediatek,mt8173-mmc", .data = &mt8173_compat},
-       { .compatible = "mediatek,mt8183-mmc", .data = &mt8183_compat},
        { .compatible = "mediatek,mt2701-mmc", .data = &mt2701_compat},
        { .compatible = "mediatek,mt2712-mmc", .data = &mt2712_compat},
+       { .compatible = "mediatek,mt6779-mmc", .data = &mt6779_compat},
+       { .compatible = "mediatek,mt7620-mmc", .data = &mt7620_compat},
        { .compatible = "mediatek,mt7622-mmc", .data = &mt7622_compat},
+       { .compatible = "mediatek,mt8135-mmc", .data = &mt8135_compat},
+       { .compatible = "mediatek,mt8173-mmc", .data = &mt8173_compat},
+       { .compatible = "mediatek,mt8183-mmc", .data = &mt8183_compat},
        { .compatible = "mediatek,mt8516-mmc", .data = &mt8516_compat},
-       { .compatible = "mediatek,mt7620-mmc", .data = &mt7620_compat},
-       { .compatible = "mediatek,mt6779-mmc", .data = &mt6779_compat},
+
        {}
 };
 MODULE_DEVICE_TABLE(of, msdc_of_ids);