Skip to content

Commit f403cbf

Browse files
jbrun3tkhilman
authored andcommitted
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 <[email protected]> Signed-off-by: Jerome Brunet <[email protected]> Signed-off-by: Kevin Hilman <[email protected]>
1 parent 8502fd5 commit f403cbf

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <dt-bindings/interrupt-controller/irq.h>
1212
#include <dt-bindings/interrupt-controller/arm-gic.h>
1313
#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
14+
#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
1415
#include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
1516

1617
/ {
@@ -1590,6 +1591,7 @@
15901591
"amlogic,axg-tdmin";
15911592
reg = <0x0 0x300 0x0 0x40>;
15921593
sound-name-prefix = "TDMIN_A";
1594+
resets = <&clkc_audio AUD_RESET_TDMIN_A>;
15931595
clocks = <&clkc_audio AUD_CLKID_TDMIN_A>,
15941596
<&clkc_audio AUD_CLKID_TDMIN_A_SCLK>,
15951597
<&clkc_audio AUD_CLKID_TDMIN_A_SCLK_SEL>,
@@ -1605,6 +1607,7 @@
16051607
"amlogic,axg-tdmin";
16061608
reg = <0x0 0x340 0x0 0x40>;
16071609
sound-name-prefix = "TDMIN_B";
1610+
resets = <&clkc_audio AUD_RESET_TDMIN_B>;
16081611
clocks = <&clkc_audio AUD_CLKID_TDMIN_B>,
16091612
<&clkc_audio AUD_CLKID_TDMIN_B_SCLK>,
16101613
<&clkc_audio AUD_CLKID_TDMIN_B_SCLK_SEL>,
@@ -1620,6 +1623,7 @@
16201623
"amlogic,axg-tdmin";
16211624
reg = <0x0 0x380 0x0 0x40>;
16221625
sound-name-prefix = "TDMIN_C";
1626+
resets = <&clkc_audio AUD_RESET_TDMIN_C>;
16231627
clocks = <&clkc_audio AUD_CLKID_TDMIN_C>,
16241628
<&clkc_audio AUD_CLKID_TDMIN_C_SCLK>,
16251629
<&clkc_audio AUD_CLKID_TDMIN_C_SCLK_SEL>,
@@ -1635,6 +1639,7 @@
16351639
"amlogic,axg-tdmin";
16361640
reg = <0x0 0x3c0 0x0 0x40>;
16371641
sound-name-prefix = "TDMIN_LB";
1642+
resets = <&clkc_audio AUD_RESET_TDMIN_LB>;
16381643
clocks = <&clkc_audio AUD_CLKID_TDMIN_LB>,
16391644
<&clkc_audio AUD_CLKID_TDMIN_LB_SCLK>,
16401645
<&clkc_audio AUD_CLKID_TDMIN_LB_SCLK_SEL>,
@@ -1674,6 +1679,7 @@
16741679
compatible = "amlogic,g12a-tdmout";
16751680
reg = <0x0 0x500 0x0 0x40>;
16761681
sound-name-prefix = "TDMOUT_A";
1682+
resets = <&clkc_audio AUD_RESET_TDMOUT_A>;
16771683
clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>,
16781684
<&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>,
16791685
<&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>,
@@ -1688,6 +1694,7 @@
16881694
compatible = "amlogic,g12a-tdmout";
16891695
reg = <0x0 0x540 0x0 0x40>;
16901696
sound-name-prefix = "TDMOUT_B";
1697+
resets = <&clkc_audio AUD_RESET_TDMOUT_B>;
16911698
clocks = <&clkc_audio AUD_CLKID_TDMOUT_B>,
16921699
<&clkc_audio AUD_CLKID_TDMOUT_B_SCLK>,
16931700
<&clkc_audio AUD_CLKID_TDMOUT_B_SCLK_SEL>,
@@ -1702,6 +1709,7 @@
17021709
compatible = "amlogic,g12a-tdmout";
17031710
reg = <0x0 0x580 0x0 0x40>;
17041711
sound-name-prefix = "TDMOUT_C";
1712+
resets = <&clkc_audio AUD_RESET_TDMOUT_C>;
17051713
clocks = <&clkc_audio AUD_CLKID_TDMOUT_C>,
17061714
<&clkc_audio AUD_CLKID_TDMOUT_C_SCLK>,
17071715
<&clkc_audio AUD_CLKID_TDMOUT_C_SCLK_SEL>,

0 commit comments

Comments
 (0)