The patch

ASoC: sun8i-codec-analog: split out mic2

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks, Mark

From 3f48947d56ff3e42e2e490714025e984af817f5d Mon Sep 17 00:00:00 2001

From: Icenowy Zheng icenowy@aosc.xyz Date: Sun, 5 Mar 2017 21:36:58 +0800 Subject: [PATCH] ASoC: sun8i-codec-analog: split out mic2

Allwinner V3s features an analog codec without MIC2.

Split out this part, in order to prepare for the V3s analog codec.

Signed-off-by: Icenowy Zheng icenowy@aosc.xyz Acked-by: Chen-Yu Tsai wens@csie.org Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/sunxi/sun8i-codec-analog.c | 92 +++++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 16 deletions(-)

diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c index 72331332b72e..b95ff045cd7f 100644 --- a/sound/soc/sunxi/sun8i-codec-analog.c +++ b/sound/soc/sunxi/sun8i-codec-analog.c @@ -259,17 +259,11 @@ static const struct snd_kcontrol_new sun8i_codec_common_controls[] = { SOC_SINGLE_TLV("Mic1 Playback Volume", SUN8I_ADDA_MICIN_GCTRL, SUN8I_ADDA_MICIN_GCTRL_MIC1G, 0x7, 0, sun8i_codec_out_mixer_pregain_scale), - SOC_SINGLE_TLV("Mic2 Playback Volume", - SUN8I_ADDA_MICIN_GCTRL, SUN8I_ADDA_MICIN_GCTRL_MIC2G, - 0x7, 0, sun8i_codec_out_mixer_pregain_scale),

- /* Microphone Amp boost gains */ + /* Microphone Amp boost gain */ SOC_SINGLE_TLV("Mic1 Boost Volume", SUN8I_ADDA_MIC1G_MICBIAS_CTRL, SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MIC1BOOST, 0x7, 0, sun8i_codec_mic_gain_scale), - SOC_SINGLE_TLV("Mic2 Boost Volume", SUN8I_ADDA_MIC2G_CTRL, - SUN8I_ADDA_MIC2G_CTRL_MIC2BOOST, 0x7, 0, - sun8i_codec_mic_gain_scale),

/* ADC */ SOC_SINGLE_TLV("ADC Gain Capture Volume", SUN8I_ADDA_ADC_AP_EN, @@ -298,9 +292,8 @@ static const struct snd_soc_dapm_widget sun8i_codec_common_widgets[] = { /* Line In */ SND_SOC_DAPM_INPUT("LINEIN"),

- /* Microphone inputs */ + /* Microphone input */ SND_SOC_DAPM_INPUT("MIC1"), - SND_SOC_DAPM_INPUT("MIC2"),

/* Microphone Bias */ SND_SOC_DAPM_SUPPLY("MBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL, @@ -310,8 +303,6 @@ static const struct snd_soc_dapm_widget sun8i_codec_common_widgets[] = { /* Mic input path */ SND_SOC_DAPM_PGA("Mic1 Amplifier", SUN8I_ADDA_MIC1G_MICBIAS_CTRL, SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MIC1AMPEN, 0, NULL, 0), - SND_SOC_DAPM_PGA("Mic2 Amplifier", SUN8I_ADDA_MIC2G_CTRL, - SUN8I_ADDA_MIC2G_CTRL_MIC2AMPEN, 0, NULL, 0),

/* Mixers */ SND_SOC_DAPM_MIXER("Left Mixer", SUN8I_ADDA_DAC_PA_SRC, @@ -335,35 +326,30 @@ static const struct snd_soc_dapm_widget sun8i_codec_common_widgets[] = { static const struct snd_soc_dapm_route sun8i_codec_common_routes[] = { /* Microphone Routes */ { "Mic1 Amplifier", NULL, "MIC1"}, - { "Mic2 Amplifier", NULL, "MIC2"},

/* Left Mixer Routes */ { "Left Mixer", "DAC Playback Switch", "Left DAC" }, { "Left Mixer", "DAC Reversed Playback Switch", "Right DAC" }, { "Left Mixer", "Line In Playback Switch", "LINEIN" }, { "Left Mixer", "Mic1 Playback Switch", "Mic1 Amplifier" }, - { "Left Mixer", "Mic2 Playback Switch", "Mic2 Amplifier" },

/* Right Mixer Routes */ { "Right Mixer", "DAC Playback Switch", "Right DAC" }, { "Right Mixer", "DAC Reversed Playback Switch", "Left DAC" }, { "Right Mixer", "Line In Playback Switch", "LINEIN" }, { "Right Mixer", "Mic1 Playback Switch", "Mic1 Amplifier" }, - { "Right Mixer", "Mic2 Playback Switch", "Mic2 Amplifier" },

/* Left ADC Mixer Routes */ { "Left ADC Mixer", "Mixer Capture Switch", "Left Mixer" }, { "Left ADC Mixer", "Mixer Reversed Capture Switch", "Right Mixer" }, { "Left ADC Mixer", "Line In Capture Switch", "LINEIN" }, { "Left ADC Mixer", "Mic1 Capture Switch", "Mic1 Amplifier" }, - { "Left ADC Mixer", "Mic2 Capture Switch", "Mic2 Amplifier" },

/* Right ADC Mixer Routes */ { "Right ADC Mixer", "Mixer Capture Switch", "Right Mixer" }, { "Right ADC Mixer", "Mixer Reversed Capture Switch", "Left Mixer" }, { "Right ADC Mixer", "Line In Capture Switch", "LINEIN" }, { "Right ADC Mixer", "Mic1 Capture Switch", "Mic1 Amplifier" }, - { "Right ADC Mixer", "Mic2 Capture Switch", "Mic2 Amplifier" },

/* ADC Routes */ { "Left ADC", NULL, "Left ADC Mixer" }, @@ -578,19 +564,87 @@ static int sun8i_codec_add_lineout(struct snd_soc_component *cmpnt) return 0; }

+/* mic2 specific controls, widgets and routes */ +static const struct snd_kcontrol_new sun8i_codec_mic2_controls[] = { + /* Mixer pre-gain */ + SOC_SINGLE_TLV("Mic2 Playback Volume", + SUN8I_ADDA_MICIN_GCTRL, SUN8I_ADDA_MICIN_GCTRL_MIC2G, + 0x7, 0, sun8i_codec_out_mixer_pregain_scale), + + /* Microphone Amp boost gain */ + SOC_SINGLE_TLV("Mic2 Boost Volume", SUN8I_ADDA_MIC2G_CTRL, + SUN8I_ADDA_MIC2G_CTRL_MIC2BOOST, 0x7, 0, + sun8i_codec_mic_gain_scale), +}; + +static const struct snd_soc_dapm_widget sun8i_codec_mic2_widgets[] = { + /* Microphone input */ + SND_SOC_DAPM_INPUT("MIC2"), + + /* Mic input path */ + SND_SOC_DAPM_PGA("Mic2 Amplifier", SUN8I_ADDA_MIC2G_CTRL, + SUN8I_ADDA_MIC2G_CTRL_MIC2AMPEN, 0, NULL, 0), +}; + +static const struct snd_soc_dapm_route sun8i_codec_mic2_routes[] = { + { "Mic2 Amplifier", NULL, "MIC2"}, + + { "Left Mixer", "Mic2 Playback Switch", "Mic2 Amplifier" }, + + { "Right Mixer", "Mic2 Playback Switch", "Mic2 Amplifier" }, + + { "Left ADC Mixer", "Mic2 Capture Switch", "Mic2 Amplifier" }, + + { "Right ADC Mixer", "Mic2 Capture Switch", "Mic2 Amplifier" }, +}; + +static int sun8i_codec_add_mic2(struct snd_soc_component *cmpnt) +{ + struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt); + struct device *dev = cmpnt->dev; + int ret; + + ret = snd_soc_add_component_controls(cmpnt, + sun8i_codec_mic2_controls, + ARRAY_SIZE(sun8i_codec_mic2_controls)); + if (ret) { + dev_err(dev, "Failed to add MIC2 controls: %d\n", ret); + return ret; + } + + ret = snd_soc_dapm_new_controls(dapm, sun8i_codec_mic2_widgets, + ARRAY_SIZE(sun8i_codec_mic2_widgets)); + if (ret) { + dev_err(dev, "Failed to add MIC2 DAPM widgets: %d\n", ret); + return ret; + } + + ret = snd_soc_dapm_add_routes(dapm, sun8i_codec_mic2_routes, + ARRAY_SIZE(sun8i_codec_mic2_routes)); + if (ret) { + dev_err(dev, "Failed to add MIC2 DAPM routes: %d\n", ret); + return ret; + } + + return 0; +} + struct sun8i_codec_analog_quirks { bool has_headphone; bool has_hmic; bool has_lineout; + bool has_mic2; };

static const struct sun8i_codec_analog_quirks sun8i_a23_quirks = { .has_headphone = true, .has_hmic = true, + .has_mic2 = true, };

static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = { .has_lineout = true, + .has_mic2 = true, };

static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt) @@ -626,6 +680,12 @@ static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt) return ret; }

+ if (quirks->has_mic2) { + ret = sun8i_codec_add_mic2(cmpnt); + if (ret) + return ret; + } + return 0; }

On Sun, Mar 5, 2017 at 9:49 PM, Icenowy Zheng icenowy@aosc.xyz wrote:

05.03.2017, 21:38, "Icenowy Zheng" icenowy@aosc.xyz:

...

Allwinner V3s features an analog codec without MBIAS pin.

Split out this part, in order to prepare for the V3s analog codec.

Signed-off-by: Icenowy Zheng icenowy@aosc.xyz

sound/soc/sunxi/sun8i-codec-analog.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-)

