From: Jerome Brunet <jbrunet@baylibre.com>
To: Christian Hewitt <christianshewitt@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Kevin Hilman <khilman@baylibre.com>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 09/12] arm64: dts: meson: add audio playback to rbox-pro
Date: Tue, 21 Jul 2020 10:21:27 +0200 [thread overview]
Message-ID: <1jv9ih8eig.fsf@starbuckisacylon.baylibre.com> (raw)
In-Reply-To: <20200718065739.7802-10-christianshewitt@gmail.com>
On Sat 18 Jul 2020 at 08:57, Christian Hewitt <christianshewitt@gmail.com> wrote:
> Add initial support limited to HDMI i2s and SPDIF (LPCM).
>
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> ---
> .../boot/dts/amlogic/meson-gxm-rbox-pro.dts | 80 +++++++++++++++++++
> 1 file changed, 80 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
> index c89c9f846fb1..7b23b3da27ff 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
> @@ -14,6 +14,7 @@
> /dts-v1/;
>
> #include "meson-gxm.dtsi"
> +#include <dt-bindings/sound/meson-aiu.h>
>
> / {
> compatible = "kingnovel,r-box-pro", "amlogic,s912", "amlogic,meson-gxm";
> @@ -33,6 +34,13 @@
> reg = <0x0 0x0 0x0 0x80000000>; /* 2 GiB or 3 GiB */
> };
>
> + spdif_dit: audio-codec-0 {
> + #sound-dai-cells = <0>;
> + compatible = "linux,spdif-dit";
> + status = "okay";
> + sound-name-prefix = "DIT";
> + };
> +
> leds {
> compatible = "gpio-leds";
>
> @@ -51,6 +59,25 @@
> };
> };
>
> + vddio_ao18: regulator-vddio_ao18 {
> + compatible = "regulator-fixed";
> + regulator-name = "VDDIO_AO18";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + };
> +
> + hdmi_5v: regulator-hdmi-5v {
> + compatible = "regulator-fixed";
> +
> + regulator-name = "HDMI_5V";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> +
> + gpio = <&gpio GPIOH_3 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + regulator-always-on;
> + };
Same comment here ...
> +
> vddio_boot: regulator-vddio-boot {
> compatible = "regulator-fixed";
> regulator-name = "VDDIO_BOOT";
> @@ -90,6 +117,59 @@
> clocks = <&wifi32k>;
> clock-names = "ext_clock";
> };
> +
> + sound {
> + compatible = "amlogic,gx-sound-card";
> + model = "GXM-RBOX-PRO";
> + assigned-clocks = <&clkc CLKID_MPLL0>,
> + <&clkc CLKID_MPLL1>,
> + <&clkc CLKID_MPLL2>;
> + assigned-clock-parents = <0>, <0>, <0>;
> + assigned-clock-rates = <294912000>,
> + <270950400>,
> + <393216000>;
> + status = "okay";
> +
> + dai-link-0 {
> + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
> + };
> +
> + dai-link-1 {
> + sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>;
> + };
> +
> + dai-link-2 {
> + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;
> + dai-format = "i2s";
> + mclk-fs = <256>;
> +
> + codec-0 {
> + sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
> + };
> + };
> +
> + dai-link-3 {
> + sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>;
> +
> + codec-0 {
> + sound-dai = <&spdif_dit>;
> + };
> + };
> +
> + dai-link-4 {
> + sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
> +
> + codec-0 {
> + sound-dai = <&hdmi_tx>;
> + };
> + };
> + };
> +};
> +
> +&aiu {
> + status = "okay";
> + pinctrl-0 = <&spdif_out_h_pins>;
> + pinctrl-names = "default";
> };
>
> ðmac {
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2020-07-21 8:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-18 6:57 [PATCH 00/12] arm64: dts: meson: add more GX soundcards Christian Hewitt
2020-07-18 6:57 ` [PATCH 01/12] arm64: dts: meson: add audio playback to a95x Christian Hewitt
2020-07-18 6:57 ` [PATCH 02/12] arm64: dts: meson: add audio playback to khadas-vim2 Christian Hewitt
2020-07-18 6:57 ` [PATCH 03/12] arm64: dts: meson: add audio playback to nanopi-k2 Christian Hewitt
2020-07-18 6:57 ` [PATCH 04/12] arm64: dts: meson: add audio playback to nexbox-a1 Christian Hewitt
2020-07-21 8:18 ` Jerome Brunet
2020-07-18 6:57 ` [PATCH 05/12] arm64: dts: meson: add audio playback to odroid-c2 Christian Hewitt
2020-07-18 6:57 ` [PATCH 06/12] arm64: dts: meson: add audio playback to p201 Christian Hewitt
2020-07-18 6:57 ` [PATCH 07/12] arm64: dts: meson: add audio playback to p200 Christian Hewitt
2020-07-18 6:57 ` [PATCH 08/12] arm64: dts: meson: add audio playback to p212-s905x dtsi Christian Hewitt
2020-07-18 6:57 ` [PATCH 09/12] arm64: dts: meson: add audio playback to rbox-pro Christian Hewitt
2020-07-21 8:21 ` Jerome Brunet [this message]
2020-07-18 6:57 ` [PATCH 10/12] arm64: dts: meson: add audio playback to vega-s95 dtsi Christian Hewitt
2020-07-18 6:57 ` [PATCH 11/12] arm64: dts: meson: add audio playback to wetek-hub Christian Hewitt
2020-07-18 6:57 ` [PATCH 12/12] arm64: dts: meson: add audio playback to wetek-play2 Christian Hewitt
2020-07-21 8:39 ` [PATCH 00/12] arm64: dts: meson: add more GX soundcards Jerome Brunet
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=1jv9ih8eig.fsf@starbuckisacylon.baylibre.com \
--to=jbrunet@baylibre.com \
--cc=christianshewitt@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.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 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).