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 <narmstr...@baylibre.com>
Signed-off-by: Jerome Brunet <jbru...@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 
b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index edbc30572958..ee1b71284a83 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -11,6 +11,7 @@
 #include <dt-bindings/interrupt-controller/irq.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-g12a-audio-reset.h>
 #include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
 
 / {
@@ -1543,6 +1544,7 @@
                                                     "amlogic,axg-tdmin";
                                        reg = <0x0 0x300 0x0 0x40>;
                                        sound-name-prefix = "TDMIN_A";
+                                       resets = <&clkc_audio 
AUD_RESET_TDMIN_A>;
                                        clocks = <&clkc_audio 
AUD_CLKID_TDMIN_A>,
                                                 <&clkc_audio 
AUD_CLKID_TDMIN_A_SCLK>,
                                                 <&clkc_audio 
AUD_CLKID_TDMIN_A_SCLK_SEL>,
@@ -1558,6 +1560,7 @@
                                                     "amlogic,axg-tdmin";
                                        reg = <0x0 0x340 0x0 0x40>;
                                        sound-name-prefix = "TDMIN_B";
+                                       resets = <&clkc_audio 
AUD_RESET_TDMIN_B>;
                                        clocks = <&clkc_audio 
AUD_CLKID_TDMIN_B>,
                                                 <&clkc_audio 
AUD_CLKID_TDMIN_B_SCLK>,
                                                 <&clkc_audio 
AUD_CLKID_TDMIN_B_SCLK_SEL>,
@@ -1573,6 +1576,7 @@
                                                     "amlogic,axg-tdmin";
                                        reg = <0x0 0x380 0x0 0x40>;
                                        sound-name-prefix = "TDMIN_C";
+                                       resets = <&clkc_audio 
AUD_RESET_TDMIN_C>;
                                        clocks = <&clkc_audio 
AUD_CLKID_TDMIN_C>,
                                                 <&clkc_audio 
AUD_CLKID_TDMIN_C_SCLK>,
                                                 <&clkc_audio 
AUD_CLKID_TDMIN_C_SCLK_SEL>,
@@ -1588,6 +1592,7 @@
                                                     "amlogic,axg-tdmin";
                                        reg = <0x0 0x3c0 0x0 0x40>;
                                        sound-name-prefix = "TDMIN_LB";
+                                       resets = <&clkc_audio 
AUD_RESET_TDMIN_LB>;
                                        clocks = <&clkc_audio 
AUD_CLKID_TDMIN_LB>,
                                                 <&clkc_audio 
AUD_CLKID_TDMIN_LB_SCLK>,
                                                 <&clkc_audio 
AUD_CLKID_TDMIN_LB_SCLK_SEL>,
@@ -1627,6 +1632,7 @@
                                        compatible = "amlogic,g12a-tdmout";
                                        reg = <0x0 0x500 0x0 0x40>;
                                        sound-name-prefix = "TDMOUT_A";
+                                       resets = <&clkc_audio 
AUD_RESET_TDMOUT_A>;
                                        clocks = <&clkc_audio 
AUD_CLKID_TDMOUT_A>,
                                                 <&clkc_audio 
AUD_CLKID_TDMOUT_A_SCLK>,
                                                 <&clkc_audio 
AUD_CLKID_TDMOUT_A_SCLK_SEL>,
@@ -1641,6 +1647,7 @@
                                        compatible = "amlogic,g12a-tdmout";
                                        reg = <0x0 0x540 0x0 0x40>;
                                        sound-name-prefix = "TDMOUT_B";
+                                       resets = <&clkc_audio 
AUD_RESET_TDMOUT_B>;
                                        clocks = <&clkc_audio 
AUD_CLKID_TDMOUT_B>,
                                                 <&clkc_audio 
AUD_CLKID_TDMOUT_B_SCLK>,
                                                 <&clkc_audio 
AUD_CLKID_TDMOUT_B_SCLK_SEL>,
@@ -1655,6 +1662,7 @@
                                        compatible = "amlogic,g12a-tdmout";
                                        reg = <0x0 0x580 0x0 0x40>;
                                        sound-name-prefix = "TDMOUT_C";
+                                       resets = <&clkc_audio 
AUD_RESET_TDMOUT_C>;
                                        clocks = <&clkc_audio 
AUD_CLKID_TDMOUT_C>,
                                                 <&clkc_audio 
AUD_CLKID_TDMOUT_C_SCLK>,
                                                 <&clkc_audio 
AUD_CLKID_TDMOUT_C_SCLK_SEL>,
-- 
2.21.0

Reply via email to