Commit c924dc68 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: ssm2602: Split SPI and I2C code into different modules 



There are a few known (minor) problems with having the support code for both I2C
and SPI in the same module:
    * We need to be extra careful to make sure to not build the driver into the
      kernel if one of the subsystems is build as a module (Currently only I2C
      can be build as a module).
    * The module init path error handling is rather ugly. E.g. what should be
      done if either the SPI or the I2C driver fails to register? Most drivers
      that implement SPI and I2C in the same module currently fallback to
      undefined behavior in that case. Splitting the the driver into two
      modules, one for each bus allows the registration of the other bus driver
      to continue without problems if one of them fails.

This patch splits the ssm2602 driver into 3 modules. One core module that
implements the device logic, but is independent of the bus method used. And one
module for SPI and I2C each that registers the drivers and sets up the regmap
struct for the bus.

While we are at it also cleanup the include section of the ssm2602 driver and
remove unneeded includes.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent f75ac2d9

sound/soc/blackfin/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ config SND_BF5XX_SOC_SSM2602 
	depends on SND_BF5XX_I2S && (SPI_MASTER || I2C)

	select SND_BF5XX_SOC_I2S if !BF60x

	select SND_BF6XX_SOC_I2S if BF60x

	select SND_SOC_SSM2602

	select SND_SOC_SSM2602_SPI if SPI_MASTER

	select SND_SOC_SSM2602_I2C if I2C

	help

	  Say Y if you want to add support for the Analog Devices

	  SSM2602 Audio Codec Add-On Card.

sound/soc/codecs/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_SN95031 if INTEL_SCU_IPC

	select SND_SOC_SPDIF

	select SND_SOC_SSM2518 if I2C

	select SND_SOC_SSM2602 if SND_SOC_I2C_AND_SPI

	select SND_SOC_SSM2602_SPI if SPI_MASTER

	select SND_SOC_SSM2602_I2C if I2C

	select SND_SOC_STA32X if I2C

	select SND_SOC_STA529 if I2C

	select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
@@ -342,6 +343,14 @@ config SND_SOC_SSM2518 
config SND_SOC_SSM2602

	tristate



config SND_SOC_SSM2602_SPI

	select SND_SOC_SSM2602

	tristate



config SND_SOC_SSM2602_I2C

	select SND_SOC_SSM2602

	tristate



config SND_SOC_STA32X

	tristate

sound/soc/codecs/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ snd-soc-spdif-tx-objs := spdif_transmitter.o 
snd-soc-spdif-rx-objs := spdif_receiver.o

snd-soc-ssm2518-objs := ssm2518.o

snd-soc-ssm2602-objs := ssm2602.o

snd-soc-ssm2602-spi-objs := ssm2602-spi.o

snd-soc-ssm2602-i2c-objs := ssm2602-i2c.o

snd-soc-sta32x-objs := sta32x.o

snd-soc-sta529-objs := sta529.o

snd-soc-stac9766-objs := stac9766.o
@@ -188,6 +190,8 @@ obj-$(CONFIG_SND_SOC_SN95031) +=snd-soc-sn95031.o 
obj-$(CONFIG_SND_SOC_SPDIF)	+= snd-soc-spdif-rx.o snd-soc-spdif-tx.o

obj-$(CONFIG_SND_SOC_SSM2518)	+= snd-soc-ssm2518.o

obj-$(CONFIG_SND_SOC_SSM2602)	+= snd-soc-ssm2602.o

obj-$(CONFIG_SND_SOC_SSM2602_SPI)	+= snd-soc-ssm2602-spi.o

obj-$(CONFIG_SND_SOC_SSM2602_I2C)	+= snd-soc-ssm2602-i2c.o

obj-$(CONFIG_SND_SOC_STA32X)   += snd-soc-sta32x.o

obj-$(CONFIG_SND_SOC_STA529)   += snd-soc-sta529.o

obj-$(CONFIG_SND_SOC_STAC9766)	+= snd-soc-stac9766.o

sound/soc/codecs/ssm2602-i2c.c

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 * SSM2602/SSM2603/SSM2604 I2C audio driver

 *

 * Copyright 2014 Analog Devices Inc.

 *

 * Licensed under the GPL-2.

 */



#include <linux/module.h>

#include <linux/i2c.h>

#include <linux/regmap.h>



#include <sound/soc.h>



#include "ssm2602.h"



/*

 * ssm2602 2 wire address is determined by GPIO5

 * state during powerup.

 *    low  = 0x1a

 *    high = 0x1b

 */

static int ssm2602_i2c_probe(struct i2c_client *client,

			     const struct i2c_device_id *id)

{

	return ssm2602_probe(&client->dev, id->driver_data,

		devm_regmap_init_i2c(client, &ssm2602_regmap_config));

}



static int ssm2602_i2c_remove(struct i2c_client *client)

{

	snd_soc_unregister_codec(&client->dev);

	return 0;

}



static const struct i2c_device_id ssm2602_i2c_id[] = {

	{ "ssm2602", SSM2602 },

	{ "ssm2603", SSM2602 },

	{ "ssm2604", SSM2604 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, ssm2602_i2c_id);



static struct i2c_driver ssm2602_i2c_driver = {

	.driver = {

		.name = "ssm2602",

		.owner = THIS_MODULE,

	},

	.probe = ssm2602_i2c_probe,

	.remove = ssm2602_i2c_remove,

	.id_table = ssm2602_i2c_id,

};

module_i2c_driver(ssm2602_i2c_driver);



MODULE_DESCRIPTION("ASoC SSM2602/SSM2603/SSM2604 I2C driver");

MODULE_AUTHOR("Cliff Cai");

MODULE_LICENSE("GPL");

sound/soc/codecs/ssm2602-spi.c

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * SSM2602 SPI audio driver

 *

 * Copyright 2014 Analog Devices Inc.

 *

 * Licensed under the GPL-2.

 */



#include <linux/module.h>

#include <linux/spi/spi.h>

#include <linux/regmap.h>



#include <sound/soc.h>



#include "ssm2602.h"



static int ssm2602_spi_probe(struct spi_device *spi)

{

	return ssm2602_probe(&spi->dev, SSM2602,

		devm_regmap_init_spi(spi, &ssm2602_regmap_config));

}



static int ssm2602_spi_remove(struct spi_device *spi)

{

	snd_soc_unregister_codec(&spi->dev);

	return 0;

}



static struct spi_driver ssm2602_spi_driver = {

	.driver = {

		.name	= "ssm2602",

		.owner	= THIS_MODULE,

	},

	.probe		= ssm2602_spi_probe,

	.remove		= ssm2602_spi_remove,

};

module_spi_driver(ssm2602_spi_driver);



MODULE_DESCRIPTION("ASoC SSM2602 SPI driver");

MODULE_AUTHOR("Cliff Cai");

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE