audio: add spdif/HDMI mute ctrl [1/1]

PD#TV-3016

Problem:
HDMI SPDIF mute interface has no effect.

Solution:
Add these interfaces for auge platform.

Verify:
Tested locally.

Change-Id: I168c0940e0f2b3d94091d43c6b8190f6f833c0f1
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts
index 70f1447..459b5b2 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts
@@ -839,8 +839,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1062,6 +1064,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
index 88c7dfb..f4d2ed6 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
@@ -784,8 +784,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1007,6 +1009,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
index cc511d8..c3e241a 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
@@ -1130,8 +1130,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1380,6 +1382,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
index 568e8a3..924718a 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
@@ -974,8 +974,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1224,6 +1226,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts
index 2e64f70..296ee03 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts
@@ -927,8 +927,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1151,6 +1153,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts
index f91cb17..42fc9ad 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts
@@ -946,8 +946,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1170,6 +1172,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts
index 2479669..13014ff 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts
@@ -942,8 +942,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1166,6 +1168,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts
index 6ac5b11..05e912f 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts
@@ -901,8 +901,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1095,6 +1097,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
index f9f0c48..5b83889 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
@@ -892,8 +892,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1086,6 +1088,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
index 119fcf5..35edc07 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
@@ -888,8 +888,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1082,6 +1084,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts
index 666b218..5e92810 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts
@@ -928,8 +928,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1122,6 +1124,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
index cecdd6a..13f1fb5 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -941,8 +941,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1135,6 +1137,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
index de25c7b..44a8d10 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
@@ -937,8 +937,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1131,6 +1133,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts
index 8e4bc50..189d10f 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts
@@ -928,8 +928,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1122,6 +1124,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_drm_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_drm_buildroot.dts
index 5e882d1..730acc8 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_drm_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_drm_buildroot.dts
@@ -929,8 +929,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1123,6 +1125,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts b/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts
index 175375c..500df13 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts
@@ -884,8 +884,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1100,6 +1102,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts b/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts
index 1c1a867..d7a1c19 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts
@@ -845,8 +845,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1061,6 +1063,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
index ed6d2be..ec4dd31 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
@@ -979,8 +979,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1211,6 +1213,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
index 6706641..786992f 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
@@ -955,8 +955,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1187,6 +1189,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
index c30da64..489f833 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
@@ -919,8 +919,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1143,6 +1145,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
index f73033c..ef3bbda 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -895,8 +895,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1119,6 +1121,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
index 6d1a8a6..877053e 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
@@ -1036,8 +1036,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1268,6 +1270,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
index 25f73af..e1f7cb2 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
@@ -1014,8 +1014,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1246,6 +1248,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
index 71cff0c..5251f17 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
@@ -932,8 +932,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1156,6 +1158,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
index fd62cd9..a96636e 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
@@ -926,8 +926,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1150,6 +1152,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts
index 8f786b0..11fedba 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts
@@ -1006,8 +1006,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1238,6 +1240,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
index 55b05ea..1bd3074 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
@@ -1297,8 +1297,11 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
                interrupt-names = "irq_spdifin";
 
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
+
                pinctrl-0 = <&spdifout_a &spdifin_a>;
+               pinctrl-1 = <&spdifout_a_mute>;
 
                /*
                 * whether do asrc for pcm and resample a or b
@@ -1541,6 +1544,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIODV_4 */
+                       groups = "GPIODV_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* GPIOZ_7, GPIOZ_8, pdm_din2_z4 */
                        groups = "pdm_dclk_z",

diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
index 1e21585..aaa99b4 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts
@@ -1338,8 +1338,11 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
                interrupt-names = "irq_spdifin";
 
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout_a>;
+               pinctrl-1 = <&spdifout_a_mute>;
+
 
                /*
                 * whether do asrc for pcm and resample a or b
@@ -1535,6 +1538,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIODV_4 */
+                       groups = "GPIODV_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* GPIOZ_7, GPIOZ_8, pdm_din2_z4 */
                        groups = "pdm_dclk_z",

diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
index a64b99c..87511db 100644 (file)
--- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
+++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts
@@ -1399,8 +1399,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
                interrupt-names = "irq_spdifin";
 
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout_a>;
+               pinctrl-1 = <&spdifout_a_mute>;
 
                /*
                 * whether do asrc for pcm and resample a or b
@@ -1631,6 +1633,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIODV_4 */
+                       groups = "GPIODV_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* GPIOZ_7, GPIOZ_8, pdm_din2_z4 */
                        groups = "pdm_dclk_z",

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
index 72c19c9..28de453 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
@@ -839,8 +839,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1062,6 +1064,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
index 51b1043..03bc24d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
@@ -784,8 +784,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1007,6 +1009,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
index 1e326a7..a88b9c0 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
@@ -1128,8 +1128,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1378,6 +1380,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
index 2658a87..0078e3e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
@@ -968,8 +968,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1218,6 +1220,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts
index 104e12f..d046eda 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts
@@ -927,8 +927,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1151,6 +1153,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts
index 36f4f5a..faa053e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts
@@ -946,8 +946,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1170,6 +1172,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts
index 13be6d5..df05fc3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts
@@ -942,8 +942,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1166,6 +1168,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
index 46db6c7..640f504 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
@@ -901,8 +901,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1095,6 +1097,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
index 5c78cdc..825e1b4 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
@@ -892,8 +892,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1086,6 +1088,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
index 7b5cdfd..ccf2218 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
@@ -888,8 +888,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1082,6 +1084,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts
index 784446e..74df363 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts
@@ -928,8 +928,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1122,6 +1124,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
index deb592b..7ba8db6 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -941,8 +941,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1135,6 +1137,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
index bf9519e..a65d603 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
@@ -933,8 +933,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1127,6 +1129,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts
index 6d80428..33a9cd1 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts
@@ -928,8 +928,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1122,6 +1124,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_drm_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_drm_buildroot.dts
index 9e106b9..dd00ad3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_drm_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_drm_buildroot.dts
@@ -942,8 +942,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1136,6 +1138,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIOH_4 */
+                       groups = "GPIOH_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
index b274718..508ad2e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
@@ -884,8 +884,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1100,6 +1102,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
index c914dff..c2099c2 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
@@ -843,8 +843,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1059,6 +1061,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &audio_data {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
index 8ac0d2c..b871c46 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
@@ -979,8 +979,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1211,6 +1213,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
index ab33240..b8b0b53 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
@@ -955,8 +955,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1187,6 +1189,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
index 7e64162..8d737de 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
@@ -919,8 +919,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1143,6 +1145,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
index 035bbe2..5409ca4 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -895,8 +895,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1119,6 +1121,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
index b90f128..a190f16 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
@@ -1035,8 +1035,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1267,6 +1269,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
index 8c23660..5c494b6 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
@@ -1013,8 +1013,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1245,6 +1247,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
index 970f94a..5d3c49c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
@@ -932,8 +932,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1156,6 +1158,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
index 8a6d0f7..8f138fd 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
@@ -926,8 +926,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1150,6 +1152,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts
index 05c6f78..cea3959 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts
@@ -1029,8 +1029,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
 
                interrupt-names = "irq_spdifin";
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                                       "spdif_pins_mute";
                pinctrl-0 = <&spdifout &spdifin>;
+               pinctrl-1 = <&spdifout_a_mute>;
                status = "okay";
        };
        aml_spdif_b: spdif_b {
@@ -1261,6 +1263,13 @@
                        function = "spdif_out_ao";
                };
        };
