ASoC: codecs: Remove "select REGMAP_SPI/REGMAP_I2C"

Commit Message

Alexander Shiyan June 16, 2016, 7 p.m. UTC

REGMAP_SPI and REGMAP_I2C is selected automatically by SND_SOC,
so no additional actions is required.

Signed-off-by: Alexander Shiyan <[e-mail]>
---
 sound/soc/codecs/Kconfig | 21 ---------------------
 1 file changed, 21 deletions(-)

Comments

Lars-Peter Clausen June 16, 2016, 7:31 p.m. UTC | #1

On 06/16/2016 09:00 PM, Alexander Shiyan wrote:
> REGMAP_SPI and REGMAP_I2C is selected automatically by SND_SOC,
> so no additional actions is required.

To be honest I'd rather have this the other way around. Remove them from
SND_SOC and let every CODEC select them individually. That would be the
technically correct approach.

Otherwise if we want argue that a system using ASoC has probably at least
one CODEC device that either regmap SPI or regmap I2C and that's why it
makes sense for them to be selected automatically, we can also argue that
these days any system that has SPI or I2C support has likely one device that
either uses regmap SPI or regmap I2C, so they should always be enabled.

Mark Brown June 17, 2016, 10:30 a.m. UTC | #2

On Thu, Jun 16, 2016 at 09:31:18PM +0200, Lars-Peter Clausen wrote:
> On 06/16/2016 09:00 PM, Alexander Shiyan wrote:
> > REGMAP_SPI and REGMAP_I2C is selected automatically by SND_SOC,
> > so no additional actions is required.

> To be honest I'd rather have this the other way around. Remove them from
> SND_SOC and let every CODEC select them individually. That would be the
> technically correct approach.

Indeed.

> Otherwise if we want argue that a system using ASoC has probably at least
> one CODEC device that either regmap SPI or regmap I2C and that's why it
> makes sense for them to be selected automatically, we can also argue that
> these days any system that has SPI or I2C support has likely one device that
> either uses regmap SPI or regmap I2C, so they should always be enabled.

Well, the reason it's selected at present is that the core has some
regmap code (but that just needs plain regmap) and the legacy code for
the old ASoC I/O being backed by regmap.  We should be able to at least
drop back to just selecting regmap alone at this point, restructuring
the code so we only include the regmap bits in the core if regmap is
selected is probably more trouble than it's worth.

Patch

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 4d82a58..1e03fa0 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -288,12 +288,10 @@  config SND_SOC_ADAU1761
 config SND_SOC_ADAU1761_I2C
 	tristate
 	select SND_SOC_ADAU1761
-	select REGMAP_I2C
 
 config SND_SOC_ADAU1761_SPI
 	tristate
 	select SND_SOC_ADAU1761
-	select REGMAP_SPI
 
 config SND_SOC_ADAU1781
 	select SND_SOC_ADAU17X1
@@ -302,12 +300,10 @@  config SND_SOC_ADAU1781
 config SND_SOC_ADAU1781_I2C
 	tristate
 	select SND_SOC_ADAU1781
-	select REGMAP_I2C
 
 config SND_SOC_ADAU1781_SPI
 	tristate
 	select SND_SOC_ADAU1781
-	select REGMAP_SPI
 
 config SND_SOC_ADAU1977
 	tristate
@@ -315,12 +311,10 @@  config SND_SOC_ADAU1977
 config SND_SOC_ADAU1977_SPI
 	tristate
 	select SND_SOC_ADAU1977
-	select REGMAP_SPI
 
 config SND_SOC_ADAU1977_I2C
 	tristate
 	select SND_SOC_ADAU1977
-	select REGMAP_I2C
 
 config SND_SOC_ADAV80X
 	tristate
@@ -403,7 +397,6 @@  config SND_SOC_CS42L73
 config SND_SOC_CS4265
 	tristate "Cirrus Logic CS4265 CODEC"
 	depends on I2C
-	select REGMAP_I2C
 
 # Cirrus Logic CS4270 Codec
 config SND_SOC_CS4270
