ASoC: dwc: Fix non-DT instantiation

broonie · broonie · commit 9c97790a07dc · 2023-10-13T18:40:27.000+01:00
Commit d6d6c51 ("ASoC: dwc: Use ops to get platform data") converted the DesignWare I2S driver to use a DT specific function to obtain platform data but this breaks at least non-DT systems such as AMD. Revert it. Fixes: d6d6c51 ("ASoC: dwc: Use ops to get platform data") Signed-off-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/20231013-asoc-fix-dwc-v1-1-63211bb746b9@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git 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 = of_device_get_match_data(&pdev->dev);
+	const struct i2s_platform_data *pdata = pdev->dev.platform_data;
 	struct dw_i2s_dev *dev;
 	struct resource *res;
 	int ret, irq;

Original file line number	Diff line number	Diff line change
`@@ -917,7 +917,7 @@ static int jh7110_i2stx0_clk_cfg(struct i2s_clk_config_data *config)`
`917`	`917`
`918`	`918`	`static int dw_i2s_probe(struct platform_device *pdev)`
`919`	`919`	`{`
`920`		`- const struct i2s_platform_data *pdata = of_device_get_match_data(&pdev->dev);`
	`920`	`+ const struct i2s_platform_data *pdata = pdev->dev.platform_data;`
`921`	`921`	`struct dw_i2s_dev *dev;`
`922`	`922`	`struct resource *res;`
`923`	`923`	`int ret, irq;`