arm64: dts: meson: add more GX soundcards
Subsystems (2)
v3 cover arm64: dts: meson: add more GX soundcards
This series adds basic support for LPCM audio over HDMI and S/PDIF to GXBB/GXL/GXM devices that I own and have tested with. Audio can be extended in the future (some devices have DACs and headphone hardware to connect) but this gets the basics working.
Changes from v2
- Drop p200/p201/p212-s905x/vega-s95 changes
- Add khadas-vim(1)
Changes from v1
- Drop nexbox-a1 and rbox-pro
Christian Hewitt (7):
arm64: dts: meson: add audio playback to a95x
arm64: dts: meson: add audio playback to khadas-vim
arm64: dts: meson: add audio playback to khadas-vim2
arm64: dts: meson: add audio playback to nanopi-k2
arm64: dts: meson: add audio playback to odroid-c2
arm64: dts: meson: add audio playback to wetek-hub
arm64: dts: meson: add audio playback to wetek-play2
.../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 40 ++++++++++++ .../dts/amlogic/meson-gxbb-nexbox-a95x.dts | 40 ++++++++++++ .../boot/dts/amlogic/meson-gxbb-odroidc2.dts | 40 ++++++++++++ .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 40 ++++++++++++ .../dts/amlogic/meson-gxbb-wetek-play2.dts | 61 +++++++++++++++++++ .../amlogic/meson-gxl-s905x-khadas-vim.dts | 43 ++++++++++++- .../dts/amlogic/meson-gxm-khadas-vim2.dts | 44 ++++++++++++- 7 files changed, 303 insertions(+), 5 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
PATCH v3 1/7 arm64: dts: meson: add audio playback to a95x
Add initial audio support limited to HDMI i2s.
--- .../dts/amlogic/meson-gxbb-nexbox-a95x.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +40 -0
@@ -10,6 +10,7 @@ #include "meson-gxbb.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/sound/meson-aiu.h> / { compatible = "nexbox,a95x", "amlogic,meson-gxbb";
@@ -139,6 +140,45 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-NEXBOX-A95X"; + 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_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cvbs_vdac_port {
Signature · 1 line
2.17.1
PATCH v3 2/7 arm64: dts: meson: add audio playback to khadas-vim
In reply to Christian HewittAdd initial audio support limited to HDMI i2s.
--- .../amlogic/meson-gxl-s905x-khadas-vim.dts | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +41 -2
@@ -5,9 +5,9 @@ /dts-v1/; -#include <dt-bindings/input/input.h> - #include "meson-gxl-s905x-p212.dtsi" +#include <dt-bindings/input/input.h> +#include <dt-bindings/sound/meson-aiu.h> / { compatible = "khadas,vim", "amlogic,s905x", "amlogic,meson-gxl";
@@ -63,6 +63,45 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXL-KHADAS-VIM1"; + 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_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cec_AO {
Signature · 1 line
2.17.1
PATCH v3 3/7 arm64: dts: meson: add audio playback to khadas-vim2
In reply to Christian HewittAdd initial audio support limited to HDMI i2s.
--- .../dts/amlogic/meson-gxm-khadas-vim2.dts | 44 +++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +41 -3
@@ -7,9 +7,9 @@ /dts-v1/; -#include <dt-bindings/input/input.h> - #include "meson-gxm.dtsi" +#include <dt-bindings/input/input.h> +#include <dt-bindings/sound/meson-aiu.h> / { compatible = "khadas,vim2", "amlogic,s912", "amlogic,meson-gxm";
@@ -145,6 +145,45 @@ clock-frequency = <32768>; pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXM-KHADAS-VIM2"; + 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_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cec_AO {
@@ -154,7 +193,6 @@ hdmi-phandle = <&hdmi_tx>; }; - &cpu_cooling_maps { map0 { cooling-device = <&gpio_fan THERMAL_NO_LIMIT 1>;
Signature · 1 line
2.17.1
Jerome Brunet
reviewerRe: [PATCH v3 3/7] arm64: dts: meson: add audio playback to khadas-vim2
Quoted 12 lines · Christian Hewitt
Add initial audio support limited to HDMI i2s.
Signed-off-by Christian Hewitt <[email protected]>--- .../dts/amlogic/meson-gxm-khadas-vim2.dts | 44 +++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-)arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +0
-0
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts line 12
Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +2
-2@@ -7,9 +7,9 @@ /dts-v1/; -#include <dt-bindings/input/input.h> - #include "meson-gxm.dtsi" +#include <dt-bindings/input/input.h> +#include <dt-bindings/sound/meson-aiu.h>
It's ok to do clean up or refactoring but it should not be done silently or mixed with something unrelated
Same in the previous patch
Quoted 50 lines
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +39
-0/ { compatible = "khadas,vim2", "amlogic,s912", "amlogic,meson-gxm";@@ -145,6 +145,45 @@ clock-frequency = <32768>; pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXM-KHADAS-VIM2"; + 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_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cec_AO {
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts line 157
Quoted 4 lines
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +0
-1@@ -154,7 +193,6 @@ hdmi-phandle = <&hdmi_tx>; }; -
Same here
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts line 198
Quoted 3 lines
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +0
-0&cpu_cooling_maps { map0 { cooling-device = <&gpio_fan THERMAL_NO_LIMIT 1>;
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
PATCH v3 4/7 arm64: dts: meson: add audio playback to nanopi-k2
In reply to Christian HewittAdd initial audio support limited to HDMI i2s.
--- .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +40 -0
@@ -7,6 +7,7 @@ #include "meson-gxbb.dtsi" #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/sound/meson-aiu.h> / { compatible = "friendlyarm,nanopi-k2", "amlogic,meson-gxbb";
@@ -130,6 +131,45 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-NANOPI-K2"; + 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_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cec_AO {
Signature · 1 line
2.17.1
PATCH v3 5/7 arm64: dts: meson: add audio playback to odroid-c2
In reply to Christian HewittAdd initial audio support limited to HDMI i2s.
--- .../boot/dts/amlogic/meson-gxbb-odroidc2.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +40 -0
@@ -9,6 +9,7 @@ #include "meson-gxbb.dtsi" #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/sound/meson-aiu.h> / { compatible = "hardkernel,odroid-c2", "amlogic,meson-gxbb";
@@ -172,6 +173,45 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-ODROID-C2"; + 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_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cec_AO {
Signature · 1 line
2.17.1
PATCH v3 6/7 arm64: dts: meson: add audio playback to wetek-hub
In reply to Christian HewittAdd initial audio support limited to HDMI i2s.
--- .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts +40 -0
@@ -7,10 +7,50 @@ /dts-v1/; #include "meson-gxbb-wetek.dtsi" +#include <dt-bindings/sound/meson-aiu.h> / { compatible = "wetek,hub", "amlogic,meson-gxbb"; model = "WeTek Hub"; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-WETEK-HUB"; + 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_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &ir {
Signature · 1 line
2.17.1
PATCH v3 7/7 arm64: dts: meson: add audio playback to wetek-play2
In reply to Christian HewittAdd initial support limited to HDMI i2s and SPDIF (LPCM).
--- .../dts/amlogic/meson-gxbb-wetek-play2.dts | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts +61 -0
@@ -8,11 +8,19 @@ #include "meson-gxbb-wetek.dtsi" #include <dt-bindings/input/input.h> +#include <dt-bindings/sound/meson-aiu.h> / { compatible = "wetek,play2", "amlogic,meson-gxbb"; model = "WeTek Play 2"; + spdif_dit: audio-codec-0 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + sound-name-prefix = "DIT"; + }; + leds { led-wifi { label = "wetek-play:wifi-status";
@@ -39,6 +47,59 @@ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-WETEK-PLAY2"; + 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_y_pins>; + pinctrl-names = "default"; }; &i2c_A {
Signature · 1 line
2.17.1
Quoted 21 lines · Christian Hewitt
This series adds basic support for LPCM audio over HDMI and S/PDIF to GXBB/GXL/GXM devices that I own and have tested with. Audio can be extended in the future (some devices have DACs and headphone hardware to connect) but this gets the basics working.
Changes from v2
- Drop p200/p201/p212-s905x/vega-s95 changes
- Add khadas-vim(1)Changes from v1
- Drop nexbox-a1 and rbox-proChristian Hewitt (7):
arm64: dts: meson: add audio playback to a95x
arm64: dts: meson: add audio playback to khadas-vim
arm64: dts: meson: add audio playback to khadas-vim2
arm64: dts: meson: add audio playback to nanopi-k2
arm64: dts: meson: add audio playback to odroid-c2
arm64: dts: meson: add audio playback to wetek-hub
arm64: dts: meson: add audio playback to wetek-play2
Quoted 8 lines
.../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 40 ++++++++++++ .../dts/amlogic/meson-gxbb-nexbox-a95x.dts | 40 ++++++++++++ .../boot/dts/amlogic/meson-gxbb-odroidc2.dts | 40 ++++++++++++ .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 40 ++++++++++++ .../dts/amlogic/meson-gxbb-wetek-play2.dts | 61 +++++++++++++++++++ .../amlogic/meson-gxl-s905x-khadas-vim.dts | 43 ++++++++++++- .../dts/amlogic/meson-gxm-khadas-vim2.dts | 44 ++++++++++++- 7 files changed, 303 insertions(+), 5 deletions(-)
Minor comment on patch 3
Minus that:
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic