1 files changed, 24 insertions, 8 deletions

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index e483e9d84f8b..671be33aa9d2 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -123,6 +123,13 @@ static inline void write_ssi_mask(u32 __iomem *addr, u32 clear, u32 set)
                 CCSR_SSI_SIER_TUE0_EN | CCSR_SSI_SIER_TFRC_EN)
 #define FSLSSI_SISR_MASK (FSLSSI_SIER_DBG_RX_FLAGS | FSLSSI_SIER_DBG_TX_FLAGS)
 
+
+enum fsl_ssi_type {
+        FSL_SSI_MCP8610,
+        FSL_SSI_MX21,
+        FSL_SSI_MX51,
+};
+
 /**
  * fsl_ssi_private: per-SSI private data
  *
@@ -189,6 +196,14 @@ struct fsl_ssi_private {
         char name[1];
 };
 
+static const struct of_device_id fsl_ssi_ids[] = {
+        { .compatible = "fsl,mpc8610-ssi", .data = (void *) FSL_SSI_MCP8610},
+        { .compatible = "fsl,imx51-ssi", .data = (void *) FSL_SSI_MX51},
+        { .compatible = "fsl,imx21-ssi", .data = (void *) FSL_SSI_MX21},
+        {}
+};
+MODULE_DEVICE_TABLE(of, fsl_ssi_ids);
+
 /**
  * fsl_ssi_isr: SSI interrupt handler
  *
@@ -1118,6 +1133,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         int ret = 0;
         struct device_attribute *dev_attr = NULL;
         struct device_node *np = pdev->dev.of_node;
+        const struct of_device_id *of_id;
+        enum fsl_ssi_type hw_type;
         const char *p, *sprop;
         const uint32_t *iprop;
         struct resource res;
@@ -1132,6 +1149,11 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         if (!of_device_is_available(np))
                 return -ENODEV;
 
+        of_id = of_match_device(fsl_ssi_ids, &pdev->dev);
+        if (!of_id)
+                return -EINVAL;
+        hw_type = (enum fsl_ssi_type) of_id->data;
+
         /* We only support the SSI in "I2S Slave" mode */
         sprop = of_get_property(np, "fsl,mode", NULL);
         if (!sprop) {
@@ -1211,7 +1233,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         ssi_private->baudclk_locked = false;
         spin_lock_init(&ssi_private->baudclk_lock);
 
-        if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx21-ssi")) {
+        if (hw_type == FSL_SSI_MX21 || hw_type == FSL_SSI_MX51 ||
+                        hw_type == FSL_SSI_MX35) {
                 u32 dma_events[2];
                 ssi_private->ssi_on_imx = true;
 
@@ -1414,13 +1437,6 @@ static int fsl_ssi_remove(struct platform_device *pdev)
         return 0;
 }
 
-static const struct of_device_id fsl_ssi_ids[] = {
-        { .compatible = "fsl,mpc8610-ssi", },
-        { .compatible = "fsl,imx21-ssi", },
-        {}
-};
-MODULE_DEVICE_TABLE(of, fsl_ssi_ids);
-
 static struct platform_driver fsl_ssi_driver = {
         .driver = {
                 .name = "fsl-ssi-dai",