UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64: dts: meson: g12a: add reset to tdm formatters 

Add the reset to the TDM formatters of the g12a. This helps
with channel mapping when a playback/capture uses more than 1 lane.

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
This commit is contained in:
Jerome Brunet 2019-08-23 17:44:32 +02:00 committed by Kevin Hilman
parent 8502fd5221
commit f403cbff74
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
View File

@ -11,6 +11,7 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h> #include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
#include <dt-bindings/reset/amlogic,meson-g12a-reset.h> #include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
/ { / {
@ -1590,6 +1591,7 @@
"amlogic,axg-tdmin"; "amlogic,axg-tdmin";
reg = <0x0 0x300 0x0 0x40>; reg = <0x0 0x300 0x0 0x40>;
sound-name-prefix = "TDMIN_A"; sound-name-prefix = "TDMIN_A";
resets = <&clkc_audio AUD_RESET_TDMIN_A>;
clocks = <&clkc_audio AUD_CLKID_TDMIN_A>, clocks = <&clkc_audio AUD_CLKID_TDMIN_A>,
<&clkc_audio AUD_CLKID_TDMIN_A_SCLK>, <&clkc_audio AUD_CLKID_TDMIN_A_SCLK>,
<&clkc_audio AUD_CLKID_TDMIN_A_SCLK_SEL>, <&clkc_audio AUD_CLKID_TDMIN_A_SCLK_SEL>,
@ -1605,6 +1607,7 @@
"amlogic,axg-tdmin"; "amlogic,axg-tdmin";
reg = <0x0 0x340 0x0 0x40>; reg = <0x0 0x340 0x0 0x40>;
sound-name-prefix = "TDMIN_B"; sound-name-prefix = "TDMIN_B";
resets = <&clkc_audio AUD_RESET_TDMIN_B>;
clocks = <&clkc_audio AUD_CLKID_TDMIN_B>, clocks = <&clkc_audio AUD_CLKID_TDMIN_B>,
<&clkc_audio AUD_CLKID_TDMIN_B_SCLK>, <&clkc_audio AUD_CLKID_TDMIN_B_SCLK>,
<&clkc_audio AUD_CLKID_TDMIN_B_SCLK_SEL>, <&clkc_audio AUD_CLKID_TDMIN_B_SCLK_SEL>,
@ -1620,6 +1623,7 @@
"amlogic,axg-tdmin"; "amlogic,axg-tdmin";
reg = <0x0 0x380 0x0 0x40>; reg = <0x0 0x380 0x0 0x40>;
sound-name-prefix = "TDMIN_C"; sound-name-prefix = "TDMIN_C";
resets = <&clkc_audio AUD_RESET_TDMIN_C>;
clocks = <&clkc_audio AUD_CLKID_TDMIN_C>, clocks = <&clkc_audio AUD_CLKID_TDMIN_C>,
<&clkc_audio AUD_CLKID_TDMIN_C_SCLK>, <&clkc_audio AUD_CLKID_TDMIN_C_SCLK>,
<&clkc_audio AUD_CLKID_TDMIN_C_SCLK_SEL>, <&clkc_audio AUD_CLKID_TDMIN_C_SCLK_SEL>,
@ -1635,6 +1639,7 @@
"amlogic,axg-tdmin"; "amlogic,axg-tdmin";
reg = <0x0 0x3c0 0x0 0x40>; reg = <0x0 0x3c0 0x0 0x40>;
sound-name-prefix = "TDMIN_LB"; sound-name-prefix = "TDMIN_LB";
resets = <&clkc_audio AUD_RESET_TDMIN_LB>;
clocks = <&clkc_audio AUD_CLKID_TDMIN_LB>, clocks = <&clkc_audio AUD_CLKID_TDMIN_LB>,
<&clkc_audio AUD_CLKID_TDMIN_LB_SCLK>, <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK>,
<&clkc_audio AUD_CLKID_TDMIN_LB_SCLK_SEL>, <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK_SEL>,
@ -1674,6 +1679,7 @@
compatible = "amlogic,g12a-tdmout"; compatible = "amlogic,g12a-tdmout";
reg = <0x0 0x500 0x0 0x40>; reg = <0x0 0x500 0x0 0x40>;
sound-name-prefix = "TDMOUT_A"; sound-name-prefix = "TDMOUT_A";
resets = <&clkc_audio AUD_RESET_TDMOUT_A>;
clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>, clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>,
<&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>, <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>,
<&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>, <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>,
@ -1688,6 +1694,7 @@
compatible = "amlogic,g12a-tdmout"; compatible = "amlogic,g12a-tdmout";
reg = <0x0 0x540 0x0 0x40>; reg = <0x0 0x540 0x0 0x40>;
sound-name-prefix = "TDMOUT_B"; sound-name-prefix = "TDMOUT_B";
resets = <&clkc_audio AUD_RESET_TDMOUT_B>;
clocks = <&clkc_audio AUD_CLKID_TDMOUT_B>, clocks = <&clkc_audio AUD_CLKID_TDMOUT_B>,
<&clkc_audio AUD_CLKID_TDMOUT_B_SCLK>, <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK>,
<&clkc_audio AUD_CLKID_TDMOUT_B_SCLK_SEL>, <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK_SEL>,
@ -1702,6 +1709,7 @@
compatible = "amlogic,g12a-tdmout"; compatible = "amlogic,g12a-tdmout";
reg = <0x0 0x580 0x0 0x40>; reg = <0x0 0x580 0x0 0x40>;
sound-name-prefix = "TDMOUT_C"; sound-name-prefix = "TDMOUT_C";
resets = <&clkc_audio AUD_RESET_TDMOUT_C>;
clocks = <&clkc_audio AUD_CLKID_TDMOUT_C>, clocks = <&clkc_audio AUD_CLKID_TDMOUT_C>,
<&clkc_audio AUD_CLKID_TDMOUT_C_SCLK>, <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK>,
<&clkc_audio AUD_CLKID_TDMOUT_C_SCLK_SEL>, <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK_SEL>,