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>

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index 504e1d99115e44f175ecbe78c64933c8cd27f5c5..3f39e020f74e62ede06732b5ac4046324f2adada 100644 (file)
--- 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>
 
 / {
@@ -1590,6 +1591,7 @@ tdmin_a: audio-controller@300 {
                                                     "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>,
@@ -1605,6 +1607,7 @@ tdmin_b: audio-controller@340 {
                                                     "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>,
@@ -1620,6 +1623,7 @@ tdmin_c: audio-controller@380 {
                                                     "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>,
@@ -1635,6 +1639,7 @@ tdmin_lb: audio-controller@3c0 {
                                                     "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>,
@@ -1674,6 +1679,7 @@ tdmout_a: audio-controller@500 {
                                        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>,
@@ -1688,6 +1694,7 @@ tdmout_b: audio-controller@540 {
                                        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>,
@@ -1702,6 +1709,7 @@ tdmout_c: audio-controller@580 {
                                        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>,