[PATCH 1/3] ASoC: Add device tree binding for WM8770

[Grant Likely]

On Mon, Aug 29, 2011 at 02:27:49PM +0100, Mark Brown wrote:
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

All three look fine.

I do agree with Timur that if the bindings don't have anything device
specific in them, then it would be fine to have one text file for all
of them.

g.

> ---
>  Documentation/devicetree/bindings/sound/wm8770.txt |   16 ++++++++++++++++
>  sound/soc/codecs/wm8770.c                          |    8 ++++++++
>  2 files changed, 24 insertions(+), 0 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/sound/wm8770.txt
> 
> diff --git a/Documentation/devicetree/bindings/sound/wm8770.txt b/Documentation/devicetree/bindings/sound/wm8770.txt
> new file mode 100644
> index 0000000..866e00c
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/sound/wm8770.txt
> @@ -0,0 +1,16 @@
> +WM8770 audio CODEC
> +
> +This device supports SPI.
> +
> +Required properties:
> +
> +  - compatible : "wlf,wm8770"
> +
> +  - reg : the chip select number.
> +
> +Example:
> +
> +codec: wm8770 at 1 {
> +	compatible = "wlf,wm8770";
> +	reg = <1>;
> +};
> diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c
> index 19b92ba..aa05e65 100644
> --- a/sound/soc/codecs/wm8770.c
> +++ b/sound/soc/codecs/wm8770.c
> @@ -14,6 +14,7 @@
>  #include <linux/moduleparam.h>
>  #include <linux/init.h>
>  #include <linux/delay.h>
> +#include <linux/of_device.h>
>  #include <linux/pm.h>
>  #include <linux/platform_device.h>
>  #include <linux/spi/spi.h>
> @@ -684,6 +685,12 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8770 = {
>  	.reg_cache_default = wm8770_reg_defs
>  };
>  
> +static const struct of_device_id wm8770_of_match[] = {
> +	{ .compatible = "wlf,wm8770", },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, wm8770_of_match);
> +
>  #if defined(CONFIG_SPI_MASTER)
>  static int __devinit wm8770_spi_probe(struct spi_device *spi)
>  {
> @@ -715,6 +722,7 @@ static struct spi_driver wm8770_spi_driver = {
>  	.driver = {
>  		.name = "wm8770",
>  		.owner = THIS_MODULE,
> +		.of_match_table = wm8770_of_match,
>  	},
>  	.probe = wm8770_spi_probe,
>  	.remove = __devexit_p(wm8770_spi_remove)
> -- 
> 1.7.5.4
>