hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/sound/soc/codecs/arizona.c
....@@ -1,13 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * arizona.c - Wolfson Arizona class device shared support
34 *
45 * Copyright 2012 Wolfson Microelectronics plc
56 *
67 * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
7
- *
8
- * This program is free software; you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License version 2 as
10
- * published by the Free Software Foundation.
118 */
129
1310 #include <linux/delay.h>
....@@ -90,7 +87,7 @@
9087
9188 switch (event) {
9289 case SND_SOC_DAPM_POST_PMU:
93
- val = snd_soc_component_read32(component,
90
+ val = snd_soc_component_read(component,
9491 ARIZONA_INTERRUPT_RAW_STATUS_3);
9592 if (val & ARIZONA_SPK_OVERHEAT_STS) {
9693 dev_crit(arizona->dev,
....@@ -900,7 +897,7 @@
900897 bool arizona_input_analog(struct snd_soc_component *component, int shift)
901898 {
902899 unsigned int reg = ARIZONA_IN1L_CONTROL + ((shift / 2) * 8);
903
- unsigned int val = snd_soc_component_read32(component, reg);
900
+ unsigned int val = snd_soc_component_read(component, reg);
904901
905902 return !(val & ARIZONA_IN1_MODE_MASK);
906903 }
....@@ -940,7 +937,7 @@
940937 break;
941938 case SND_SOC_DAPM_POST_PMD:
942939 /* Disable volume updates if no inputs are enabled */
943
- reg = snd_soc_component_read32(component, ARIZONA_INPUT_ENABLES);
940
+ reg = snd_soc_component_read(component, ARIZONA_INPUT_ENABLES);
944941 if (reg == 0)
945942 arizona_in_set_vu(component, 0);
946943 break;
....@@ -1758,15 +1755,15 @@
17581755 {
17591756 int val;
17601757
1761
- val = snd_soc_component_read32(component, base + ARIZONA_AIF_BCLK_CTRL);
1758
+ val = snd_soc_component_read(component, base + ARIZONA_AIF_BCLK_CTRL);
17621759 if (bclk != (val & ARIZONA_AIF1_BCLK_FREQ_MASK))
17631760 return true;
17641761
1765
- val = snd_soc_component_read32(component, base + ARIZONA_AIF_TX_BCLK_RATE);
1762
+ val = snd_soc_component_read(component, base + ARIZONA_AIF_TX_BCLK_RATE);
17661763 if (lrclk != (val & ARIZONA_AIF1TX_BCPF_MASK))
17671764 return true;
17681765
1769
- val = snd_soc_component_read32(component, base + ARIZONA_AIF_FRAME_CTRL_1);
1766
+ val = snd_soc_component_read(component, base + ARIZONA_AIF_FRAME_CTRL_1);
17701767 if (frame != (val & (ARIZONA_AIF1TX_WL_MASK |
17711768 ARIZONA_AIF1TX_SLOT_LEN_MASK)))
17721769 return true;
....@@ -1816,7 +1813,7 @@
18161813 }
18171814
18181815 /* Force multiple of 2 channels for I2S mode */
1819
- val = snd_soc_component_read32(component, base + ARIZONA_AIF_FORMAT);
1816
+ val = snd_soc_component_read(component, base + ARIZONA_AIF_FORMAT);
18201817 val &= ARIZONA_AIF1_FMT_MASK;
18211818 if ((channels & 1) && (val == ARIZONA_FMT_I2S_MODE)) {
18221819 arizona_aif_dbg(dai, "Forcing stereo mode\n");
....@@ -1848,9 +1845,9 @@
18481845
18491846 if (reconfig) {
18501847 /* Save AIF TX/RX state */
1851
- aif_tx_state = snd_soc_component_read32(component,
1848
+ aif_tx_state = snd_soc_component_read(component,
18521849 base + ARIZONA_AIF_TX_ENABLES);
1853
- aif_rx_state = snd_soc_component_read32(component,
1850
+ aif_rx_state = snd_soc_component_read(component,
18541851 base + ARIZONA_AIF_RX_ENABLES);
18551852 /* Disable AIF TX/RX before reconfiguring it */
18561853 regmap_update_bits_async(arizona->regmap,
....@@ -1929,7 +1926,7 @@
19291926 if (clk_id == dai_priv->clk)
19301927 return 0;
19311928
1932
- if (dai->active) {
1929
+ if (snd_soc_dai_active(dai)) {
19331930 dev_err(component->dev, "Can't change clock on active DAI %d\n",
19341931 dai->id);
19351932 return -EBUSY;