From: Harald Geyer <harald@ccbib.org> To: Maxime Ripard <maxime.ripard@bootlin.com>, Chen-Yu Tsai <wens@csie.org>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com> Cc: devicetree@vger.kernel.org, info@olimex.com, Mark Brown <broonie@kernel.org>, Harald Geyer <harald@ccbib.org>, ibu@radempa.de, linux-arm-kernel@lists.infradead.org Subject: [PATCH RFC] arm64: dts: allwinner: a64: teres-i: Enable audio Date: Fri, 1 Feb 2019 11:37:43 +0000 [thread overview] Message-ID: <20190201113743.10058-1-harald@ccbib.org> (raw) The TERES-I has internal speakers (left, right), internal microphone and a headset combo jack (headphones + mic). The headphone lines are multiplexed with the debug console. The headphone and mic detect lines of the A64 are connected properly, but AFAIK currently unsupported by the driver. Signed-off-by: Harald Geyer <harald@ccbib.org> --- Hi all, a couple of issues make this patch RFC: hpvcc-supply vs. cpvdd-supply: On the A64 manual the pin is called CPVDD and the binding documents requires a cpvdd-supply property. However in the actual driver and devicetrees so far hpvcc-supply is used. This is a very new binding, so we have the luxury to decide either way, I think. Any input from the devicetree maintainers would be appreciated. debug console multiplexing: Olimex have a userspace script that controls gpio PL9 during boot, to select between HP and serial console. I guess this is not acceptable for mainline. The best solution I can see is to switch the HP jack from serial console to audio once the audio drivers load. With this people can still capture the bootlogs but everybody gets audio once the system is up and switching back to console output is as simple as unloading the audio drivers. However the current implementation with a pinctrl group doesn't work: The audio card device correctly claims the pin (ie I can't export the gpio in sysfs anymore), but the pinctrl driver doesn't set the pin to output. Testing: I don't have a headset with combo connector, so I could only test the headphones output, but not the headset mic. If somebody happens to have a TERES-I and a suitable headset, testing this would be nice. TIA, Harald .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts index f9eede0a8bd3..d57049fbdaca 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts @@ -70,6 +70,26 @@ compatible = "mmc-pwrseq-simple"; reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ }; + + speaker_amp: audio-amplifier { + compatible = "simple-audio-amplifier"; + enable-gpios = <&r_pio 0 12 GPIO_ACTIVE_HIGH>; /* PL12 */ + sound-name-prefix = "Speaker Amp"; + }; +}; + +&codec { + status = "okay"; +}; + +&codec_analog { + hpvcc-supply = <®_eldo1>; /* TODO: Use only one of these */ + cpvdd-supply = <®_eldo1>; + status = "okay"; +}; + +&dai { + status = "okay"; }; &ehci1 { @@ -131,6 +151,14 @@ status = "okay"; }; +&r_pio { + r_debug_select_pin: debug-select { + pins = "PL9"; + function = "gpio_out"; + output-high; + }; +}; + &r_rsb { status = "okay"; @@ -258,6 +286,31 @@ vcc-hdmi-supply = <®_dldo1>; }; +&sound { + pinctrl-names = "default"; + pinctrl-0 = <&r_debug_select_pin>; + simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>; + simple-audio-card,widgets = "Headphone", "Headphone Jack", + "Microphone", "Headset Microphone", + "Microphone", "Internal Microphone", + "Speaker", "Internal Speaker"; + simple-audio-card,routing = + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right", + "AIF1 Slot 0 Left ADC", "Left ADC", + "AIF1 Slot 0 Right ADC", "Right ADC", + "Headphone Jack", "HP", + "Speaker Amp INL", "LINEOUT", + "Speaker Amp INR", "LINEOUT", + "Internal Speaker", "Speaker Amp OUTL", + "Internal Speaker", "Speaker Amp OUTR", + "Internal Microphone", "MBIAS", + "MIC1", "Internal Microphone", + "Headset Microphone", "HBIAS", + "MIC2", "Headset Microphone"; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pb_pins>; -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Harald Geyer <harald@ccbib.org> To: Maxime Ripard <maxime.ripard@bootlin.com>, Chen-Yu Tsai <wens@csie.org>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com> Cc: devicetree@vger.kernel.org, info@olimex.com, Mark Brown <broonie@kernel.org>, Harald Geyer <harald@ccbib.org>, ibu@radempa.de, linux-arm-kernel@lists.infradead.org Subject: [PATCH RFC] arm64: dts: allwinner: a64: teres-i: Enable audio Date: Fri, 1 Feb 2019 11:37:43 +0000 [thread overview] Message-ID: <20190201113743.10058-1-harald@ccbib.org> (raw) The TERES-I has internal speakers (left, right), internal microphone and a headset combo jack (headphones + mic). The headphone lines are multiplexed with the debug console. The headphone and mic detect lines of the A64 are connected properly, but AFAIK currently unsupported by the driver. Signed-off-by: Harald Geyer <harald@ccbib.org> --- Hi all, a couple of issues make this patch RFC: hpvcc-supply vs. cpvdd-supply: On the A64 manual the pin is called CPVDD and the binding documents requires a cpvdd-supply property. However in the actual driver and devicetrees so far hpvcc-supply is used. This is a very new binding, so we have the luxury to decide either way, I think. Any input from the devicetree maintainers would be appreciated. debug console multiplexing: Olimex have a userspace script that controls gpio PL9 during boot, to select between HP and serial console. I guess this is not acceptable for mainline. The best solution I can see is to switch the HP jack from serial console to audio once the audio drivers load. With this people can still capture the bootlogs but everybody gets audio once the system is up and switching back to console output is as simple as unloading the audio drivers. However the current implementation with a pinctrl group doesn't work: The audio card device correctly claims the pin (ie I can't export the gpio in sysfs anymore), but the pinctrl driver doesn't set the pin to output. Testing: I don't have a headset with combo connector, so I could only test the headphones output, but not the headset mic. If somebody happens to have a TERES-I and a suitable headset, testing this would be nice. TIA, Harald .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts index f9eede0a8bd3..d57049fbdaca 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts @@ -70,6 +70,26 @@ compatible = "mmc-pwrseq-simple"; reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ }; + + speaker_amp: audio-amplifier { + compatible = "simple-audio-amplifier"; + enable-gpios = <&r_pio 0 12 GPIO_ACTIVE_HIGH>; /* PL12 */ + sound-name-prefix = "Speaker Amp"; + }; +}; + +&codec { + status = "okay"; +}; + +&codec_analog { + hpvcc-supply = <®_eldo1>; /* TODO: Use only one of these */ + cpvdd-supply = <®_eldo1>; + status = "okay"; +}; + +&dai { + status = "okay"; }; &ehci1 { @@ -131,6 +151,14 @@ status = "okay"; }; +&r_pio { + r_debug_select_pin: debug-select { + pins = "PL9"; + function = "gpio_out"; + output-high; + }; +}; + &r_rsb { status = "okay"; @@ -258,6 +286,31 @@ vcc-hdmi-supply = <®_dldo1>; }; +&sound { + pinctrl-names = "default"; + pinctrl-0 = <&r_debug_select_pin>; + simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>; + simple-audio-card,widgets = "Headphone", "Headphone Jack", + "Microphone", "Headset Microphone", + "Microphone", "Internal Microphone", + "Speaker", "Internal Speaker"; + simple-audio-card,routing = + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right", + "AIF1 Slot 0 Left ADC", "Left ADC", + "AIF1 Slot 0 Right ADC", "Right ADC", + "Headphone Jack", "HP", + "Speaker Amp INL", "LINEOUT", + "Speaker Amp INR", "LINEOUT", + "Internal Speaker", "Speaker Amp OUTL", + "Internal Speaker", "Speaker Amp OUTR", + "Internal Microphone", "MBIAS", + "MIC1", "Internal Microphone", + "Headset Microphone", "HBIAS", + "MIC2", "Headset Microphone"; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pb_pins>; -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2019-02-01 11:37 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-01 11:37 Harald Geyer [this message] 2019-02-01 11:37 ` [PATCH RFC] arm64: dts: allwinner: a64: teres-i: Enable audio Harald Geyer 2019-02-12 8:34 ` Chen-Yu Tsai 2019-02-12 8:34 ` Chen-Yu Tsai 2019-02-11 11:12 Torsten Duwe 2019-02-11 13:36 ` Harald Geyer 2019-02-11 13:36 ` Harald Geyer 2019-02-11 15:39 ` Maxime Ripard 2019-02-11 15:39 ` Maxime Ripard 2019-02-11 19:32 ` Harald Geyer 2019-02-11 19:32 ` Harald Geyer 2019-02-12 8:38 ` Maxime Ripard 2019-02-12 9:42 ` Harald Geyer 2019-02-12 9:42 ` Harald Geyer 2019-02-12 10:09 ` Maxime Ripard 2019-02-12 19:37 ` Harald Geyer 2019-02-12 19:37 ` Harald Geyer 2019-02-13 9:44 ` Maxime Ripard 2019-02-13 11:43 ` Harald Geyer 2019-02-13 15:53 ` Maxime Ripard 2019-02-14 0:12 ` Harald Geyer 2019-02-15 14:20 ` Torsten Duwe 2019-02-15 14:20 ` Torsten Duwe 2019-02-16 20:47 ` Harald Geyer 2019-02-16 20:47 ` Harald Geyer 2019-02-17 11:30 ` Torsten Duwe 2019-02-17 11:30 ` Torsten Duwe 2019-02-18 10:24 ` Maxime Ripard 2019-04-30 13:32 ` Torsten Duwe 2019-04-30 13:32 ` Torsten Duwe 2019-05-02 7:46 ` Maxime Ripard 2019-05-02 14:48 ` Harald Geyer 2019-05-02 14:48 ` Harald Geyer
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=20190201113743.10058-1-harald@ccbib.org \ --to=harald@ccbib.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=ibu@radempa.de \ --cc=info@olimex.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=mark.rutland@arm.com \ --cc=maxime.ripard@bootlin.com \ --cc=robh+dt@kernel.org \ --cc=wens@csie.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: linkBe 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.