diff mbox

[-next] sound: rockchip: fix build when SPI is not enabled

Message ID 14691987-ab74-96c4-de5d-8caa06e94d3f@infradead.org (mailing list archive)
State New, archived
Headers show

Commit Message

Randy Dunlap Aug. 22, 2016, 6:32 p.m. UTC
From: Randy Dunlap <rdunlap@infradead.org>

Fix build errors found in rt5514 drivers when SPI is not enabled.

Fixes these build errors:
ERROR: "__spi_register_driver" [sound/soc/codecs/snd-soc-rt5514-spi.ko] undefined!
ERROR: "spi_sync" [sound/soc/codecs/snd-soc-rt5514-spi.ko] undefined!

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc:	Bard Liao <bardliao@realtek.com>
Cc:	Oder Chiou <oder_chiou@realtek.com>
---
 sound/soc/rockchip/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

This builds without errors, but if you always want to have the SPI
interface available in this driver, change the first "depends" to
include "&& SPI_MASTER".

Comments

Randy Dunlap Aug. 24, 2016, 5:55 p.m. UTC | #1
On 08/22/16 11:32, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix build errors found in rt5514 drivers when SPI is not enabled.
> 
> Fixes these build errors:
> ERROR: "__spi_register_driver" [sound/soc/codecs/snd-soc-rt5514-spi.ko] undefined!
> ERROR: "spi_sync" [sound/soc/codecs/snd-soc-rt5514-spi.ko] undefined!
> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc:	Bard Liao <bardliao@realtek.com>
> Cc:	Oder Chiou <oder_chiou@realtek.com>
> ---
>  sound/soc/rockchip/Kconfig |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> This builds without errors, but if you always want to have the SPI
> interface available in this driver, change the first "depends" to
> include "&& SPI_MASTER".

Please drop this patch.  The comment above is the correct thing to do
and I am sending a patch with that change.


> --- linux-next-20160822.orig/sound/soc/rockchip/Kconfig
> +++ linux-next-20160822/sound/soc/rockchip/Kconfig
> @@ -49,7 +49,7 @@ config SND_SOC_RK3399_GRU_SOUND
>  	select SND_SOC_MAX98357A
>  	select SND_SOC_RT5514
>  	select SND_SOC_DA7219
> -	select SND_SOC_RT5514_SPI
> +	select SND_SOC_RT5514_SPI if SPI_MASTER
>  	help
>  	  Say Y or M here if you want to add support multiple codecs for SoC
>  	  audio on Rockchip RK3399 GRU boards.
>
diff mbox

Patch

--- linux-next-20160822.orig/sound/soc/rockchip/Kconfig
+++ linux-next-20160822/sound/soc/rockchip/Kconfig
@@ -49,7 +49,7 @@  config SND_SOC_RK3399_GRU_SOUND
 	select SND_SOC_MAX98357A
 	select SND_SOC_RT5514
 	select SND_SOC_DA7219
-	select SND_SOC_RT5514_SPI
+	select SND_SOC_RT5514_SPI if SPI_MASTER
 	help
 	  Say Y or M here if you want to add support multiple codecs for SoC
 	  audio on Rockchip RK3399 GRU boards.