Skip to content

Commit 081068f

Browse files
CounterPillowbroonie
authored andcommitted
ASoC: rockchip: add support for i2s-tdm controller
This commit adds support for the rockchip i2s-tdm controller, which enables audio output on the following rockchip SoCs: - px30 - rk1808 - rk3308 - rk3566 - rk3568 - rv1126 This is a cleaned up version of the downstream vendor kernel's driver. It can be enabled through the SND_SOC_ROCKCHIP_I2S_TDM configuration option. Signed-off-by: Nicolas Frattaroli <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent dc1fad2 commit 081068f

File tree

5 files changed

+2265
-0
lines changed

5 files changed

+2265
-0
lines changed

MAINTAINERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16108,6 +16108,12 @@ F: Documentation/ABI/*/sysfs-driver-hid-roccat*
1610816108
F: drivers/hid/hid-roccat*
1610916109
F: include/linux/hid-roccat*
1611016110

16111+
ROCKCHIP I2S TDM DRIVER
16112+
M: Nicolas Frattaroli <[email protected]>
16113+
16114+
S: Maintained
16115+
F: sound/soc/rockchip/rockchip_i2s_tdm.*
16116+
1611116117
ROCKCHIP ISP V1 DRIVER
1611216118
M: Helen Koike <[email protected]>
1611316119
M: Dafna Hirschfeld <[email protected]>

sound/soc/rockchip/Kconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,17 @@ config SND_SOC_ROCKCHIP_I2S
1616
Rockchip I2S device. The device supports upto maximum of
1717
8 channels each for play and record.
1818

19+
config SND_SOC_ROCKCHIP_I2S_TDM
20+
tristate "Rockchip I2S/TDM Device Driver"
21+
depends on HAVE_CLK && SND_SOC_ROCKCHIP
22+
select SND_SOC_GENERIC_DMAENGINE_PCM
23+
help
24+
Say Y or M if you want to add support for the I2S/TDM driver for
25+
Rockchip I2S/TDM devices, found in Rockchip SoCs. These devices
26+
interface between the AHB bus and the I2S bus, and support up to a
27+
maximum of 8 channels each for playback and recording.
28+
29+
1930
config SND_SOC_ROCKCHIP_PDM
2031
tristate "Rockchip PDM Controller Driver"
2132
depends on HAVE_CLK && SND_SOC_ROCKCHIP

sound/soc/rockchip/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# SPDX-License-Identifier: GPL-2.0
22
# ROCKCHIP Platform Support
33
snd-soc-rockchip-i2s-objs := rockchip_i2s.o
4+
snd-soc-rockchip-i2s-tdm-objs := rockchip_i2s_tdm.o
45
snd-soc-rockchip-pcm-objs := rockchip_pcm.o
56
snd-soc-rockchip-pdm-objs := rockchip_pdm.o
67
snd-soc-rockchip-spdif-objs := rockchip_spdif.o
78

89
obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o snd-soc-rockchip-pcm.o
10+
obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S_TDM) += snd-soc-rockchip-i2s-tdm.o
911
obj-$(CONFIG_SND_SOC_ROCKCHIP_PDM) += snd-soc-rockchip-pdm.o
1012
obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIF) += snd-soc-rockchip-spdif.o
1113

0 commit comments

Comments
 (0)