Sorry a definiation of has_mbias is mising in the patch...

It's

diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c index af56afe5c403..edcc3eb7cd9a 100644 --- a/sound/soc/sunxi/sun8i-codec-analog.c +++ b/sound/soc/sunxi/sun8i-codec-analog.c @@ -695,6 +695,7 @@ struct sun8i_codec_analog_quirks { bool has_hmic; bool has_linein; bool has_lineout;

•   bool has_mbias;
    bool has_mic2;
  

};

Please incorporate this into the patch in the next version, with

Acked-by: Chen-Yu Tsai wens@csie.org

...

diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c index 6c17c99c2c8d..af56afe5c403 100644 --- a/sound/soc/sunxi/sun8i-codec-analog.c +++ b/sound/soc/sunxi/sun8i-codec-analog.c @@ -289,11 +289,6 @@ static const struct snd_soc_dapm_widget sun8i_codec_common_widgets[] = { /* Microphone input */ SND_SOC_DAPM_INPUT("MIC1"),

• /* Microphone Bias */
• SND_SOC_DAPM_SUPPLY("MBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
• SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MMICBIASEN,
• 0, NULL, 0),

•    /* Mic input path */
     SND_SOC_DAPM_PGA("Mic1 Amplifier", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
                      SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MIC1AMPEN, 0, NULL, 0),
  

@@ -453,6 +448,27 @@ static int sun8i_codec_add_headphone(struct snd_soc_component *cmpnt) return 0; }

