Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 782f0729 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/rt5663' of...

Merge branch 'topic/rt5663' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5660
parents 2b26dd4c c5f1edd4
Loading
Loading
Loading
Loading
+30 −0
Original line number Diff line number Diff line
RT5663/RT5668 audio CODEC

This device supports I2C only.

Required properties:

- compatible : One of "realtek,rt5663" or "realtek,rt5668".

- reg : The I2C address of the device.

- interrupts : The CODEC's interrupt output.

Optional properties:

Pins on the device (for linking into audio routes) for RT5663/RT5668:

  * IN1P
  * IN1N
  * IN2P
  * IN2N
  * HPOL
  * HPOR

Example:

codec: rt5663@12 {
	compatible = "realtek,rt5663";
	reg = <0x12>;
	interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
};
+7 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ config SND_SOC_ALL_CODECS
	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
@@ -647,6 +648,7 @@ config SND_SOC_RL6231
	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
@@ -656,6 +658,7 @@ config SND_SOC_RL6231
	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

@@ -668,6 +671,7 @@ config SND_SOC_RL6347A

config SND_SOC_RT286
	tristate
	select SND_SOC_RT5663
	depends on I2C

config SND_SOC_RT298
@@ -703,6 +707,9 @@ config SND_SOC_RT5659
config SND_SOC_RT5660
	tristate

config SND_SOC_RT5663
	tristate

config SND_SOC_RT5670
	tristate

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 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
@@ -335,6 +336,7 @@ 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
+3218 −0

File added.

Preview size limit exceeded, changes collapsed.

+1121 −0

File added.

Preview size limit exceeded, changes collapsed.