Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 909d74e3 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: arizona: Add channel numbers to AIFs 



Set the channel number on each AIF widget to allow unused channels not
to be powered up across AIFs.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2264cf2e

sound/soc/codecs/cs47l24.c

+26 −26
Original line number Diff line number Diff line
@@ -500,72 +500,72 @@ SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, 


SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 6,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 7,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 6,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 7,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 2,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 3,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 4,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 5,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX6_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 2,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 3,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 4,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 5,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX6_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0,

		     ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 1,

		     ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX2_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0,

		    ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 1,

		    ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0),



SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

sound/soc/codecs/wm5102.c

+32 −32
Original line number Diff line number Diff line
@@ -1214,105 +1214,105 @@ SND_SOC_DAPM_PGA("ISRC2DEC2", ARIZONA_ISRC_2_CTRL_3, 


SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 6,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 7,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 6,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 7,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0,

		     ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 1,

		     ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX2_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0,

		    ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 1,

		    ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 1,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 2,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 3,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 4,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 5,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 6,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 7,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 1,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 2,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 3,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 4,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 5,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 6,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 7,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX8_ENA_SHIFT, 0),

sound/soc/codecs/wm5110.c

+40 −40
Original line number Diff line number Diff line
@@ -1348,122 +1348,122 @@ SND_SOC_DAPM_MUX("SPKDAT2R ANC Source", SND_SOC_NOPM, 0, 0, 


SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 6,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 7,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 6,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 7,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX3", NULL, 2,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX4", NULL, 3,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX5", NULL, 4,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX6", NULL, 5,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX6_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX3", NULL, 2,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX4", NULL, 3,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX5", NULL, 4,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX6", NULL, 5,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX6_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 1,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 2,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 3,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 4,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 5,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 6,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 7,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 1,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 2,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 3,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 4,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 5,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 6,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 7,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_OUT("AIF3TX1", NULL, 0,

		     ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF3TX2", NULL, 1,

		     ARIZONA_AIF3_TX_ENABLES, ARIZONA_AIF3TX2_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("AIF3RX1", NULL, 0,

		    ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 1,

		    ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0),



SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

sound/soc/codecs/wm8997.c

+30 −30
Original line number Diff line number Diff line
@@ -516,95 +516,95 @@ SND_SOC_DAPM_PGA("ISRC2DEC2", ARIZONA_ISRC_2_CTRL_3, 


SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 1,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX3", NULL, 2,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX4", NULL, 3,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX5", NULL, 4,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX6", NULL, 5,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX7", NULL, 6,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF1TX8", NULL, 7,

		     ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("AIF1RX1", NULL, 0,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX2", NULL, 1,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX3", NULL, 2,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX4", NULL, 3,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX5", NULL, 4,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX6", NULL, 5,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX7", NULL, 6,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF1RX8", NULL, 7,

		    ARIZONA_AIF1_RX_ENABLES, ARIZONA_AIF1RX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_OUT("AIF2TX1", NULL, 0,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("AIF2TX2", NULL, 1,

		     ARIZONA_AIF2_TX_ENABLES, ARIZONA_AIF2TX2_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("AIF2RX1", NULL, 0,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("AIF2RX2", NULL, 1,

		    ARIZONA_AIF2_RX_ENABLES, ARIZONA_AIF2RX2_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_OUT("SLIMTX1", NULL, 0,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX2", NULL, 1,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX3", NULL, 2,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX4", NULL, 3,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX5", NULL, 4,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX6", NULL, 5,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX7", NULL, 6,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 0,

SND_SOC_DAPM_AIF_OUT("SLIMTX8", NULL, 7,

		     ARIZONA_SLIMBUS_TX_CHANNEL_ENABLE,

		     ARIZONA_SLIMTX8_ENA_SHIFT, 0),



SND_SOC_DAPM_AIF_IN("SLIMRX1", NULL, 0,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX1_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX2", NULL, 1,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX2_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX3", NULL, 2,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX3_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX4", NULL, 3,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX4_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX5", NULL, 4,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX5_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX6", NULL, 5,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX6_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX7", NULL, 6,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX7_ENA_SHIFT, 0),

SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0,

SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 7,

		    ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,

		    ARIZONA_SLIMRX8_ENA_SHIFT, 0),

sound/soc/codecs/wm8998.c

+30 −30

File changed.

Preview size limit exceeded, changes collapsed.