| Message ID | 20231013-asoc-fix-dwc-v1-1-63211bb746b9@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9c97790a07dc4f9bdc6e1701003dc9b86f749c71 |
| Headers | show |
| Series | ASoC: dwc: Fix non-DT instantiation | expand |
On Fri, 13 Oct 2023 18:37:33 +0100, Mark Brown wrote: > Commit d6d6c513f5d2 ("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. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: dwc: Fix non-DT instantiation commit: 9c97790a07dc4f9bdc6e1701003dc9b86f749c71 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 2ff619a29655..c04466f5492e 100644 --- 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;
Commit d6d6c513f5d2 ("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: d6d6c513f5d2 ("ASoC: dwc: Use ops to get platform data") Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/dwc/dwc-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: fbfe616ad40c06d68b83b657a94cd2e709dda37b change-id: 20231013-asoc-fix-dwc-06294a3d3675 Best regards,