Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88...

[sfrench/cifs-2.6.git] / drivers / spi / spi-mt65xx.c

diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index 0c2867deb36fce48c74b92388d210371ebd1a6d0..0cce6f0ba8249fe50a8cf70d37eb2a177737fa5f 100644 (file)
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -120,6 +120,12 @@ static const struct mtk_spi_compatible mt8173_compat = {
        .must_tx = true,
 };
 
+static const struct mtk_spi_compatible mt8183_compat = {
+       .need_pad_sel = true,
+       .must_tx = true,
+       .enhance_timing = true,
+};
+
 /*
  * A piece of default chip info unless the platform
  * supplies it.
@@ -144,12 +150,18 @@ static const struct of_device_id mtk_spi_of_match[] = {
        { .compatible = "mediatek,mt7622-spi",
                .data = (void *)&mt7622_compat,
        },
+       { .compatible = "mediatek,mt7629-spi",
+               .data = (void *)&mt7622_compat,
+       },
        { .compatible = "mediatek,mt8135-spi",
                .data = (void *)&mtk_common_compat,
        },
        { .compatible = "mediatek,mt8173-spi",
                .data = (void *)&mt8173_compat,
        },
+       { .compatible = "mediatek,mt8183-spi",
+               .data = (void *)&mt8183_compat,
+       },
        {}
 };
 MODULE_DEVICE_TABLE(of, mtk_spi_of_match);