Commit 85b57de3 authored by Mark Brown's avatar Mark Brown

ASoC: Add support for CS35L41 in HDA systems

Merge series from Lucas Tanure <tanureal@opensource.cirrus.com>:

Initial refactoring to support use of cs35l41 from the HDA driver stack.
parents 8b974c12 e8e4fcc0
This diff is collapsed.
...@@ -624,21 +624,24 @@ config SND_SOC_CS35L36 ...@@ -624,21 +624,24 @@ config SND_SOC_CS35L36
tristate "Cirrus Logic CS35L36 CODEC" tristate "Cirrus Logic CS35L36 CODEC"
depends on I2C depends on I2C
config SND_SOC_CS35L41_LIB
tristate
config SND_SOC_CS35L41 config SND_SOC_CS35L41
tristate tristate
default y if SND_SOC_CS35L41_SPI=y
default y if SND_SOC_CS35L41_I2C=y
default m if SND_SOC_CS35L41_SPI=m
default m if SND_SOC_CS35L41_I2C=m
config SND_SOC_CS35L41_SPI config SND_SOC_CS35L41_SPI
tristate "Cirrus Logic CS35L41 CODEC (SPI)" tristate "Cirrus Logic CS35L41 CODEC (SPI)"
depends on SPI_MASTER depends on SPI_MASTER
select SND_SOC_CS35L41_LIB
select SND_SOC_CS35L41
select REGMAP_SPI select REGMAP_SPI
config SND_SOC_CS35L41_I2C config SND_SOC_CS35L41_I2C
tristate "Cirrus Logic CS35L41 CODEC (I2C)" tristate "Cirrus Logic CS35L41 CODEC (I2C)"
depends on I2C depends on I2C
select SND_SOC_CS35L41_LIB
select SND_SOC_CS35L41
select REGMAP_I2C select REGMAP_I2C
config SND_SOC_CS42L42 config SND_SOC_CS42L42
......
...@@ -55,7 +55,8 @@ snd-soc-cs35l33-objs := cs35l33.o ...@@ -55,7 +55,8 @@ snd-soc-cs35l33-objs := cs35l33.o
snd-soc-cs35l34-objs := cs35l34.o snd-soc-cs35l34-objs := cs35l34.o
snd-soc-cs35l35-objs := cs35l35.o snd-soc-cs35l35-objs := cs35l35.o
snd-soc-cs35l36-objs := cs35l36.o snd-soc-cs35l36-objs := cs35l36.o
snd-soc-cs35l41-objs := cs35l41.o cs35l41-tables.o snd-soc-cs35l41-lib-objs := cs35l41-lib.o
snd-soc-cs35l41-objs := cs35l41.o
snd-soc-cs35l41-spi-objs := cs35l41-spi.o snd-soc-cs35l41-spi-objs := cs35l41-spi.o
snd-soc-cs35l41-i2c-objs := cs35l41-i2c.o snd-soc-cs35l41-i2c-objs := cs35l41-i2c.o
snd-soc-cs42l42-objs := cs42l42.o snd-soc-cs42l42-objs := cs42l42.o
...@@ -396,6 +397,7 @@ obj-$(CONFIG_SND_SOC_CS35L34) += snd-soc-cs35l34.o ...@@ -396,6 +397,7 @@ obj-$(CONFIG_SND_SOC_CS35L34) += snd-soc-cs35l34.o
obj-$(CONFIG_SND_SOC_CS35L35) += snd-soc-cs35l35.o obj-$(CONFIG_SND_SOC_CS35L35) += snd-soc-cs35l35.o
obj-$(CONFIG_SND_SOC_CS35L36) += snd-soc-cs35l36.o obj-$(CONFIG_SND_SOC_CS35L36) += snd-soc-cs35l36.o
obj-$(CONFIG_SND_SOC_CS35L41) += snd-soc-cs35l41.o obj-$(CONFIG_SND_SOC_CS35L41) += snd-soc-cs35l41.o
obj-$(CONFIG_SND_SOC_CS35L41_LIB) += snd-soc-cs35l41-lib.o
obj-$(CONFIG_SND_SOC_CS35L41_SPI) += snd-soc-cs35l41-spi.o obj-$(CONFIG_SND_SOC_CS35L41_SPI) += snd-soc-cs35l41-spi.o
obj-$(CONFIG_SND_SOC_CS35L41_I2C) += snd-soc-cs35l41-i2c.o obj-$(CONFIG_SND_SOC_CS35L41_I2C) += snd-soc-cs35l41-i2c.o
obj-$(CONFIG_SND_SOC_CS42L42) += snd-soc-cs42l42.o obj-$(CONFIG_SND_SOC_CS42L42) += snd-soc-cs42l42.o
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <sound/cs35l41.h>
#include "cs35l41.h" #include "cs35l41.h"
static const struct i2c_device_id cs35l41_id_i2c[] = { static const struct i2c_device_id cs35l41_id_i2c[] = {
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <sound/cs35l41.h>
#include "cs35l41.h" #include "cs35l41.h"
static const struct spi_device_id cs35l41_id_spi[] = { static const struct spi_device_id cs35l41_id_spi[] = {
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment