From: Torsten Duwe <duwe@lst.de> To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Thierry Reding <thierry.reding@gmail.com>, Maxime Ripard <maxime.ripard@bootlin.com>, Chen-Yu Tsai <wens@csie.org>, Archit Taneja <architt@codeaurora.org>, Andrzej Hajda <a.hajda@samsung.com>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, Icenowy Zheng <icenowy@aosc.io>, Sean Paul <seanpaul@chromium.org>, Vasily Khoruzhick <anarsoul@gmail.com>, Harald Geyer <harald@ccbib.org> Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] arm64: DTS: allwinner: a64: Enable audio on Teres-I Date: Tue, 14 May 2019 18:02:36 +0200 (CEST) [thread overview] Message-ID: <20190514160236.7787D68C65@newverein.lst.de> (raw) In-Reply-To: 20190514155911.6C0AC68B05@newverein.lst.de From: Harald Geyer <harald@ccbib.org> 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> Signed-off-by: Torsten Duwe <duwe@suse.de> --- originally: patchwork.kernel.org/patch/10792589 Removed the questionable issues, leaving the unchallenged parts. --- .../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,25 @@ 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 { + cpvdd-supply = <®_eldo1>; + status = "okay"; +}; + +&dai { + status = "okay"; }; &ehci1 { @@ -258,6 +286,29 @@ vcc-hdmi-supply = <®_dldo1>; }; +&sound { + 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>;
WARNING: multiple messages have this Message-ID (diff)
From: Torsten Duwe <duwe@lst.de> To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Thierry Reding <thierry.reding@gmail.com>, Maxime Ripard <maxime.ripard@bootlin.com>, Chen-Yu Tsai <wens@csie.org>, Archit Taneja <architt@codeaurora.org>, Andrzej Hajda <a.hajda@samsung.com>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, Icenowy Zheng <icenowy@aosc.io>, Sean Paul <seanpaul@chromium.org>, Vasily Khoruzhick <anarsoul@gmail.com>, Harald Geyer <harald@ccbib.org> Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] arm64: DTS: allwinner: a64: Enable audio on Teres-I Date: Tue, 14 May 2019 18:02:36 +0200 (CEST) [thread overview] Message-ID: <20190514160236.7787D68C65@newverein.lst.de> (raw) In-Reply-To: 20190514155911.6C0AC68B05@newverein.lst.de From: Harald Geyer <harald@ccbib.org> 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> Signed-off-by: Torsten Duwe <duwe@suse.de> --- originally: patchwork.kernel.org/patch/10792589 Removed the questionable issues, leaving the unchallenged parts. --- .../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,25 @@ 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 { + cpvdd-supply = <®_eldo1>; + status = "okay"; +}; + +&dai { + status = "okay"; }; &ehci1 { @@ -258,6 +286,29 @@ vcc-hdmi-supply = <®_dldo1>; }; +&sound { + 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>; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-05-14 16:03 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-14 15:59 [PATCH 0/4] Add missing device nodes for Olimex Teres-I Torsten Duwe 2019-05-14 15:59 ` Torsten Duwe 2019-05-14 16:02 ` [PATCH 1/4] arm64: DTS: allwinner: a64: Add pinmux for RGB666 LCD Torsten Duwe 2019-05-14 16:02 ` Torsten Duwe 2019-05-14 16:02 ` Torsten Duwe 2019-05-16 8:54 ` Maxime Ripard 2019-05-16 8:54 ` Maxime Ripard 2019-05-14 16:02 ` [PATCH 2/4] dt-bindings: Add ANX6345 DP/eDP transmitter binding Torsten Duwe 2019-05-14 16:02 ` Torsten Duwe 2019-05-14 16:02 ` Torsten Duwe [this message] 2019-05-14 16:02 ` [PATCH 3/4] arm64: DTS: allwinner: a64: Enable audio on Teres-I Torsten Duwe 2019-05-14 16:02 ` [PATCH 4/4] arm64: DTS: allwinner: a64: enable ANX6345 bridge " Torsten Duwe 2019-05-14 16:02 ` Torsten Duwe 2019-05-14 17:48 ` Vasily Khoruzhick 2019-05-14 17:48 ` Vasily Khoruzhick 2019-05-14 17:48 ` Vasily Khoruzhick 2019-05-15 7:31 ` Torsten Duwe 2019-05-15 7:31 ` Torsten Duwe 2019-05-15 15:08 ` Vasily Khoruzhick 2019-05-15 15:08 ` Vasily Khoruzhick 2019-05-16 15:48 ` Torsten Duwe 2019-05-16 15:48 ` Torsten Duwe 2019-05-16 16:06 ` Vasily Khoruzhick 2019-05-16 16:06 ` Vasily Khoruzhick 2019-05-16 16:48 ` Torsten Duwe 2019-05-16 16:48 ` Torsten Duwe 2019-05-16 18:26 ` Vasily Khoruzhick 2019-05-16 18:26 ` Vasily Khoruzhick 2019-05-17 7:27 ` Maxime Ripard 2019-05-17 7:27 ` Maxime Ripard 2019-05-17 7:27 ` Maxime Ripard 2019-05-17 8:14 ` Torsten Duwe 2019-05-17 8:14 ` Torsten Duwe 2019-05-17 9:08 ` Maxime Ripard 2019-05-17 9:08 ` Maxime Ripard 2019-05-17 9:08 ` Maxime Ripard 2019-05-17 9:47 ` Torsten Duwe 2019-05-17 9:47 ` Torsten Duwe 2019-05-17 15:25 ` Vasily Khoruzhick 2019-05-17 15:25 ` Vasily Khoruzhick 2019-05-17 15:25 ` Vasily Khoruzhick
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=20190514160236.7787D68C65@newverein.lst.de \ --to=duwe@lst.de \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=a.hajda@samsung.com \ --cc=airlied@linux.ie \ --cc=anarsoul@gmail.com \ --cc=architt@codeaurora.org \ --cc=daniel@ffwll.ch \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=harald@ccbib.org \ --cc=icenowy@aosc.io \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=maxime.ripard@bootlin.com \ --cc=robh+dt@kernel.org \ --cc=seanpaul@chromium.org \ --cc=thierry.reding@gmail.com \ --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.