+/* mbias specific widget */ +static const struct snd_soc_dapm_widget sun8i_codec_mbias_widgets[] = {

• SND_SOC_DAPM_SUPPLY("MBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
• SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MMICBIASEN,
• 0, NULL, 0),

+};

+static int sun8i_codec_add_mbias(struct snd_soc_component *cmpnt) +{

• struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
• struct device *dev = cmpnt->dev;
• int ret;
• ret = snd_soc_dapm_new_controls(dapm, sun8i_codec_mbias_widgets,
• ARRAY_SIZE(sun8i_codec_mbias_widgets));
• if (ret)
• dev_err(dev, "Failed to add MBIAS DAPM widgets: %d\n", ret);
• return ret;

+}

/* hmic specific widget */ static const struct snd_soc_dapm_widget sun8i_codec_hmic_widgets[] = { SND_SOC_DAPM_SUPPLY("HBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL, @@ -686,12 +702,14 @@ static const struct sun8i_codec_analog_quirks sun8i_a23_quirks = { .has_headphone = true, .has_hmic = true, .has_linein = true,

• .has_mbias = true, .has_mic2 = true,

};

static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = { .has_linein = true, .has_lineout = true,

• .has_mbias = true, .has_mic2 = true,

};

@@ -734,6 +752,12 @@ static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt) return ret; }

• if (quirks->has_mbias) {
• ret = sun8i_codec_add_mbias(cmpnt);
• if (ret)
• return ret;
• }