+
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* gpiao_10 */
+                       groups = "GPIOAO_10";
+                       function = "gpio_periphs";
+               };
+       };
 };  /* end of pinctrl_aobus */
 
 &irblaster {

diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
index f7db8d3..c06f3a3 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts
@@ -1336,8 +1336,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
                interrupt-names = "irq_spdifin";
 
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout_a>;
+               pinctrl-1 = <&spdifout_a_mute>;
 
                /*
                 * whether do asrc for pcm and resample a or b
@@ -1533,6 +1535,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIODV_4 */
+                       groups = "GPIODV_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* GPIOZ_7, GPIOZ_8, pdm_din2_z4 */
                        groups = "pdm_dclk_z",

diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301.dts
index 1df3a45..6649d77 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301.dts
+++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301.dts
@@ -1393,8 +1393,10 @@
                                <GIC_SPI 151 IRQ_TYPE_EDGE_RISING>;
                interrupt-names = "irq_spdifin";
 
-               pinctrl-names = "spdif_pins";
+               pinctrl-names = "spdif_pins",
+                               "spdif_pins_mute";
                pinctrl-0 = <&spdifout_a>;
+               pinctrl-1 = <&spdifout_a_mute>;
 
                /*
                 * whether do asrc for pcm and resample a or b
@@ -1590,6 +1592,13 @@
                };
        };
 
+       spdifout_a_mute: spdifout_a_mute {
+               mux { /* GPIODV_4 */
+                       groups = "GPIODV_4";
+                       function = "gpio_periphs";
+               };
+       };
+
        pdmin: pdmin {
                mux { /* GPIOZ_7, GPIOZ_8, pdm_din2_z4 */
                        groups = "pdm_dclk_z",

diff --git a/include/linux/amlogic/media/sound/spdif_info.h b/include/linux/amlogic/media/sound/spdif_info.h
index e9fec17..36df67a 100644 (file)
--- a/include/linux/amlogic/media/sound/spdif_info.h
+++ b/include/linux/amlogic/media/sound/spdif_info.h
@@ -45,4 +45,10 @@ extern int spdif_format_get_enum(
 extern int spdif_format_set_enum(
        struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol);
+#ifdef CONFIG_AMLOGIC_HDMITX
+int aml_get_hdmi_out_audio(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol);
+int aml_set_hdmi_out_audio(struct snd_kcontrol *kcontrol,
+       struct snd_ctl_elem_value *ucontrol);
+#endif
 #endif

diff --git a/sound/soc/amlogic/auge/spdif.c b/sound/soc/amlogic/auge/spdif.c
index 3dd0d5f..8567d7e 100644 (file)
--- a/sound/soc/amlogic/auge/spdif.c
+++ b/sound/soc/amlogic/auge/spdif.c
@@ -76,6 +76,13 @@ struct spdif_chipinfo {
        bool same_src_spdif_reen;
 };
 
+enum SPDIF_SRC {
+       SPDIFIN_PAD = 0,
+       SPDIFOUT,
+       NOAP,
+       HDMIRX
+};
+
 struct aml_spdif {
        struct pinctrl *pin_ctl;
        struct aml_audio_controller *actrl;
@@ -127,6 +134,10 @@ struct aml_spdif {
        /* last value for pc, pd */
        int pc_last;
        int pd_last;
+
+       /* mixer control vals */
+       bool mute;
+       enum SPDIF_SRC spdifin_src;
 };
 
 static const struct snd_pcm_hardware aml_spdif_hardware = {
@@ -255,21 +266,44 @@ static int spdifin_audio_type_get_enum(
        return 0;
 }
 
-/* For fake */
-static bool is_mute;
-static int  spdifin_src;
 static int aml_audio_set_spdif_mute(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *ucontrol)
 {
-       is_mute =
-                       ucontrol->value.integer.value[0];
+       struct snd_soc_dai *dai = snd_kcontrol_chip(kcontrol);
+       struct aml_spdif *p_spdif = snd_soc_dai_get_drvdata(dai);
+       struct pinctrl_state *state = NULL;
+       bool mute = !!ucontrol->value.integer.value[0];
+
+       if (IS_ERR_OR_NULL(p_spdif->pin_ctl)) {
+               pr_err("%s(), no pinctrl", __func__);
+               return 0;
+       }
+       if (mute) {
+               state = pinctrl_lookup_state
+                       (p_spdif->pin_ctl, "spdif_pins_mute");
+
+               if (!IS_ERR_OR_NULL(state))
+                       pinctrl_select_state(p_spdif->pin_ctl, state);
+       } else {
+               state = pinctrl_lookup_state
+                       (p_spdif->pin_ctl, "spdif_pins");
+
+               if (!IS_ERR_OR_NULL(state))
+                       pinctrl_select_state(p_spdif->pin_ctl, state);
+       }
+
+       p_spdif->mute = mute;
+
        return 0;
 }
 
 static int aml_audio_get_spdif_mute(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *ucontrol)
 {
-       ucontrol->value.integer.value[0] = is_mute;
+       struct snd_soc_dai *dai = snd_kcontrol_chip(kcontrol);
+       struct aml_spdif *p_spdif = snd_soc_dai_get_drvdata(dai);
+
+       ucontrol->value.integer.value[0] = p_spdif->mute;
 
        return 0;
 }
@@ -285,7 +319,11 @@ int spdifin_source_get_enum(
        struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
-       ucontrol->value.enumerated.item[0] = spdifin_src;
+       struct snd_soc_dai *dai = snd_kcontrol_chip(kcontrol);
+       struct aml_spdif *p_spdif = snd_soc_dai_get_drvdata(dai);
+
+       ucontrol->value.enumerated.item[0] = p_spdif->spdifin_src;
+
        return 0;
 }
 
@@ -293,6 +331,8 @@ int spdifin_source_set_enum(
        struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
+       struct snd_soc_dai *dai = snd_kcontrol_chip(kcontrol);
+       struct aml_spdif *p_spdif = snd_soc_dai_get_drvdata(dai);
        int src = ucontrol->value.enumerated.item[0];
 
        if (src > 3) {
@@ -300,7 +340,8 @@ int spdifin_source_set_enum(
                return -1;
        }
        spdifin_set_src(src);
-       spdifin_src = src;
+       p_spdif->spdifin_src = src;
+
        return 0;
 }
 
@@ -327,7 +368,11 @@ static const struct snd_kcontrol_new snd_spdif_controls[] = {
                                spdifin_src_enum,
                                spdifin_source_get_enum,
                                spdifin_source_set_enum),
-
+#ifdef CONFIG_AMLOGIC_HDMITX
+       SOC_SINGLE_BOOL_EXT("Audio hdmi-out mute",
+                               0, aml_get_hdmi_out_audio,
+                               aml_set_hdmi_out_audio),
+#endif
 };
 
 static bool spdifin_check_audiotype_by_sw(struct aml_spdif *p_spdif)

diff --git a/sound/soc/amlogic/common/spdif_info.c b/sound/soc/amlogic/common/spdif_info.c
index 85bd5e2..87d8619 100644 (file)
--- a/sound/soc/amlogic/common/spdif_info.c
+++ b/sound/soc/amlogic/common/spdif_info.c
@@ -20,6 +20,9 @@
 
 #include <linux/amlogic/media/sound/aout_notify.h>
 #include <linux/amlogic/media/sound/spdif_info.h>
+#ifdef CONFIG_AMLOGIC_HDMITX
+#include <linux/amlogic/media/vout/hdmi_tx/hdmi_tx_ext.h>
+#endif
 
 /*
  * 0 --  other formats except(DD,DD+,DTS)
@@ -191,3 +194,29 @@ int spdif_format_set_enum(
        IEC958_mode_codec = index;
        return 0;
 }
+
+#ifdef CONFIG_AMLOGIC_HDMITX
+unsigned int aml_audio_hdmiout_mute_flag;
+/* call HDMITX API to enable/disable internal audio out */
+int aml_get_hdmi_out_audio(struct snd_kcontrol *kcontrol,
+                         struct snd_ctl_elem_value *ucontrol)
+{
+       ucontrol->value.integer.value[0] = !hdmitx_ext_get_audio_status();
+
+       aml_audio_hdmiout_mute_flag =
+                       ucontrol->value.integer.value[0];
+       return 0;
+}
+
+int aml_set_hdmi_out_audio(struct snd_kcontrol *kcontrol,
+                         struct snd_ctl_elem_value *ucontrol)
+{
+       bool mute = ucontrol->value.integer.value[0];
+
+       if (aml_audio_hdmiout_mute_flag != mute) {
+               hdmitx_ext_set_audio_output(!mute);
+               aml_audio_hdmiout_mute_flag = mute;
+       }
+       return 0;
+}
+#endif

diff --git a/sound/soc/amlogic/meson/spdif_codec.c b/sound/soc/amlogic/meson/spdif_codec.c
index 299c46c..fc48405 100644 (file)
--- a/sound/soc/amlogic/meson/spdif_codec.c
+++ b/sound/soc/amlogic/meson/spdif_codec.c
@@ -166,29 +166,6 @@ static int aml_audio_get_spdif_mute(struct snd_kcontrol *kcontrol,
 }
 
 #ifdef CONFIG_AMLOGIC_HDMITX
-/* call HDMITX API to enable/disable internal audio out */
-static int aml_get_hdmi_out_audio(struct snd_kcontrol *kcontrol,
-                         struct snd_ctl_elem_value *ucontrol)
-{
-       ucontrol->value.integer.value[0] = !hdmitx_ext_get_audio_status();
-
-       v_spdif_codec.aml_audio_hdmiout_mute_flag =
-                       ucontrol->value.integer.value[0];
-       return 0;
-}
-
-static int aml_set_hdmi_out_audio(struct snd_kcontrol *kcontrol,
-                         struct snd_ctl_elem_value *ucontrol)
-{
-       bool mute = ucontrol->value.integer.value[0];
-
-       if (v_spdif_codec.aml_audio_hdmiout_mute_flag != mute) {
-               hdmitx_ext_set_audio_output(!mute);
-               v_spdif_codec.aml_audio_hdmiout_mute_flag = mute;
-       }
-       return 0;
-}
-
 static const char * const hdmi_out_channel_mask_texts[] = {
                "SPDIF",
                "2CH_I2S_0/1",