Merge remote-tracking branch 'asoc/topic/au1x' into asoc-next (a04a2aca) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/au1x/db1200.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -73,12 +73,14 @@ static struct snd_soc_dai_link db1300_ac97_dai = {

		static struct snd_soc_card db1300_ac97_machine = {
		.name = "DB1300_AC97",
		.owner = THIS_MODULE,
		.dai_link = &db1300_ac97_dai,
		.num_links = 1,
		};

		static struct snd_soc_card db1550_ac97_machine = {
		.name = "DB1550_AC97",
		.owner = THIS_MODULE,
		.dai_link = &db1200_ac97_dai,
		.num_links = 1,
		};
		@@ -145,6 +147,7 @@ static struct snd_soc_dai_link db1300_i2s_dai = {

		static struct snd_soc_card db1300_i2s_machine = {
		.name = "DB1300_I2S",
		.owner = THIS_MODULE,
		.dai_link = &db1300_i2s_dai,
		.num_links = 1,
		};
		@@ -161,6 +164,7 @@ static struct snd_soc_dai_link db1550_i2s_dai = {

		static struct snd_soc_card db1550_i2s_machine = {
		.name = "DB1550_I2S",
		.owner = THIS_MODULE,
		.dai_link = &db1550_i2s_dai,
		.num_links = 1,
		};

+0 −3

Original line number	Diff line number	Diff line
		@@ -379,9 +379,6 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
		mutex_init(&wd->lock);

		iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		if (!iores)
		return -ENODEV;

		wd->mmio = devm_ioremap_resource(&pdev->dev, iores);
		if (IS_ERR(wd->mmio))
		return PTR_ERR(wd->mmio);