•    if (quirks->has_mic2) {
             ret = sun8i_codec_add_mic2(cmpnt);
             if (ret)
  

-- 2.11.1

-- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.

On Sun, Mar 5, 2017 at 9:37 PM, Icenowy Zheng icenowy@aosc.xyz wrote:

The V3s SoC features an analog codec with headphone support but without mic2 and linein.

You should also make new mixer control sets, with out linein and mic2, and split out the mixer widget for V3s. Otherwise ALSA is going to export MIC2 and LineIn playback/capture switches to userspace, which is going to be confusing to the user. We've never needed this in the past because all SoCs shared the same set of mixer controls.

ChenYu

Add support for it.

Signed-off-by: Icenowy Zheng icenowy@aosc.xyz

Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt | 1 + sound/soc/sunxi/sun8i-codec-analog.c | 9 +++++++++ 2 files changed, 10 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt index 779b735781ba..1b6e7c4e50ab 100644 --- a/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt +++ b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt @@ -4,6 +4,7 @@ Required properties:

• compatible: must be one of the following compatibles: - "allwinner,sun8i-a23-codec-analog" - "allwinner,sun8i-h3-codec-analog"

•           - "allwinner,sun8i-v3s-codec-analog"
  
  

Required properties if not a sub-node of the PRCM node:

• reg: must contain the registers location and length

diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c index af56afe5c403..d87c75c6ad8e 100644 --- a/sound/soc/sunxi/sun8i-codec-analog.c +++ b/sound/soc/sunxi/sun8i-codec-analog.c @@ -713,6 +713,11 @@ static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = { .has_mic2 = true, };

+static const struct sun8i_codec_analog_quirks sun8i_v3s_quirks = {

•   .has_headphone  = true,
  

•   .has_hmic       = true,
  

+};

static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt) { struct device *dev = cmpnt->dev; @@ -786,6 +791,10 @@ static const struct of_device_id sun8i_codec_analog_of_match[] = { .compatible = "allwinner,sun8i-h3-codec-analog", .data = &sun8i_h3_quirks, },

•   {
  

•           .compatible = "allwinner,sun8i-v3s-codec-analog",
  

•           .data = &sun8i_v3s_quirks,
  

•   },
    {}
  

}; MODULE_DEVICE_TABLE(of, sun8i_codec_analog_of_match); -- 2.11.1

-- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.

On Sun, Mar 5, 2017 at 9:37 PM, Icenowy Zheng icenowy@aosc.xyz wrote:

The codec in the V3s is similar to the one found on the A31. One key difference is the analog path controls are routed through the PRCM block. This is supported by the sun8i-codec-analog driver, and tied into this codec driver with the audio card's aux_dev.

In addition, the V3s does not have LINEIN, LINEOUT, MBIAS and MIC2, MIC3, and the FIFO related registers are like H3.

Signed-off-by: Icenowy Zheng icenowy@aosc.xyz

.../devicetree/bindings/sound/sun4i-codec.txt | 11 ++-- sound/soc/sunxi/sun4i-codec.c | 59 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/sun4i-codec.txt b/Documentation/devicetree/bindings/sound/sun4i-codec.txt index 3863531d1e6d..2d4e10deb6f4 100644 --- a/Documentation/devicetree/bindings/sound/sun4i-codec.txt +++ b/Documentation/devicetree/bindings/sound/sun4i-codec.txt @@ -7,6 +7,7 @@ Required properties: - "allwinner,sun7i-a20-codec" - "allwinner,sun8i-a23-codec" - "allwinner,sun8i-h3-codec"

•           - "allwinner,sun8i-v3s-codec"
  

• reg: must contain the registers location and length
• interrupts: must contain the codec interrupt
• dmas: DMA channels for tx and rx dma. See the DMA client binding,

@@ -25,6 +26,7 @@ Required properties for the following compatibles: - "allwinner,sun6i-a31-codec" - "allwinner,sun8i-a23-codec" - "allwinner,sun8i-h3-codec"

•           - "allwinner,sun8i-v3s-codec"
  

• resets: phandle to the reset control for this device
• allwinner,audio-routing: A list of the connections between audio components. Each entry is a pair of strings, the first being the

@@ -34,15 +36,15 @@ Required properties for the following compatibles: Audio pins on the SoC: "HP" "HPCOM"

•                      "LINEIN"
  

•                      "LINEOUT"    (not on sun8i-a23)
  

•                      "LINEIN"     (not on sun8i-v3s)
  

•                      "LINEOUT"    (not on sun8i-a23 or sun8i-v3s)
                       "MIC1"
  

•                      "MIC2"
  

•                      "MIC2"       (not on sun8i-v3s)
                       "MIC3"       (sun6i-a31 only)
  
                       Microphone biases from the SoC:
                       "HBIAS"
  

•                      "MBIAS"
  

•                      "MBIAS"      (not on sun8i-v3s)
  
                       Board connectors:
                       "Headphone"
  

@@ -55,6 +57,7 @@ Required properties for the following compatibles: Required properties for the following compatibles: - "allwinner,sun8i-a23-codec" - "allwinner,sun8i-h3-codec"

•           - "allwinner,sun8i-v3s-codec"
  

• allwinner,codec-analog-controls: A phandle to the codec analog controls block in the PRCM.

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index c3aab10fa085..7f1b1aa95e0b 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -1339,6 +1339,44 @@ static struct snd_soc_card *sun8i_h3_codec_create_card(struct device *dev) return card; };

+static struct snd_soc_card *sun8i_v3s_codec_create_card(struct device *dev) +{

•   struct snd_soc_card *card;
  

•   int ret;
  

•   card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
  

•   if (!card)
  

•           return ERR_PTR(-ENOMEM);
  

•   aux_dev.codec_of_node = of_parse_phandle(dev->of_node,
  

•                                            "allwinner,codec-analog-controls",
  

•                                            0);
  

•   if (!aux_dev.codec_of_node) {
  

•           dev_err(dev, "Can't find analog controls for codec.\n");
  

•           return ERR_PTR(-EINVAL);
  

•   };
  

•   card->dai_link = sun4i_codec_create_link(dev, &card->num_links);
  

•   if (!card->dai_link)
  

•           return ERR_PTR(-ENOMEM);
  

•   card->dev               = dev;
  

•   card->name              = "V3s Audio Codec";
  

•   card->dapm_widgets      = sun6i_codec_card_dapm_widgets;
  

•   card->num_dapm_widgets  = ARRAY_SIZE(sun6i_codec_card_dapm_widgets);
  

•   card->dapm_routes       = sun8i_codec_card_routes;
  

•   card->num_dapm_routes   = ARRAY_SIZE(sun8i_codec_card_routes);
  

•   card->aux_dev           = &aux_dev;
  

•   card->num_aux_devs      = 1;
  

•   card->fully_routed      = true;
  

•   ret = snd_soc_of_parse_audio_routing(card, "allwinner,audio-routing");
  

•   if (ret)
  

•           dev_warn(dev, "failed to parse audio-routing: %d\n", ret);
  

•   return card;
  

+};

