From: Mark Brown <broonie@kernel.org>
Date: Sun, 25 Sep 2016 06:05:10 +0000 (-0700)
Subject: Merge branch 'topic/rt5663' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v4.9.8~1118^2~4^2~3^3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=782f07290c5781539cdf2bca68f0596903c83c87;p=platform%2Fkernel%2Flinux-rpi3.git

Merge branch 'topic/rt5663' of git://git./linux/kernel/git/broonie/sound into asoc-rt5660
---

782f07290c5781539cdf2bca68f0596903c83c87
diff --cc sound/soc/codecs/Kconfig
index 890affe,3028606..bbca3ca
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -112,7 -112,7 +112,8 @@@ config SND_SOC_ALL_CODEC
  	select SND_SOC_RT5645 if I2C
  	select SND_SOC_RT5651 if I2C
  	select SND_SOC_RT5659 if I2C
 +	select SND_SOC_RT5660 if I2C
+ 	select SND_SOC_RT5663 if I2C
  	select SND_SOC_RT5670 if I2C
  	select SND_SOC_RT5677 if I2C && SPI_MASTER
  	select SND_SOC_SGTL5000 if I2C
@@@ -646,7 -646,7 +647,8 @@@ config SND_SOC_RL623
  	default y if SND_SOC_RT5645=y
  	default y if SND_SOC_RT5651=y
  	default y if SND_SOC_RT5659=y
 +	default y if SND_SOC_RT5660=y
+ 	default y if SND_SOC_RT5663=y
  	default y if SND_SOC_RT5670=y
  	default y if SND_SOC_RT5677=y
  	default m if SND_SOC_RT5514=m
@@@ -655,7 -655,7 +657,8 @@@
  	default m if SND_SOC_RT5645=m
  	default m if SND_SOC_RT5651=m
  	default m if SND_SOC_RT5659=m
 +	default m if SND_SOC_RT5660=m
+ 	default m if SND_SOC_RT5663=m
  	default m if SND_SOC_RT5670=m
  	default m if SND_SOC_RT5677=m
  
@@@ -700,9 -701,9 +704,12 @@@ config SND_SOC_RT565
  config SND_SOC_RT5659
  	tristate
  
 +config SND_SOC_RT5660
 +	tristate
 +
+ config SND_SOC_RT5663
+ 	tristate
+ 
  config SND_SOC_RT5670
  	tristate
  
diff --cc sound/soc/codecs/Makefile
index 68fed20,dca8d9c..da542bc
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -112,7 -112,7 +112,8 @@@ snd-soc-rt5640-objs := rt5640.
  snd-soc-rt5645-objs := rt5645.o
  snd-soc-rt5651-objs := rt5651.o
  snd-soc-rt5659-objs := rt5659.o
 +snd-soc-rt5660-objs := rt5660.o
+ snd-soc-rt5663-objs := rt5663.o
  snd-soc-rt5670-objs := rt5670.o
  snd-soc-rt5677-objs := rt5677.o
  snd-soc-rt5677-spi-objs := rt5677-spi.o
@@@ -334,7 -334,7 +335,8 @@@ obj-$(CONFIG_SND_SOC_RT5640)	+= snd-soc
  obj-$(CONFIG_SND_SOC_RT5645)	+= snd-soc-rt5645.o
  obj-$(CONFIG_SND_SOC_RT5651)	+= snd-soc-rt5651.o
  obj-$(CONFIG_SND_SOC_RT5659)	+= snd-soc-rt5659.o
 +obj-$(CONFIG_SND_SOC_RT5660)	+= snd-soc-rt5660.o
+ obj-$(CONFIG_SND_SOC_RT5663)	+= snd-soc-rt5663.o
  obj-$(CONFIG_SND_SOC_RT5670)	+= snd-soc-rt5670.o
  obj-$(CONFIG_SND_SOC_RT5677)	+= snd-soc-rt5677.o
  obj-$(CONFIG_SND_SOC_RT5677_SPI)	+= snd-soc-rt5677-spi.o