diff for duplicates of <7002681488092924@web8j.yandex.ru> diff --git a/a/1.txt b/N1/1.txt index 8ccf7e9..23ff4cd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,8 +2,8 @@ 26.02.2017, 14:16, "Chen-Yu Tsai" <wens@csie.org>: > On Sat, Feb 25, 2017 at 8:30 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote: ->> The V3s SoC features an analog codec with headphone support but without ->> mic2 and linein. +>> ?The V3s SoC features an analog codec with headphone support but without +>> ?mic2 and linein. > > It doesn't have MBIAS either. Please split it out as well. @@ -12,56 +12,52 @@ Thanks for your tips ;-) > > ChenYu > ->> Add support for it. +>> ?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(+) +>> ?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" +>> ?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 6c17c99c2c8d..6375932177a3 100644 ->> --- a/sound/soc/sunxi/sun8i-codec-analog.c ->> +++ b/sound/soc/sunxi/sun8i-codec-analog.c ->> @@ -695,6 +695,11 @@ static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = { ->> .has_mic2 = true, ->> }; +>> ??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 6c17c99c2c8d..6375932177a3 100644 +>> ?--- a/sound/soc/sunxi/sun8i-codec-analog.c +>> ?+++ b/sound/soc/sunxi/sun8i-codec-analog.c +>> ?@@ -695,6 +695,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; ->> @@ -762,6 +767,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 -_______________________________________________ -Alsa-devel mailing list -Alsa-devel@alsa-project.org -http://mailman.alsa-project.org/mailman/listinfo/alsa-devel +>> ?+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; +>> ?@@ -762,6 +767,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 diff --git a/a/content_digest b/N1/content_digest index bb878b2..4707aec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,27 +1,18 @@ "ref\020170225123029.55939-1-icenowy@aosc.xyz\0" "ref\020170225123029.55939-3-icenowy@aosc.xyz\0" "ref\0CAGb2v67YfVo7RhkAPUZusfJiCW-_m6-d-=uq-DdgjEWNKYWVsQ@mail.gmail.com\0" - "From\0Icenowy Zheng <icenowy@aosc.xyz>\0" - "Subject\0Re: [PATCH 3/9] ASoC: sun8i-codec-analog: add support for V3s SoC\0" + "From\0icenowy@aosc.xyz (Icenowy Zheng)\0" + "Subject\0[PATCH 3/9] ASoC: sun8i-codec-analog: add support for V3s SoC\0" "Date\0Sun, 26 Feb 2017 15:08:44 +0800\0" - "To\0Chen-Yu Tsai <wens@csie.org>\0" - "Cc\0devicetree <devicetree@vger.kernel.org>" - Linux-ALSA <alsa-devel@alsa-project.org> - Vinod Koul <vinod.koul@intel.com> - Mark Brown <broonie@kernel.org> - linux-kernel <linux-kernel@vger.kernel.org> - Rob Herring <robh+dt@kernel.org> - dmaengine@vger.kernel.org <dmaengine@vger.kernel.org> - Maxime Ripard <maxime.ripard@free-electrons.com> - " linux-arm-kernel <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\n" "\n" "26.02.2017, 14:16, \"Chen-Yu Tsai\" <wens@csie.org>:\n" "> On Sat, Feb 25, 2017 at 8:30 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:\n" - ">> \302\240The V3s SoC features an analog codec with headphone support but without\n" - ">> \302\240mic2 and linein.\n" + ">> ?The V3s SoC features an analog codec with headphone support but without\n" + ">> ?mic2 and linein.\n" ">\n" "> It doesn't have MBIAS either. Please split it out as well.\n" "\n" @@ -30,58 +21,54 @@ ">\n" "> ChenYu\n" ">\n" - ">> \302\240Add support for it.\n" + ">> ?Add support for it.\n" ">>\n" - ">> \302\240Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>\n" - ">> \302\240---\n" - ">> \302\240\302\240Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt | 1 +\n" - ">> \302\240\302\240sound/soc/sunxi/sun8i-codec-analog.c | 9 +++++++++\n" - ">> \302\240\302\2402 files changed, 10 insertions(+)\n" + ">> ?Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>\n" + ">> ?---\n" + ">> ??Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt | 1 +\n" + ">> ??sound/soc/sunxi/sun8i-codec-analog.c | 9 +++++++++\n" + ">> ??2 files changed, 10 insertions(+)\n" ">>\n" - ">> \302\240diff --git a/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt\n" - ">> \302\240index 779b735781ba..1b6e7c4e50ab 100644\n" - ">> \302\240--- a/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt\n" - ">> \302\240+++ b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt\n" - ">> \302\240@@ -4,6 +4,7 @@ Required properties:\n" - ">> \302\240\302\240- compatible: must be one of the following compatibles:\n" - ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240- \"allwinner,sun8i-a23-codec-analog\"\n" - ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240- \"allwinner,sun8i-h3-codec-analog\"\n" - ">> \302\240+ - \"allwinner,sun8i-v3s-codec-analog\"\n" + ">> ?diff --git a/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt\n" + ">> ?index 779b735781ba..1b6e7c4e50ab 100644\n" + ">> ?--- a/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt\n" + ">> ?+++ b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt\n" + ">> ?@@ -4,6 +4,7 @@ Required properties:\n" + ">> ??- compatible: must be one of the following compatibles:\n" + ">> ?????????????????- \"allwinner,sun8i-a23-codec-analog\"\n" + ">> ?????????????????- \"allwinner,sun8i-h3-codec-analog\"\n" + ">> ?+ - \"allwinner,sun8i-v3s-codec-analog\"\n" ">>\n" - ">> \302\240\302\240Required properties if not a sub-node of the PRCM node:\n" - ">> \302\240\302\240- reg: must contain the registers location and length\n" - ">> \302\240diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c\n" - ">> \302\240index 6c17c99c2c8d..6375932177a3 100644\n" - ">> \302\240--- a/sound/soc/sunxi/sun8i-codec-analog.c\n" - ">> \302\240+++ b/sound/soc/sunxi/sun8i-codec-analog.c\n" - ">> \302\240@@ -695,6 +695,11 @@ static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = {\n" - ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240.has_mic2 = true,\n" - ">> \302\240\302\240};\n" + ">> ??Required properties if not a sub-node of the PRCM node:\n" + ">> ??- reg: must contain the registers location and length\n" + ">> ?diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c\n" + ">> ?index 6c17c99c2c8d..6375932177a3 100644\n" + ">> ?--- a/sound/soc/sunxi/sun8i-codec-analog.c\n" + ">> ?+++ b/sound/soc/sunxi/sun8i-codec-analog.c\n" + ">> ?@@ -695,6 +695,11 @@ static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = {\n" + ">> ?????????.has_mic2 = true,\n" + ">> ??};\n" ">>\n" - ">> \302\240+static const struct sun8i_codec_analog_quirks sun8i_v3s_quirks = {\n" - ">> \302\240+ .has_headphone = true,\n" - ">> \302\240+ .has_hmic = true,\n" - ">> \302\240+};\n" - ">> \302\240+\n" - ">> \302\240\302\240static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt)\n" - ">> \302\240\302\240{\n" - ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct device *dev = cmpnt->dev;\n" - ">> \302\240@@ -762,6 +767,10 @@ static const struct of_device_id sun8i_codec_analog_of_match[] = {\n" - ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240.compatible = \"allwinner,sun8i-h3-codec-analog\",\n" - ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240.data = &sun8i_h3_quirks,\n" - ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240},\n" - ">> \302\240+ {\n" - ">> \302\240+ .compatible = \"allwinner,sun8i-v3s-codec-analog\",\n" - ">> \302\240+ .data = &sun8i_v3s_quirks,\n" - ">> \302\240+ },\n" - ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240{}\n" - ">> \302\240\302\240};\n" - ">> \302\240\302\240MODULE_DEVICE_TABLE(of, sun8i_codec_analog_of_match);\n" - ">> \302\240--\n" - ">> \302\2402.11.1\n" - "_______________________________________________\n" - "Alsa-devel mailing list\n" - "Alsa-devel@alsa-project.org\n" - http://mailman.alsa-project.org/mailman/listinfo/alsa-devel + ">> ?+static const struct sun8i_codec_analog_quirks sun8i_v3s_quirks = {\n" + ">> ?+ .has_headphone = true,\n" + ">> ?+ .has_hmic = true,\n" + ">> ?+};\n" + ">> ?+\n" + ">> ??static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt)\n" + ">> ??{\n" + ">> ?????????struct device *dev = cmpnt->dev;\n" + ">> ?@@ -762,6 +767,10 @@ static const struct of_device_id sun8i_codec_analog_of_match[] = {\n" + ">> ?????????????????.compatible = \"allwinner,sun8i-h3-codec-analog\",\n" + ">> ?????????????????.data = &sun8i_h3_quirks,\n" + ">> ?????????},\n" + ">> ?+ {\n" + ">> ?+ .compatible = \"allwinner,sun8i-v3s-codec-analog\",\n" + ">> ?+ .data = &sun8i_v3s_quirks,\n" + ">> ?+ },\n" + ">> ?????????{}\n" + ">> ??};\n" + ">> ??MODULE_DEVICE_TABLE(of, sun8i_codec_analog_of_match);\n" + ">> ?--\n" + >> ?2.11.1 -5f7963b1fa43b8dbf3e0aa93db458cd82cddb96ee81bb28a3cb0ae3b3ab29ebc +b1262cdb72fbea3c812a9fcc49a7b52536912972c8ae83d2ee2710e04a3e35a7
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.