@@ -425,13 +418,11 @@  config SND_SOC_CS4271_I2C
 	tristate "Cirrus Logic CS4271 CODEC (I2C)"
 	depends on I2C
 	select SND_SOC_CS4271
-	select REGMAP_I2C
 
 config SND_SOC_CS4271_SPI
 	tristate "Cirrus Logic CS4271 CODEC (SPI)"
 	depends on SPI_MASTER
 	select SND_SOC_CS4271
-	select REGMAP_SPI
 
 config SND_SOC_CS42XX8
 	tristate
@@ -440,7 +431,6 @@  config SND_SOC_CS42XX8_I2C
 	tristate "Cirrus Logic CS42448/CS42888 CODEC (I2C)"
 	depends on I2C
 	select SND_SOC_CS42XX8
-	select REGMAP_I2C
 
 # Cirrus Logic CS4349 HiFi DAC
 config SND_SOC_CS4349
@@ -580,13 +570,11 @@  config SND_SOC_PCM3168A_I2C
 	tristate "Texas Instruments PCM3168A CODEC - I2C"
 	depends on I2C
 	select SND_SOC_PCM3168A
-	select REGMAP_I2C
 
 config SND_SOC_PCM3168A_SPI
 	tristate "Texas Instruments PCM3168A CODEC - SPI"
 	depends on SPI_MASTER
 	select SND_SOC_PCM3168A
-	select REGMAP_SPI
 
 config SND_SOC_PCM5102A
 	tristate
@@ -598,13 +586,11 @@  config SND_SOC_PCM512x_I2C
 	tristate "Texas Instruments PCM512x CODECs - I2C"
 	depends on I2C
 	select SND_SOC_PCM512x
-	select REGMAP_I2C
 
 config SND_SOC_PCM512x_SPI
 	tristate "Texas Instruments PCM512x CODECs - SPI"
 	depends on SPI_MASTER
 	select SND_SOC_PCM512x
-	select REGMAP_SPI
 
 config SND_SOC_RL6231
 	tristate
@@ -668,7 +654,6 @@  config SND_SOC_RT5670
 
 config SND_SOC_RT5677
 	tristate
-	select REGMAP_I2C
 	select REGMAP_IRQ
 
 config SND_SOC_RT5677_SPI
@@ -715,13 +700,11 @@  config SND_SOC_SSM2602_SPI
 	tristate "Analog Devices SSM2602 CODEC - SPI"
 	depends on SPI_MASTER
 	select SND_SOC_SSM2602
-	select REGMAP_SPI
 
 config SND_SOC_SSM2602_I2C
 	tristate "Analog Devices SSM2602 CODEC - I2C"
 	depends on I2C
 	select SND_SOC_SSM2602
-	select REGMAP_I2C
 
 config SND_SOC_SSM4567
 	tristate "Analog Devices ssm4567 amplifier driver support"
@@ -730,7 +713,6 @@  config SND_SOC_SSM4567
 config SND_SOC_STA32X
 	tristate "STA326, STA328 and STA329 speaker amplifier"
 	depends on I2C
-	select REGMAP_I2C
 
 config SND_SOC_STA350
 	tristate "STA350 speaker amplifier"
@@ -788,7 +770,6 @@  config SND_SOC_TLV320AIC26
 config SND_SOC_TLV320AIC31XX
 	tristate "Texas Instruments TLV320AIC31xx CODECs"
 	depends on I2C
-	select REGMAP_I2C
 
 config SND_SOC_TLV320AIC32X4
 	tristate
@@ -918,13 +899,11 @@  config SND_SOC_WM8804_I2C
 	tristate "Wolfson Microelectronics WM8804 S/PDIF transceiver I2C"
 	depends on I2C
 	select SND_SOC_WM8804
-	select REGMAP_I2C
 
 config SND_SOC_WM8804_SPI
 	tristate "Wolfson Microelectronics WM8804 S/PDIF transceiver SPI"
 	depends on SPI_MASTER
 	select SND_SOC_WM8804
-	select REGMAP_SPI
 
 config SND_SOC_WM8900
 	tristate