Commit 6ba82f91 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/au1x', 'asoc/topic/bt-sco',... 

Merge remote-tracking branches 'asoc/topic/au1x', 'asoc/topic/bt-sco', 'asoc/topic/cs35l32' and 'asoc/topic/da7210' into asoc-next
parents 202f5ecb 6c219192 c778b472 16607060 c682363c

Documentation/devicetree/bindings/sound/bt-sco.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
Bluetooth-SCO audio CODEC



This device support generic Bluetooth SCO link.



Required properties:



  - compatible : "delta,dfbmcs320"



Example:



codec: bt_sco {

	compatible = "delta,dfbmcs320";

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ cosmic Cosmic Circuits 
crystalfontz	Crystalfontz America, Inc.

dallas	Maxim Integrated Products (formerly Dallas Semiconductor)

davicom	DAVICOM Semiconductor, Inc.

delta	Delta Electronics, Inc.

denx	Denx Software Engineering

digi	Digi International Inc.

digilent	Diglent, Inc.

sound/soc/au1x/db1200.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "../codecs/wm8731.h"

#include "psc.h"



static struct platform_device_id db1200_pids[] = {

static const struct platform_device_id db1200_pids[] = {

	{

		.name		= "db1200-ac97",

		.driver_data	= 0,

sound/soc/codecs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_CS4271_SPI if SPI_MASTER

	select SND_SOC_CS42XX8_I2C if I2C

	select SND_SOC_CX20442 if TTY

	select SND_SOC_DA7210 if I2C

	select SND_SOC_DA7210 if SND_SOC_I2C_AND_SPI

	select SND_SOC_DA7213 if I2C

	select SND_SOC_DA732X if I2C

	select SND_SOC_DA9055 if I2C

sound/soc/codecs/bt-sco.c

+10 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int bt_sco_remove(struct platform_device *pdev) 
	return 0;

}



static struct platform_device_id bt_sco_driver_ids[] = {

static const struct platform_device_id bt_sco_driver_ids[] = {

	{

		.name		= "dfbmcs320",

	},
@@ -74,9 +74,18 @@ static struct platform_device_id bt_sco_driver_ids[] = { 
};

MODULE_DEVICE_TABLE(platform, bt_sco_driver_ids);



#if defined(CONFIG_OF)

static const struct of_device_id bt_sco_codec_of_match[] = {

	{ .compatible = "delta,dfbmcs320", },

	{},

};

MODULE_DEVICE_TABLE(of, bt_sco_codec_of_match);

#endif



static struct platform_driver bt_sco_driver = {

	.driver = {

		.name = "bt-sco",

		.of_match_table = of_match_ptr(bt_sco_codec_of_match),

	},

	.probe = bt_sco_probe,

	.remove = bt_sco_remove,