Revert "ASoC: dwc: Fix non-DT instantiation"

This reverts commit 9c97790a07dc4f9bdc6e1701003dc9b86f749c71.

In Mainline, it's considering Non-DT case. But case of starfive is using
dt system. This commit is causing about not getting platform_data.
So i2s of starfive is recognizing to "is_jh7110 = 0".

[    4.054162] designware-i2s: probe of 100e0000.i2s failed with error -110
[    4.549831] designware-i2s: probe of 120b0000.i2s failed with error -110
[    5.045455] designware-i2s: probe of 120c0000.i2s failed with error -110

Change-Id: Ie87fbe397e2453659471a305a2864bc30d538116

diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c
index 9ea4be5..22c0041 100644 (file)
--- a/sound/soc/dwc/dwc-i2s.c
+++ b/sound/soc/dwc/dwc-i2s.c
@@ -917,7 +917,7 @@ static int jh7110_i2stx0_clk_cfg(struct i2s_clk_config_data *config)
 
 static int dw_i2s_probe(struct platform_device *pdev)
 {
-       const struct i2s_platform_data *pdata = pdev->dev.platform_data;
+       const struct i2s_platform_data *pdata = of_device_get_match_data(&pdev->dev);
        struct dw_i2s_dev *dev;
        struct resource *res;
        int ret, irq;