mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
2e0b000e0e
Remove patches that were upstreamed, and backport features from later kernels. Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
275 lines
9.1 KiB
Diff
275 lines
9.1 KiB
Diff
From c8c3c516ca5c38e7858055ce0137efde17a07190 Mon Sep 17 00:00:00 2001
|
|
From: Maksim Kiselev <bigunclemax@gmail.com>
|
|
Date: Sat, 5 Aug 2023 21:05:04 +0300
|
|
Subject: [PATCH 10/14] ASoC: sunxi: Add new driver for Allwinner D1/T113s
|
|
codec's analog path controls
|
|
|
|
The internal codec on D1/T113s is split into 2 parts like the previous
|
|
ones. But now analog path controls registers are mapped directly
|
|
on the bus, right after the registers of the digital part.
|
|
|
|
Add an ASoC component driver for it. This should be tied to the codec
|
|
audio card as an auxiliary device.
|
|
|
|
Signed-off-by: Maksim Kiselev <bigunclemax@gmail.com>
|
|
---
|
|
sound/soc/sunxi/Kconfig | 11 ++
|
|
sound/soc/sunxi/Makefile | 1 +
|
|
sound/soc/sunxi/sun20i-d1-codec-analog.c | 220 +++++++++++++++++++++++
|
|
3 files changed, 232 insertions(+)
|
|
create mode 100644 sound/soc/sunxi/sun20i-d1-codec-analog.c
|
|
|
|
--- a/sound/soc/sunxi/Kconfig
|
|
+++ b/sound/soc/sunxi/Kconfig
|
|
@@ -38,6 +38,17 @@ config SND_SUN50I_CODEC_ANALOG
|
|
Say Y or M if you want to add support for the analog controls for
|
|
the codec embedded in Allwinner A64 SoC.
|
|
|
|
+config SND_SUN20I_D1_CODEC_ANALOG
|
|
+ tristate "Allwinner D1 Codec Analog Controls Support"
|
|
+ depends on ARCH_SUNXI || COMPILE_TEST
|
|
+ select REGMAP_MMIO
|
|
+ help
|
|
+ This option enables the analog controls part of the internal audio
|
|
+ codec for Allwinner D1/T113s SoCs family.
|
|
+
|
|
+ Say Y or M if you want to add support for the analog part of
|
|
+ the D1/T113s audio codec.
|
|
+
|
|
config SND_SUN4I_I2S
|
|
tristate "Allwinner A10 I2S Support"
|
|
select SND_SOC_GENERIC_DMAENGINE_PCM
|
|
--- a/sound/soc/sunxi/Makefile
|
|
+++ b/sound/soc/sunxi/Makefile
|
|
@@ -4,6 +4,7 @@ obj-$(CONFIG_SND_SUN4I_I2S) += sun4i-i2s
|
|
obj-$(CONFIG_SND_SUN4I_SPDIF) += sun4i-spdif.o
|
|
obj-$(CONFIG_SND_SUN8I_CODEC_ANALOG) += sun8i-codec-analog.o
|
|
obj-$(CONFIG_SND_SUN50I_CODEC_ANALOG) += sun50i-codec-analog.o
|
|
+obj-$(CONFIG_SND_SUN20I_D1_CODEC_ANALOG) += sun20i-d1-codec-analog.o
|
|
obj-$(CONFIG_SND_SUN8I_CODEC) += sun8i-codec.o
|
|
obj-$(CONFIG_SND_SUN8I_ADDA_PR_REGMAP) += sun8i-adda-pr-regmap.o
|
|
obj-$(CONFIG_SND_SUN50I_DMIC) += sun50i-dmic.o
|
|
--- /dev/null
|
|
+++ b/sound/soc/sunxi/sun20i-d1-codec-analog.c
|
|
@@ -0,0 +1,220 @@
|
|
+// SPDX-License-Identifier: GPL-2.0+
|
|
+/*
|
|
+ * This driver supports the analog controls for the internal codec
|
|
+ * found in Allwinner's D1/T113s SoCs family.
|
|
+ *
|
|
+ * Based on sun50i-codec-analog.c
|
|
+ */
|
|
+
|
|
+#include <linux/io.h>
|
|
+#include <linux/kernel.h>
|
|
+#include <linux/module.h>
|
|
+#include <linux/of.h>
|
|
+#include <linux/of_device.h>
|
|
+#include <linux/platform_device.h>
|
|
+#include <linux/regmap.h>
|
|
+
|
|
+#include <sound/soc.h>
|
|
+#include <sound/soc-dapm.h>
|
|
+#include <sound/tlv.h>
|
|
+
|
|
+/* Codec analog control register offsets and bit fields */
|
|
+#define SUN20I_D1_ADDA_ADC1 (0x00)
|
|
+#define SUN20I_D1_ADDA_ADC2 (0x04)
|
|
+#define SUN20I_D1_ADDA_ADC3 (0x08)
|
|
+#define SUN20I_D1_ADDA_ADC_EN (31)
|
|
+#define SUN20I_D1_ADDA_ADC_PGA_EN (30)
|
|
+#define SUN20I_D1_ADDA_ADC_MIC_SIN_EN (28)
|
|
+#define SUN20I_D1_ADDA_ADC_LINEINLEN (23)
|
|
+#define SUN20I_D1_ADDA_ADC_PGA_GAIN (8)
|
|
+
|
|
+#define SUN20I_D1_ADDA_DAC (0x10)
|
|
+#define SUN20I_D1_ADDA_DAC_DACL_EN (15)
|
|
+#define SUN20I_D1_ADDA_DAC_DACR_EN (14)
|
|
+
|
|
+#define SUN20I_D1_ADDA_MICBIAS (0x18)
|
|
+#define SUN20I_D1_ADDA_MICBIAS_MMICBIASEN (7)
|
|
+
|
|
+#define SUN20I_D1_ADDA_RAMP (0x1C)
|
|
+#define SUN20I_D1_ADDA_RAMP_RD_EN (0)
|
|
+
|
|
+#define SUN20I_D1_ADDA_HP2 (0x40)
|
|
+#define SUN20I_D1_ADDA_HP2_HEADPHONE_GAIN (28)
|
|
+
|
|
+#define SUN20I_D1_ADDA_ADC_CUR_REG (0x4C)
|
|
+
|
|
+static const DECLARE_TLV_DB_RANGE(sun20i_d1_codec_adc_gain_scale,
|
|
+ 0, 0, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1),
|
|
+ 1, 3, TLV_DB_SCALE_ITEM(600, 0, 0),
|
|
+ 4, 4, TLV_DB_SCALE_ITEM(900, 0, 0),
|
|
+ 5, 31, TLV_DB_SCALE_ITEM(1000, 100, 0),
|
|
+);
|
|
+
|
|
+static const DECLARE_TLV_DB_SCALE(sun20i_d1_codec_hp_vol_scale, -4200, 600, 0);
|
|
+
|
|
+/* volume controls */
|
|
+static const struct snd_kcontrol_new sun20i_d1_codec_controls[] = {
|
|
+ SOC_SINGLE_TLV("Headphone Playback Volume",
|
|
+ SUN20I_D1_ADDA_HP2,
|
|
+ SUN20I_D1_ADDA_HP2_HEADPHONE_GAIN, 0x7, 1,
|
|
+ sun20i_d1_codec_hp_vol_scale),
|
|
+ SOC_SINGLE_TLV("ADC1 Gain Capture Volume",
|
|
+ SUN20I_D1_ADDA_ADC1,
|
|
+ SUN20I_D1_ADDA_ADC_PGA_GAIN, 0x1f, 0,
|
|
+ sun20i_d1_codec_adc_gain_scale),
|
|
+ SOC_SINGLE_TLV("ADC2 Gain Capture Volume",
|
|
+ SUN20I_D1_ADDA_ADC2,
|
|
+ SUN20I_D1_ADDA_ADC_PGA_GAIN, 0x1f, 0,
|
|
+ sun20i_d1_codec_adc_gain_scale),
|
|
+ SOC_SINGLE_TLV("ADC3 Gain Capture Volume",
|
|
+ SUN20I_D1_ADDA_ADC3,
|
|
+ SUN20I_D1_ADDA_ADC_PGA_GAIN, 0x1f, 0,
|
|
+ sun20i_d1_codec_adc_gain_scale),
|
|
+};
|
|
+
|
|
+/* ADC mixer controls */
|
|
+static const struct snd_kcontrol_new sun20i_d1_codec_mixer_controls[] = {
|
|
+ SOC_DAPM_DOUBLE_R("Line In Switch",
|
|
+ SUN20I_D1_ADDA_ADC1,
|
|
+ SUN20I_D1_ADDA_ADC2,
|
|
+ SUN20I_D1_ADDA_ADC_LINEINLEN, 1, 0),
|
|
+};
|
|
+
|
|
+static const char * const sun20i_d1_codec_mic3_src_enum_text[] = {
|
|
+ "Differential", "Single",
|
|
+};
|
|
+
|
|
+static SOC_ENUM_SINGLE_DECL(sun20i_d1_codec_mic3_src_enum,
|
|
+ SUN20I_D1_ADDA_ADC3,
|
|
+ SUN20I_D1_ADDA_ADC_MIC_SIN_EN,
|
|
+ sun20i_d1_codec_mic3_src_enum_text);
|
|
+
|
|
+static const struct snd_kcontrol_new sun20i_d1_codec_mic3_input_src[] = {
|
|
+ SOC_DAPM_ENUM("MIC3 Source Capture Route",
|
|
+ sun20i_d1_codec_mic3_src_enum),
|
|
+};
|
|
+
|
|
+static const struct snd_soc_dapm_widget sun20i_d1_codec_widgets[] = {
|
|
+ /* DAC */
|
|
+ SND_SOC_DAPM_DAC("Left DAC", NULL, SUN20I_D1_ADDA_DAC,
|
|
+ SUN20I_D1_ADDA_DAC_DACL_EN, 0),
|
|
+ SND_SOC_DAPM_DAC("Right DAC", NULL, SUN20I_D1_ADDA_DAC,
|
|
+ SUN20I_D1_ADDA_DAC_DACR_EN, 0),
|
|
+ /* ADC */
|
|
+ SND_SOC_DAPM_ADC("ADC1", NULL, SUN20I_D1_ADDA_ADC1,
|
|
+ SUN20I_D1_ADDA_ADC_EN, 0),
|
|
+ SND_SOC_DAPM_ADC("ADC2", NULL, SUN20I_D1_ADDA_ADC2,
|
|
+ SUN20I_D1_ADDA_ADC_EN, 0),
|
|
+ SND_SOC_DAPM_ADC("ADC3", NULL, SUN20I_D1_ADDA_ADC3,
|
|
+ SUN20I_D1_ADDA_ADC_EN, 0),
|
|
+
|
|
+ /* ADC Mixers */
|
|
+ SND_SOC_DAPM_MIXER("ADC1 Mixer", SND_SOC_NOPM, 0, 0,
|
|
+ sun20i_d1_codec_mixer_controls,
|
|
+ ARRAY_SIZE(sun20i_d1_codec_mixer_controls)),
|
|
+ SND_SOC_DAPM_MIXER("ADC2 Mixer", SND_SOC_NOPM, 0, 0,
|
|
+ sun20i_d1_codec_mixer_controls,
|
|
+ ARRAY_SIZE(sun20i_d1_codec_mixer_controls)),
|
|
+
|
|
+ /* Headphone */
|
|
+ SND_SOC_DAPM_OUTPUT("HP"),
|
|
+ SND_SOC_DAPM_SUPPLY("RAMP Enable", SUN20I_D1_ADDA_RAMP,
|
|
+ SUN20I_D1_ADDA_RAMP_RD_EN, 0, NULL, 0),
|
|
+
|
|
+ /* Line input */
|
|
+ SND_SOC_DAPM_INPUT("LINEIN"),
|
|
+
|
|
+ /* Microphone input */
|
|
+ SND_SOC_DAPM_INPUT("MIC3"),
|
|
+
|
|
+ /* Microphone input path */
|
|
+ SND_SOC_DAPM_MUX("MIC3 Source Capture Route", SND_SOC_NOPM, 0, 0,
|
|
+ sun20i_d1_codec_mic3_input_src),
|
|
+
|
|
+ SND_SOC_DAPM_PGA("Mic3 Amplifier", SUN20I_D1_ADDA_ADC3,
|
|
+ SUN20I_D1_ADDA_ADC_PGA_EN, 0, NULL, 0),
|
|
+
|
|
+ /* Microphone Bias */
|
|
+ SND_SOC_DAPM_SUPPLY("MBIAS", SUN20I_D1_ADDA_MICBIAS,
|
|
+ SUN20I_D1_ADDA_MICBIAS_MMICBIASEN, 0, NULL, 0),
|
|
+};
|
|
+
|
|
+static const struct snd_soc_dapm_route sun20i_d1_codec_routes[] = {
|
|
+ /* Headphone Routes */
|
|
+ { "HP", NULL, "Left DAC" },
|
|
+ { "HP", NULL, "Right DAC" },
|
|
+ { "HP", NULL, "RAMP Enable" },
|
|
+
|
|
+ /* Line input Routes */
|
|
+ { "ADC1", NULL, "ADC1 Mixer" },
|
|
+ { "ADC2", NULL, "ADC2 Mixer" },
|
|
+ { "ADC1 Mixer", "Line In Switch", "LINEIN" },
|
|
+ { "ADC2 Mixer", "Line In Switch", "LINEIN" },
|
|
+
|
|
+ /* Microphone Routes */
|
|
+ { "MIC3 Source Capture Route", "Differential", "MIC3" },
|
|
+ { "MIC3 Source Capture Route", "Single", "MIC3" },
|
|
+ { "Mic3 Amplifier", NULL, "MIC3 Source Capture Route" },
|
|
+ { "ADC3", NULL, "Mic3 Amplifier" },
|
|
+};
|
|
+
|
|
+static const struct snd_soc_component_driver sun20i_d1_codec_analog_cmpnt_drv = {
|
|
+ .controls = sun20i_d1_codec_controls,
|
|
+ .num_controls = ARRAY_SIZE(sun20i_d1_codec_controls),
|
|
+ .dapm_widgets = sun20i_d1_codec_widgets,
|
|
+ .num_dapm_widgets = ARRAY_SIZE(sun20i_d1_codec_widgets),
|
|
+ .dapm_routes = sun20i_d1_codec_routes,
|
|
+ .num_dapm_routes = ARRAY_SIZE(sun20i_d1_codec_routes),
|
|
+};
|
|
+
|
|
+static const struct of_device_id sun20i_d1_codec_analog_of_match[] = {
|
|
+ {
|
|
+ .compatible = "allwinner,sun20i-d1-codec-analog",
|
|
+ },
|
|
+ {}
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, sun20i_d1_codec_analog_of_match);
|
|
+
|
|
+static const struct regmap_config sun20i_d1_codec_regmap_config = {
|
|
+ .reg_bits = 32,
|
|
+ .reg_stride = 4,
|
|
+ .val_bits = 32,
|
|
+ .max_register = SUN20I_D1_ADDA_ADC_CUR_REG,
|
|
+};
|
|
+
|
|
+static int sun20i_d1_codec_analog_probe(struct platform_device *pdev)
|
|
+{
|
|
+ struct regmap *regmap;
|
|
+ void __iomem *base;
|
|
+
|
|
+ base = devm_platform_ioremap_resource(pdev, 0);
|
|
+ if (IS_ERR(base)) {
|
|
+ dev_err(&pdev->dev, "Failed to map the registers\n");
|
|
+ return PTR_ERR(base);
|
|
+ }
|
|
+
|
|
+ regmap = devm_regmap_init_mmio(&pdev->dev, base,
|
|
+ &sun20i_d1_codec_regmap_config);
|
|
+ if (IS_ERR(regmap)) {
|
|
+ dev_err(&pdev->dev, "Failed to create regmap\n");
|
|
+ return PTR_ERR(regmap);
|
|
+ }
|
|
+
|
|
+ return devm_snd_soc_register_component(&pdev->dev,
|
|
+ &sun20i_d1_codec_analog_cmpnt_drv,
|
|
+ NULL, 0);
|
|
+}
|
|
+
|
|
+static struct platform_driver sun20i_d1_codec_analog_driver = {
|
|
+ .driver = {
|
|
+ .name = "sun20i-d1-codec-analog",
|
|
+ .of_match_table = sun20i_d1_codec_analog_of_match,
|
|
+ },
|
|
+ .probe = sun20i_d1_codec_analog_probe,
|
|
+};
|
|
+module_platform_driver(sun20i_d1_codec_analog_driver);
|
|
+
|
|
+MODULE_DESCRIPTION("Allwinner internal codec analog controls driver for D1");
|
|
+MODULE_AUTHOR("Maksim Kiselev <bigunclemax@gmail.com>");
|
|
+MODULE_LICENSE("GPL");
|
|
+MODULE_ALIAS("platform:sun20i-d1-codec-analog");
|