static const struct regmap_config sun4i_codec_regmap_config = { .reg_bits = 32, .reg_stride = 4, @@ -1374,6 +1412,13 @@ static const struct regmap_config sun8i_h3_codec_regmap_config = { .max_register = SUN8I_H3_CODEC_ADC_DBG, };

+static const struct regmap_config sun8i_v3s_codec_regmap_config = {

•   .reg_bits       = 32,
  

•   .reg_stride     = 4,
  

•   .val_bits       = 32,
  

•   .max_register   = SUN6I_CODEC_HMIC_DATA,
  

The last defined register for the non digital audio processing parts is SUN8I_H3_CODEC_ADC_DBG.

Or if you want you could include everything, which goes up to 0x400.

+};

struct sun4i_codec_quirks { const struct regmap_config *regmap_config; const struct snd_soc_codec_driver *codec; @@ -1422,6 +1467,16 @@ static const struct sun4i_codec_quirks sun8i_a23_codec_quirks = { .has_reset = true, };

+static const struct sun4i_codec_quirks sun8i_v3s_codec_quirks = {

•   .regmap_config  = &sun8i_v3s_codec_regmap_config,
  

•   .codec          = &sun8i_a23_codec_codec,
  

Please leave a note, like the H3, that this should be changed if digital audio processing is added.

Regards ChenYu

•   .create_card    = sun8i_v3s_codec_create_card,
  

•   .reg_adc_fifoc  = REG_FIELD(SUN6I_CODEC_ADC_FIFOC, 0, 31),
  

•   .reg_dac_txdata = SUN8I_H3_CODEC_DAC_TXDATA,
  

•   .reg_adc_rxdata = SUN6I_CODEC_ADC_RXDATA,
  

•   .has_reset      = true,
  

+};

static const struct sun4i_codec_quirks sun8i_h3_codec_quirks = { .regmap_config = &sun8i_h3_codec_regmap_config, /* @@ -1458,6 +1513,10 @@ static const struct of_device_id sun4i_codec_of_match[] = { .compatible = "allwinner,sun8i-h3-codec", .data = &sun8i_h3_codec_quirks, },

•   {
  

•           .compatible = "allwinner,sun8i-v3s-codec",
  

•           .data = &sun8i_v3s_codec_quirks,
  

•   },
    {}
  

}; MODULE_DEVICE_TABLE(of, sun4i_codec_of_match); -- 2.11.1

-- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.

On Sun, Mar 05, 2017 at 09:37:03PM +0800, Icenowy Zheng wrote:

Originally we enable a special gate bit when the compatible indicates A23/33.

But according to BSP sources and user manuals, more SoCs will need this gate bit.

So make it a common quirk configured in the config struct.

The BSP source also indicates that A83T will need this gate bit (there's "SUN8IW6" in the #ifdef's), so also enable this gate bit for it.

Signed-off-by: Icenowy Zheng icenowy@aosc.xyz

drivers/dma/sun6i-dma.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index a2358780ab2c..889fb24023cd 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -101,6 +101,7 @@ struct sun6i_dma_config { u32 nr_max_channels; u32 nr_max_requests; u32 nr_max_vchans;

• bool gate_needed;

can you please explain what gate means here

Hi,

On Sun, Mar 5, 2017 at 9:37 PM, Icenowy Zheng icenowy@aosc.xyz wrote:

When the V3s support patchset is applied, CCU headers and V3s DTSI went into different trees, so the CCU inclusion is removed in the DTSI.

Add back them.

Signed-off-by: Icenowy Zheng icenowy@aosc.xyz

arch/arm/boot/dts/sun8i-v3s.dtsi | 67 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi index 71075969e5e6..b3f8b7f9c0bb 100644 --- a/arch/arm/boot/dts/sun8i-v3s.dtsi +++ b/arch/arm/boot/dts/sun8i-v3s.dtsi @@ -40,6 +40,8 @@

• OTHER DEALINGS IN THE SOFTWARE.
  

*/

+#include <dt-bindings/clock/sun8i-v3s-ccu.h> +#include <dt-bindings/reset/sun8i-v3s-ccu.h> #include <dt-bindings/interrupt-controller/arm-gic.h>

Please sort alphabetically. Or if you want, put the sunxi specific headers in a separate group, separated by an empty line from the arm-gic one.

/ { @@ -55,7 +57,7 @@ compatible = "arm,cortex-a7"; device_type = "cpu"; reg = <0>;

•                   clocks = <&ccu 14>;
  

•                   clocks = <&ccu CLK_CPU>;
            };
    };
  
  

@@ -96,15 +98,15 @@ mmc0: mmc@01c0f000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c0f000 0x1000>;

•                   clocks = <&ccu 22>,
  

•                            <&ccu 45>,
  

•                            <&ccu 47>,
  

•                            <&ccu 46>;
  

•                   clocks = <&ccu CLK_BUS_MMC0>,
  

•                            <&ccu CLK_MMC0>,
  

•                            <&ccu CLK_MMC0_OUTPUT>,
  

•                            <&ccu CLK_MMC0_SAMPLE>;
                    clock-names = "ahb",
                                  "mmc",
                                  "output",
                                  "sample";
  

•                   resets = <&ccu 7>;
  

•                   resets = <&ccu RST_BUS_MMC0>;
                    reset-names = "ahb";
                    interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
                    status = "disabled";
  

@@ -115,15 +117,15 @@ mmc1: mmc@01c10000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c10000 0x1000>;

•                   clocks = <&ccu 23>,
  

•                            <&ccu 48>,
  

•                            <&ccu 50>,
  

•                            <&ccu 49>;
  

•                   clocks = <&ccu CLK_BUS_MMC1>,
  

•                            <&ccu CLK_MMC1>,
  

•                            <&ccu CLK_MMC1_OUTPUT>,
  

•                            <&ccu CLK_MMC1_SAMPLE>;
                    clock-names = "ahb",
                                  "mmc",
                                  "output",
                                  "sample";
  

•                   resets = <&ccu 8>;
  

•                   resets = <&ccu RST_BUS_MMC1>;
                    reset-names = "ahb";
                    interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
                    status = "disabled";
  

@@ -134,15 +136,15 @@ mmc2: mmc@01c11000 { compatible = "allwinner,sun7i-a20-mmc"; reg = <0x01c11000 0x1000>;

•                   clocks = <&ccu 24>,
  

•                            <&ccu 51>,
  

•                            <&ccu 53>,
  

•                            <&ccu 52>;
  

•                   clocks = <&ccu CLK_BUS_MMC2>,
  

•                            <&ccu CLK_MMC2>,
  

•                            <&ccu CLK_MMC2_OUTPUT>,
  

•                            <&ccu CLK_MMC2_SAMPLE>;
                    clock-names = "ahb",
                                  "mmc",
                                  "output",
                                  "sample";
  

•                   resets = <&ccu 9>;
  

•                   resets = <&ccu RST_BUS_MMC2>;
                    reset-names = "ahb";
                    interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
                    status = "disabled";
  

@@ -153,8 +155,8 @@ usb_otg: usb@01c19000 { compatible = "allwinner,sun8i-h3-musb"; reg = <0x01c19000 0x0400>;

•                   clocks = <&ccu 29>;
  

•                   resets = <&ccu 17>;
  

•                   clocks = <&ccu CLK_BUS_OTG>;
  

•                   resets = <&ccu RST_BUS_OTG>;
                    interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
                    interrupt-names = "mc";
                    phys = <&usbphy 0>;
  

@@ -169,9 +171,9 @@ <0x01c1a800 0x4>; reg-names = "phy_ctrl", "pmu0";

•                   clocks = <&ccu 56>;
  

•                   clocks = <&ccu CLK_USB_PHY0>;
                    clock-names = "usb0_phy";
  

•                   resets = <&ccu 0>;
  

•                   resets = <&ccu RST_USB_PHY0>;
                    reset-names = "usb0_reset";
                    status = "disabled";
                    #phy-cells = <1>;
  

@@ -198,7 +200,7 @@ reg = <0x01c20800 0x400>; interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;

•                   clocks = <&ccu 37>, <&osc24M>, <&osc32k>;
  

•                   clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>;
                    clock-names = "apb", "hosc", "losc";
                    gpio-controller;
                    #gpio-cells = <3>;
  

@@ -213,6 +215,7 @@ uart0_pins_a: uart0@0 { pins = "PB8", "PB9"; function = "uart0";

•                           bias-pull-up;
  

This is an unrelated change. Please split it out. On the other hand, if the board has proper external pull-ups, you might not need this.

Otherwise,

Acked-by: Chen-Yu Tsai wens@csie.org

                    };

                    mmc0_pins_a: mmc0@0 {

@@ -244,8 +247,8 @@ interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; reg-shift = <2>; reg-io-width = <4>;

•                   clocks = <&ccu 40>;
  

•                   resets = <&ccu 49>;
  

•                   clocks = <&ccu CLK_BUS_UART0>;
  

•                   resets = <&ccu RST_BUS_UART0>;
                    status = "disabled";
            };
  
  

@@ -255,8 +258,8 @@ interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; reg-shift = <2>; reg-io-width = <4>;

•                   clocks = <&ccu 41>;
  

•                   resets = <&ccu 50>;
  

•                   clocks = <&ccu CLK_BUS_UART1>;
  

•                   resets = <&ccu RST_BUS_UART1>;
                    status = "disabled";
            };
  
  

@@ -266,8 +269,8 @@ interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; reg-shift = <2>; reg-io-width = <4>;

•                   clocks = <&ccu 42>;
  

•                   resets = <&ccu 51>;
  

•                   clocks = <&ccu CLK_BUS_UART2>;
  

•                   resets = <&ccu RST_BUS_UART2>;
                    status = "disabled";
            };
  
  

@@ -275,10 +278,8 @@ compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;

•                   clocks = <&ccu 38>;
  

•                   resets = <&ccu 46>;
  

•                   pinctrl-names = "default";
  

•                   pinctrl-0 = <&i2c0_pins>;
  

•                   clocks = <&ccu CLK_BUS_I2C0>;
  

•                   resets = <&ccu RST_BUS_I2C0>;
                    status = "disabled";
                    #address-cells = <1>;
                    #size-cells = <0>;
  

@@ -288,8 +289,8 @@ compatible = "allwinner,sun6i-a31-i2c"; reg = <0x01c2b000 0x400>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;

•                   clocks = <&ccu 39>;
  

•                   resets = <&ccu 47>;
  

•                   clocks = <&ccu CLK_BUS_I2C1>;
  

•                   resets = <&ccu RST_BUS_I2C1>;
                    status = "disabled";
                    #address-cells = <1>;
                    #size-cells = <0>;
  

-- 2.11.1

-- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.

On Sun, Mar 5, 2017 at 9:37 PM, Icenowy Zheng icenowy@aosc.xyz wrote:

Allwinner V3s SoC features 3 MMC controllers, mmc0 is used as the MicroSD slot on Lichee Pi Zero, and on Lichee Pi Zero's dock mmc1 is also soldered as a MicroSD slot.

Add the pinmux for mmc1, thus we can enable the MicroSD slot on the Lichee Pi Zero dock.

Signed-off-by: Icenowy Zheng icenowy@aosc.xyz

arch/arm/boot/dts/sun8i-v3s.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi index 5fb6cb69f7bc..a39c26bceedc 100644 --- a/arch/arm/boot/dts/sun8i-v3s.dtsi +++ b/arch/arm/boot/dts/sun8i-v3s.dtsi @@ -234,6 +234,14 @@ drive-strength = <30>; bias-pull-up; };

•                   mmc1_pins: mmc1@0 {
  

This seems to be the only possible configuration. In that case, please drop the @0 from the node name. We shouldn't be adding them anyway, since it causes warnings from the device tree compiler.

Otherwise,

Acked-by: Chen-Yu Tsai wens@csie.org

•                           pins = "PG0", "PG1", "PG2", "PG3",
  

•                                  "PG4", "PG5";
  

•                           function = "mmc1";
  

•                           drive-strength = <30>;
  

•                           bias-pull-up;
  

•                   };
            };
  
            timer@01c20c00 {
  

-- 2.11.1

-- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.

On Sun, Mar 5, 2017 at 9:37 PM, Icenowy Zheng icenowy@aosc.xyz wrote:

Lichee Pi Zero features a dock, which adds some functions, and should be soldered with the core board of Lichee Pi Zero.

Add support for the dock as a new dts, as soldering is needed to make the dock usable and there's functions enabled on the dock that is unavailable at the 2.54mm pins of the core board.

Signed-off-by: Icenowy Zheng icenowy@aosc.xyz

arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts | 67 ++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 011808490fed..1aa365306479 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -876,7 +876,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-h3-orangepi-plus.dtb \ sun8i-h3-orangepi-plus2e.dtb \ sun8i-r16-parrot.dtb \

•   sun8i-v3s-licheepi-zero.dtb
  

•   sun8i-v3s-licheepi-zero.dtb \
  

•   sun8i-v3s-licheepi-zero-dock.dtb
  

dtb-$(CONFIG_MACH_SUN9I) += \ sun9i-a80-optimus.dtb \ sun9i-a80-cubieboard4.dtb diff --git a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts new file mode 100644 index 000000000000..0ce92dadc07b --- /dev/null +++ b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts @@ -0,0 +1,67 @@ +/*

• • Copyright (C) 2016 Icenowy Zheng icenowy@aosc.xyz
• • This file is dual-licensed: you can use it either under the terms
• • of the GPL or the X11 license, at your option. Note that this dual
• • licensing only applies to this file, and not this project as a
• • whole.
• • a) This file is free software; you can redistribute it and/or

• • modify it under the terms of the GNU General Public License as
    

• • published by the Free Software Foundation; either version 2 of the
    

• • License, or (at your option) any later version.
    

• • This file is distributed in the hope that it will be useful,
    

• • but WITHOUT ANY WARRANTY; without even the implied warranty of
    

• • MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    

• • GNU General Public License for more details.
    

• • Or, alternatively,
• • b) Permission is hereby granted, free of charge, to any person

• • obtaining a copy of this software and associated documentation
    

• • files (the "Software"), to deal in the Software without
    

• • restriction, including without limitation the rights to use,
    

• • copy, modify, merge, publish, distribute, sublicense, and/or
    

• • sell copies of the Software, and to permit persons to whom the
    

• • Software is furnished to do so, subject to the following
    

• • conditions:
    

• • The above copyright notice and this permission notice shall be
    

• • included in all copies or substantial portions of the Software.
    

• • THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    

• • EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
    

• • OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
    

• • NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
    

• • HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
    

• • WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    

• • FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    

• • OTHER DEALINGS IN THE SOFTWARE.
    

• */

+#include "sun8i-v3s-licheepi-zero.dts"

+/ {

•   model = "Lichee Pi Zero with Dock";
  

•   compatible = "licheepi,licheepi-zero-dock", "licheepi,licheepi-zero",
  

•                "allwinner,sun8i-v3s";
  

+};

+&codec {

•   allwinner,audio-routing =
  

•           "Headphone", "HP",
  

•           "Headphone", "HPCOM",
  

Can you confirm HPCOM is indeed connected or is needed? This models how the audio output is coupled to the headphone, AC or DC.

Easy way to check is if you get no sound without this, then it is likely DC coupled, in which the return path is through HPCOM, and not GND.

Regards ChenYu

•           "MIC1", "Mic",
  

•           "Mic",  "HBIAS";
  

•   status = "okay";
  

+};

+&mmc1 {

•   pinctrl-0 = <&mmc1_pins>;
  

•   pinctrl-names = "default";
  

•   broken-cd;
  

•   bus-width = <4>;
  

•   vmmc-supply = <&reg_vcc3v3>;
  

•   status = "okay";
  

+};

2.11.1

-- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.