Commit 343b8908 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/ab8500', 'asoc/topic/adau17x1',... 

Merge remote-tracking branches 'asoc/topic/ab8500', 'asoc/topic/adau17x1', 'asoc/topic/ads117x', 'asoc/topic/adsp' and 'asoc/topic/arizona' into asoc-next
parents 17bcf095 22363e75 aaf0f3ae 4f2bf0ac 5602a643 2595b7fe

Documentation/devicetree/bindings/sound/adi,adau17x1.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Analog Devices ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781



Required properties:



 - compatible:		Should contain one of the following:

			"adi,adau1361"

			"adi,adau1461"

			"adi,adau1761"

			"adi,adau1961"

			"adi,adau1381"

			"adi,adau1781"



 - reg:			The i2c address. Value depends on the state of ADDR0

			and ADDR1, as wired in hardware.



Examples:

#include <dt-bindings/sound/adau17x1.h>



	i2c_bus {

		adau1361@38 {

			compatible = "adi,adau1761";

			reg = <0x38>;

		};

	};

Documentation/devicetree/bindings/sound/ti,ads117x.txt

0 → 100644
+11 −0
Original line number Diff line number Diff line 
Texas Intstruments ADS117x ADC



Required properties:



  - compatible : "ti,ads1174" or "ti,ads1178"



Example:



ads1178 {

	compatible = "ti,ads1178";

};

include/linux/platform_data/adau17x1.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Driver for ADAU1761/ADAU1461/ADAU1761/ADAU1961/ADAU1781/ADAU1781 codecs

 * Driver for ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781 codecs

 *

 * Copyright 2011-2014 Analog Devices Inc.

 * Author: Lars-Peter Clausen <lars@metafoo.de>

sound/soc/codecs/ab8500-codec.c

+0 −1
Original line number Diff line number Diff line
@@ -2134,7 +2134,6 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
			"%s: ERROR: Unsupporter master mask 0x%x\n",

			__func__, fmt & SND_SOC_DAIFMT_MASTER_MASK);

		return -EINVAL;

		break;

	}



	snd_soc_update_bits(codec, AB8500_DIGIFCONF3, mask, val);

sound/soc/codecs/adau1761-i2c.c

+13 −1
Original line number Diff line number Diff line 
/*

 * Driver for ADAU1761/ADAU1461/ADAU1761/ADAU1961 codec

 * Driver for ADAU1361/ADAU1461/ADAU1761/ADAU1961 codec

 *

 * Copyright 2014 Analog Devices Inc.

 *  Author: Lars-Peter Clausen <lars@metafoo.de>
@@ -44,9 +44,21 @@ static const struct i2c_device_id adau1761_i2c_ids[] = { 
};

MODULE_DEVICE_TABLE(i2c, adau1761_i2c_ids);



#if defined(CONFIG_OF)

static const struct of_device_id adau1761_i2c_dt_ids[] = {

	{ .compatible = "adi,adau1361", },

	{ .compatible = "adi,adau1461", },

	{ .compatible = "adi,adau1761", },

	{ .compatible = "adi,adau1961", },

	{ },

};

MODULE_DEVICE_TABLE(of, adau1761_i2c_dt_ids);

#endif



static struct i2c_driver adau1761_i2c_driver = {

	.driver = {

		.name = "adau1761",

		.of_match_table = of_match_ptr(adau1761_i2c_dt_ids),

	},

	.probe = adau1761_i2c_probe,

	.remove = adau1761_i2c_remove,