add audio

hc

2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4

 kernel/sound/soc/au1x/psc-ac97.c
..
..
@@ -1,15 +1,11 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Au12x0/Au1550 PSC ALSA ASoC audio support.
3
4
  *
4
5
  * (c) 2007-2009 MSC Vertriebsges.m.b.H.,
5
6
  *	Manuel Lauss <manuel.lauss@gmail.com>
6
7
  *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License version 2 as
9
- * published by the Free Software Foundation.
10
- *
11
8
  * Au1xxx-PSC AC97 glue.
12
- *
13
9
  */
14
10
 
15
11
 #include <linux/init.h>
..
..
@@ -62,7 +58,7 @@
62
58
 static inline struct au1xpsc_audio_data *ac97_to_pscdata(struct snd_ac97 *x)
63
59
 {
64
60
 	struct snd_soc_card *c = x->bus->card->private_data;
65
-	return snd_soc_dai_get_drvdata(c->rtd->cpu_dai);
61
+	return snd_soc_dai_get_drvdata(c->asoc_rtd_to_cpu(rtd, 0));
66
62
 }
67
63
 
68
64
 #else
..
..
@@ -343,7 +339,6 @@
343
339
 };
344
340
 
345
341
 static const struct snd_soc_dai_driver au1xpsc_ac97_dai_template = {
346
-	.bus_control		= true,
347
342
 	.probe			= au1xpsc_ac97_probe,
348
343
 	.playback = {
349
344
 		.rates		= AC97_RATES,
..
..
@@ -367,7 +362,7 @@
367
362
 static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
368
363
 {
369
364
 	int ret;
370
-	struct resource *iores, *dmares;
365
+	struct resource *dmares;
371
366
 	unsigned long sel;
372
367
 	struct au1xpsc_audio_data *wd;
373
368
 
..
..
@@ -378,8 +373,7 @@
378
373
 
379
374
 	mutex_init(&wd->lock);
380
375
 
381
-	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
382
-	wd->mmio = devm_ioremap_resource(&pdev->dev, iores);
376
+	wd->mmio = devm_platform_ioremap_resource(pdev, 0);
383
377
 	if (IS_ERR(wd->mmio))
384
378
 		return PTR_ERR(wd->mmio);
385
379