From: Krzysztof Kozlowski <krzk@kernel.org>
To: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: simon@lineageos.org, devicetree@vger.kernel.org,
alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org,
b.zolnierkie@samsung.com, robh+dt@kernel.org, broonie@kernel.org,
m.szyprowski@samsung.com
Subject: Re: [PATCH 3/3] ARM: dts: exynos: Add sound support to Midas
Date: Mon, 20 Jul 2020 16:34:58 +0200 [thread overview]
Message-ID: <20200720143458.GB22554@kozik-lap> (raw)
In-Reply-To: <20200710173500.22365-3-s.nawrocki@samsung.com>
On Fri, Jul 10, 2020 at 07:35:00PM +0200, Sylwester Nawrocki wrote:
> From: Simon Shields <simon@lineageos.org>
>
> Update the never-mainlined "samsung,trats2-audio" binding and instead
> use the new "samsung,midas-audio" binding.
>
> Signed-off-by: Simon Shields <simon@lineageos.org>
> [s.nawrocki: fixed DAPM routing entries for MICBIAS1/2, adjusted to
> changes in the DT binding]
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> ---
> arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 38 ++++++++++++++
> arch/arm/boot/dts/exynos4412-i9300.dts | 4 ++
> arch/arm/boot/dts/exynos4412-midas.dtsi | 78 ++++++++++++++++++++++++-----
> arch/arm/boot/dts/exynos4412-n710x.dts | 35 +++++++++++++
> 4 files changed, 142 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
> index 53b3ca3..cff0980 100644
> --- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
> +++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
> @@ -175,3 +175,41 @@
> gpio = <&gpm0 0 GPIO_ACTIVE_HIGH>;
> status = "okay";
> };
> +
> +&submic_bias_reg {
Put them in alphabetical order against oder phandle overrides. Same for
n710x.dts.
> + gpio = <&gpf2 0 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> +};
> +
> +&sound {
> + samsung,audio-routing =
> + "HP", "HPOUT1L",
> + "HP", "HPOUT1R",
> +
> + "SPK", "SPKOUTLN",
> + "SPK", "SPKOUTLP",
> + "SPK", "SPKOUTRN",
> + "SPK", "SPKOUTRP",
> +
> + "RCV", "HPOUT2N",
> + "RCV", "HPOUT2P",
> +
> + "HDMI", "LINEOUT1N",
> + "HDMI", "LINEOUT1P",
> +
> + "LINE", "LINEOUT2N",
> + "LINE", "LINEOUT2P",
> +
> + "IN1LP", "MICBIAS1",
> + "IN1LN", "MICBIAS1",
> + "Main Mic", "MICBIAS1",
> +
> + "IN1RP", "Sub Mic",
> + "IN1RN", "Sub Mic",
> +
> + "IN2LP:VXRN", "MICBIAS2",
> + "Headset Mic", "MICBIAS2",
> +
> + "IN2RN", "FM In",
> + "IN2RP:VXRP", "FM In";
> +};
> diff --git a/arch/arm/boot/dts/exynos4412-i9300.dts b/arch/arm/boot/dts/exynos4412-i9300.dts
> index f8125a9..3691802 100644
> --- a/arch/arm/boot/dts/exynos4412-i9300.dts
> +++ b/arch/arm/boot/dts/exynos4412-i9300.dts
> @@ -20,3 +20,7 @@
> reg = <0x40000000 0x40000000>;
> };
> };
> +
> +&sound {
> + fm-sel-gpios = <&gpl0 3 GPIO_ACTIVE_HIGH>;
> +};
> diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
> index 2c8111c..2752363 100644
> --- a/arch/arm/boot/dts/exynos4412-midas.dtsi
> +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
> @@ -102,6 +102,30 @@
> status = "disabled";
> };
>
> + vbatt_reg: voltage-regulator-9 {
Since this is the basic DTSI for multiple boards, the numbering here
should be consistent. You will have to rename the ones in Galaxy S3 and
N710 DTSI.
> + compatible = "regulator-fixed";
> + regulator-name = "VBATT";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + regulator-always-on;
> + };
> +
> + mic_bias_reg: voltage-regulator-10 {
> + compatible = "regulator-fixed";
> + regulator-name = "MICBIAS_LDO_2.8V";
> + regulator-min-microvolt = <2800000>;
> + regulator-max-microvolt = <2800000>;
> + gpio = <&gpf1 7 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + };
> +
> + submic_bias_reg: voltage-regulator-11 {
> + compatible = "regulator-fixed";
> + regulator-name = "SUB_MICBIAS_LDO_2.8V";
> + regulator-min-microvolt = <2800000>;
> + regulator-max-microvolt = <2800000>;
> + };
> +
> gpio-keys {
> compatible = "gpio-keys";
> pinctrl-names = "default";
> @@ -266,16 +290,18 @@
> clock-names = "ext_clock";
> };
>
> - sound {
> - compatible = "samsung,trats2-audio";
> - samsung,i2s-controller = <&i2s0>;
> - samsung,model = "Trats2";
> - samsung,audio-codec = <&wm1811>;
> - samsung,audio-routing =
> - "SPK", "SPKOUTLN",
> - "SPK", "SPKOUTLP",
> - "SPK", "SPKOUTRN",
> - "SPK", "SPKOUTRP";
> + sound: sound {
> + compatible = "samsung,midas-audio";
> + model = "Midas";
> + mic-bias-supply = <&mic_bias_reg>;
> + submic-bias-supply = <&submic_bias_reg>;
> +
> + cpu {
> + sound-dai = <&i2s0 0>;
Double space after '='.
Best regards,
Krzysztof
WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <krzk@kernel.org>
To: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: broonie@kernel.org, simon@lineageos.org,
alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
robh+dt@kernel.org, b.zolnierkie@samsung.com,
m.szyprowski@samsung.com, linux-samsung-soc@vger.kernel.org
Subject: Re: [PATCH 3/3] ARM: dts: exynos: Add sound support to Midas
Date: Mon, 20 Jul 2020 16:34:58 +0200 [thread overview]
Message-ID: <20200720143458.GB22554@kozik-lap> (raw)
In-Reply-To: <20200710173500.22365-3-s.nawrocki@samsung.com>
On Fri, Jul 10, 2020 at 07:35:00PM +0200, Sylwester Nawrocki wrote:
> From: Simon Shields <simon@lineageos.org>
>
> Update the never-mainlined "samsung,trats2-audio" binding and instead
> use the new "samsung,midas-audio" binding.
>
> Signed-off-by: Simon Shields <simon@lineageos.org>
> [s.nawrocki: fixed DAPM routing entries for MICBIAS1/2, adjusted to
> changes in the DT binding]
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> ---
> arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 38 ++++++++++++++
> arch/arm/boot/dts/exynos4412-i9300.dts | 4 ++
> arch/arm/boot/dts/exynos4412-midas.dtsi | 78 ++++++++++++++++++++++++-----
> arch/arm/boot/dts/exynos4412-n710x.dts | 35 +++++++++++++
> 4 files changed, 142 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
> index 53b3ca3..cff0980 100644
> --- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
> +++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
> @@ -175,3 +175,41 @@
> gpio = <&gpm0 0 GPIO_ACTIVE_HIGH>;
> status = "okay";
> };
> +
> +&submic_bias_reg {
Put them in alphabetical order against oder phandle overrides. Same for
n710x.dts.
> + gpio = <&gpf2 0 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> +};
> +
> +&sound {
> + samsung,audio-routing =
> + "HP", "HPOUT1L",
> + "HP", "HPOUT1R",
> +
> + "SPK", "SPKOUTLN",
> + "SPK", "SPKOUTLP",
> + "SPK", "SPKOUTRN",
> + "SPK", "SPKOUTRP",
> +
> + "RCV", "HPOUT2N",
> + "RCV", "HPOUT2P",
> +
> + "HDMI", "LINEOUT1N",
> + "HDMI", "LINEOUT1P",
> +
> + "LINE", "LINEOUT2N",
> + "LINE", "LINEOUT2P",
> +
> + "IN1LP", "MICBIAS1",
> + "IN1LN", "MICBIAS1",
> + "Main Mic", "MICBIAS1",
> +
> + "IN1RP", "Sub Mic",
> + "IN1RN", "Sub Mic",
> +
> + "IN2LP:VXRN", "MICBIAS2",
> + "Headset Mic", "MICBIAS2",
> +
> + "IN2RN", "FM In",
> + "IN2RP:VXRP", "FM In";
> +};
> diff --git a/arch/arm/boot/dts/exynos4412-i9300.dts b/arch/arm/boot/dts/exynos4412-i9300.dts
> index f8125a9..3691802 100644
> --- a/arch/arm/boot/dts/exynos4412-i9300.dts
> +++ b/arch/arm/boot/dts/exynos4412-i9300.dts
> @@ -20,3 +20,7 @@
> reg = <0x40000000 0x40000000>;
> };
> };
> +
> +&sound {
> + fm-sel-gpios = <&gpl0 3 GPIO_ACTIVE_HIGH>;
> +};
> diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
> index 2c8111c..2752363 100644
> --- a/arch/arm/boot/dts/exynos4412-midas.dtsi
> +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
> @@ -102,6 +102,30 @@
> status = "disabled";
> };
>
> + vbatt_reg: voltage-regulator-9 {
Since this is the basic DTSI for multiple boards, the numbering here
should be consistent. You will have to rename the ones in Galaxy S3 and
N710 DTSI.
> + compatible = "regulator-fixed";
> + regulator-name = "VBATT";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + regulator-always-on;
> + };
> +
> + mic_bias_reg: voltage-regulator-10 {
> + compatible = "regulator-fixed";
> + regulator-name = "MICBIAS_LDO_2.8V";
> + regulator-min-microvolt = <2800000>;
> + regulator-max-microvolt = <2800000>;
> + gpio = <&gpf1 7 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + };
> +
> + submic_bias_reg: voltage-regulator-11 {
> + compatible = "regulator-fixed";
> + regulator-name = "SUB_MICBIAS_LDO_2.8V";
> + regulator-min-microvolt = <2800000>;
> + regulator-max-microvolt = <2800000>;
> + };
> +
> gpio-keys {
> compatible = "gpio-keys";
> pinctrl-names = "default";
> @@ -266,16 +290,18 @@
> clock-names = "ext_clock";
> };
>
> - sound {
> - compatible = "samsung,trats2-audio";
> - samsung,i2s-controller = <&i2s0>;
> - samsung,model = "Trats2";
> - samsung,audio-codec = <&wm1811>;
> - samsung,audio-routing =
> - "SPK", "SPKOUTLN",
> - "SPK", "SPKOUTLP",
> - "SPK", "SPKOUTRN",
> - "SPK", "SPKOUTRP";
> + sound: sound {
> + compatible = "samsung,midas-audio";
> + model = "Midas";
> + mic-bias-supply = <&mic_bias_reg>;
> + submic-bias-supply = <&submic_bias_reg>;
> +
> + cpu {
> + sound-dai = <&i2s0 0>;
Double space after '='.
Best regards,
Krzysztof
next prev parent reply other threads:[~2020-07-20 14:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20200710173512eucas1p101c03994a728150f18428295192edf25@eucas1p1.samsung.com>
2020-07-10 17:34 ` [PATCH 1/3] ASoC: samsung: Document DT bindings for Midas sound subsystem Sylwester Nawrocki
2020-07-10 17:34 ` Sylwester Nawrocki
2020-07-10 17:34 ` [PATCH 2/3] ASoC: samsung: Add sound support for Midas boards Sylwester Nawrocki
2020-07-10 17:34 ` Sylwester Nawrocki
2020-07-20 14:30 ` Krzysztof Kozlowski
2020-07-20 14:30 ` Krzysztof Kozlowski
2020-07-10 17:35 ` [PATCH 3/3] ARM: dts: exynos: Add sound support to Midas Sylwester Nawrocki
2020-07-10 17:35 ` Sylwester Nawrocki
2020-07-20 14:34 ` Krzysztof Kozlowski [this message]
2020-07-20 14:34 ` Krzysztof Kozlowski
2020-07-27 16:32 ` Sylwester Nawrocki
2020-07-27 16:32 ` Sylwester Nawrocki
2020-07-13 14:59 ` [PATCH 1/3] ASoC: samsung: Document DT bindings for Midas sound subsystem Rob Herring
2020-07-13 14:59 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200720143458.GB22554@kozik-lap \
--to=krzk@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=b.zolnierkie@samsung.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=robh+dt@kernel.org \
--cc=s.nawrocki@samsung.com \
--cc=simon@lineageos.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.