From: Randy Li <ayaka@soulik.info>
To: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk,
mark.rutland@arm.com, heiko@sntech.de,
alsa-devel@alsa-project.org, Randy Li <ayaka@soulik.info>
Subject: [PATCH] ARM: dts: rockchip: add analog audio support for firefly reload
Date: Tue, 16 Aug 2016 04:42:07 +0800 [thread overview]
Message-ID: <1471293727-26258-2-git-send-email-ayaka@soulik.info> (raw)
In-Reply-To: <1471293727-26258-1-git-send-email-ayaka@soulik.info>
The ES8323 found on firefly reload board is used to output
analog audio to headphone and capture the sound from micphone
on board and the one may attach to headphone. It would be also
used to capture the sound from HDMI IN.
Signed-off-by: Randy Li <ayaka@soulik.info>
---
arch/arm/boot/dts/rk3288-firefly-reload.dts | 36 +++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
index 0f5a7c1..ae46231 100644
--- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -200,8 +200,34 @@
sound {
compatible = "simple-audio-card";
- simple-audio-card,name = "SPDIF";
- simple-audio-card,dai-link@1 { /* S/PDIF - S/PDIF */
+ simple-audio-card,name = "rockchip-audio";
+ /*simple-audio-card,hp-det-gpio = <&gpio7 15 GPIO_ACTIVE_HIGH>;*/
+ simple-audio-card,widgets =
+ "Microphone", "Mic Jack",
+ "Headphone", "Headphone Jack";
+ simple-audio-card,routing =
+ "Headphone Jack", "LOUT2",
+ "Headphone Jack", "ROUT2",
+ "LINPUT2", "Mic Jack",
+ "LINPUT1", "Mic Jack",
+ "RINPUT1", "Mic Jack";
+
+ simple-audio-card,dai-link@0 {
+ format = "i2s";
+ bitclock-master = <&link0_codec>;
+ frame-master = <&link0_codec>;
+
+ cpu {
+ sound-dai = <&i2s>;
+ };
+
+ link0_codec: codec {
+ sound-dai = <&codec>;
+ system-clock-frequency = <11289600>;
+ };
+ };
+
+ simple-audio-card,dai-link@1 {
cpu { sound-dai = <&spdif>; };
codec { sound-dai = <&spdif_out>; };
};
@@ -236,14 +262,15 @@
AVDD-supply = <&vcca_33>;
PVDD-supply = <&vcca_33>;
HPVDD-supply = <&vcca_33>;
- clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
- clock-names = "i2s_hclk", "i2s_clk";
+ clocks = <&cru SCLK_I2S0_OUT>;
reg = <0x10>;
+ #sound-dai-cells = <0>;
};
};
&i2s {
status = "okay";
+ #sound-dai-cells = <0>;
};
&sdmmc {
@@ -256,7 +283,6 @@
pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>;
vmmc-supply = <&vcc_sd>;
- vqmmc-supply = <&vcc_sd>;
status = "okay";
};
--
2.7.4
next prev parent reply other threads:[~2016-08-15 20:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-15 20:42 [PATCH] Try to support analog audio codec at firefly reload Randy Li
2016-08-15 20:42 ` Randy Li [this message]
[not found] ` <1471293727-26258-1-git-send-email-ayaka-xPW3/0Ywev/iB9QmIjCX8w@public.gmane.org>
2016-08-19 14:16 ` Heiko Stuebner
2016-08-20 18:33 ` John Keeping
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=1471293727-26258-2-git-send-email-ayaka@soulik.info \
--to=ayaka@soulik.info \
--cc=alsa-devel@alsa-project.org \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).