Skip to content

Commit 8e3bb8e

Browse files
brooniebroonie
committed
Merge branch 'asoc-5.6' into asoc-linus
2 parents 16fbf79 + f25e203 commit 8e3bb8e

26 files changed

+160
-95
lines changed

‎MAINTAINERS

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4021,8 +4021,8 @@ F: Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml
40214021
F: sound/soc/codecs/cros_ec_codec.*
40224022

40234023
CIRRUS LOGIC AUDIO CODEC DRIVERS
4024-
M: Brian Austin <brian.austin@cirrus.com>
4025-
M: Paul Handrigan <Paul.Handrigan@cirrus.com>
4024+
M: James Schulman <james.schulman@cirrus.com>
4025+
M: David Rhodes <david.rhodes@cirrus.com>
40264026
L: [email protected] (moderated for non-subscribers)
40274027
S: Maintained
40284028
F: sound/soc/codecs/cs*
@@ -15613,6 +15613,17 @@ F: sound/soc/
1561315613
F: include/dt-bindings/sound/
1561415614
F: include/sound/soc*
1561515615

15616+
SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
15617+
M: Pierre-Louis Bossart <[email protected]>
15618+
M: Liam Girdwood <[email protected]>
15619+
M: Ranjani Sridharan <[email protected]>
15620+
M: Kai Vehmanen <[email protected]>
15621+
M: Daniel Baluta <[email protected]>
15622+
L: [email protected] (moderated for non-subscribers)
15623+
W: https://github.com/thesofproject/linux/
15624+
S: Supported
15625+
F: sound/soc/sof/
15626+
1561615627
SOUNDWIRE SUBSYSTEM
1561715628
M: Vinod Koul <[email protected]>
1561815629
M: Sanyog Kale <[email protected]>

‎include/sound/soc.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,7 @@ struct snd_soc_card {
10581058
const struct snd_soc_dapm_route *of_dapm_routes;
10591059
int num_of_dapm_routes;
10601060
bool fully_routed;
1061+
bool disable_route_checks;
10611062

10621063
/* lists of probed devices belonging to this card */
10631064
struct list_head component_dev_list;

‎sound/soc/codecs/max98357a.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ MODULE_DEVICE_TABLE(of, max98357a_device_id);
135135
#ifdef CONFIG_ACPI
136136
static const struct acpi_device_id max98357a_acpi_match[] = {
137137
{ "MX98357A", 0 },
138+
{ "MX98360A", 0 },
138139
{},
139140
};
140141
MODULE_DEVICE_TABLE(acpi, max98357a_acpi_match);

‎sound/soc/codecs/rt5682.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,7 @@ static void rt5682_jack_detect_handler(struct work_struct *work)
11461146
static const struct snd_kcontrol_new rt5682_snd_controls[] = {
11471147
/* DAC Digital Volume */
11481148
SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5682_DAC1_DIG_VOL,
1149-
RT5682_L_VOL_SFT + 1, RT5682_R_VOL_SFT + 1, 86, 0, dac_vol_tlv),
1149+
RT5682_L_VOL_SFT + 1, RT5682_R_VOL_SFT + 1, 87, 0, dac_vol_tlv),
11501150

11511151
/* IN Boost Volume */
11521152
SOC_SINGLE_TLV("CBJ Boost Volume", RT5682_CBJ_BST_CTRL,
@@ -2651,6 +2651,8 @@ static int rt5682_i2c_probe(struct i2c_client *i2c,
26512651
RT5682_CP_CLK_HP_MASK, RT5682_CP_CLK_HP_300KHZ);
26522652
regmap_update_bits(rt5682->regmap, RT5682_HP_CHARGE_PUMP_1,
26532653
RT5682_PM_HP_MASK, RT5682_PM_HP_HV);
2654+
regmap_update_bits(rt5682->regmap, RT5682_DMIC_CTRL_1,
2655+
RT5682_FIFO_CLK_DIV_MASK, RT5682_FIFO_CLK_DIV_2);
26542656

26552657
INIT_DELAYED_WORK(&rt5682->jack_detect_work,
26562658
rt5682_jack_detect_handler);

‎sound/soc/codecs/rt5682.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,8 @@
651651
#define RT5682_DMIC_1_EN_SFT 15
652652
#define RT5682_DMIC_1_DIS (0x0 << 15)
653653
#define RT5682_DMIC_1_EN (0x1 << 15)
654+
#define RT5682_FIFO_CLK_DIV_MASK (0x7 << 12)
655+
#define RT5682_FIFO_CLK_DIV_2 (0x1 << 12)
654656
#define RT5682_DMIC_1_DP_MASK (0x3 << 4)
655657
#define RT5682_DMIC_1_DP_SFT 4
656658
#define RT5682_DMIC_1_DP_GPIO2 (0x0 << 4)

‎sound/soc/codecs/tas2562.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ static const struct snd_kcontrol_new vsense_switch =
409409
1, 1);
410410

411411
static const struct snd_kcontrol_new tas2562_snd_controls[] = {
412-
SOC_SINGLE_TLV("Amp Gain Volume", TAS2562_PB_CFG1, 0, 0x1c, 0,
412+
SOC_SINGLE_TLV("Amp Gain Volume", TAS2562_PB_CFG1, 1, 0x1c, 0,
413413
tas2562_dac_tlv),
414414
};
415415

‎sound/soc/codecs/wcd9335.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4926,11 +4926,11 @@ static const struct regmap_range_cfg wcd9335_ranges[] = {
49264926
.name = "WCD9335",
49274927
.range_min = 0x0,
49284928
.range_max = WCD9335_MAX_REGISTER,
4929-
.selector_reg = WCD9335_REG(0x0, 0),
4929+
.selector_reg = WCD9335_SEL_REGISTER,
49304930
.selector_mask = 0xff,
49314931
.selector_shift = 0,
4932-
.window_start = 0x0,
4933-
.window_len = 0x1000,
4932+
.window_start = 0x800,
4933+
.window_len = 0x100,
49344934
},
49354935
};
49364936

@@ -4968,20 +4968,20 @@ static const struct regmap_range_cfg wcd9335_ifc_ranges[] = {
49684968
{
49694969
.name = "WCD9335-IFC-DEV",
49704970
.range_min = 0x0,
4971-
.range_max = WCD9335_REG(0, 0x7ff),
4972-
.selector_reg = WCD9335_REG(0, 0x0),
4973-
.selector_mask = 0xff,
4971+
.range_max = WCD9335_MAX_REGISTER,
4972+
.selector_reg = WCD9335_SEL_REGISTER,
4973+
.selector_mask = 0xfff,
49744974
.selector_shift = 0,
4975-
.window_start = 0x0,
4976-
.window_len = 0x1000,
4975+
.window_start = 0x800,
4976+
.window_len = 0x400,
49774977
},
49784978
};
49794979

49804980
static struct regmap_config wcd9335_ifc_regmap_config = {
49814981
.reg_bits = 16,
49824982
.val_bits = 8,
49834983
.can_multi_write = true,
4984-
.max_register = WCD9335_REG(0, 0x7FF),
4984+
.max_register = WCD9335_MAX_REGISTER,
49854985
.ranges = wcd9335_ifc_ranges,
49864986
.num_ranges = ARRAY_SIZE(wcd9335_ifc_ranges),
49874987
};

‎sound/soc/codecs/wcd9335.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
* in slimbus mode the reg base starts from 0x800
99
* in i2s/i2c mode the reg base is 0x0
1010
*/
11-
#define WCD9335_REG(pg, r) ((pg << 12) | (r) | 0x800)
11+
#define WCD9335_REG(pg, r) ((pg << 8) | (r))
1212
#define WCD9335_REG_OFFSET(r) (r & 0xFF)
13-
#define WCD9335_PAGE_OFFSET(r) ((r >> 12) & 0xFF)
13+
#define WCD9335_PAGE_OFFSET(r) ((r >> 8) & 0xFF)
1414

1515
/* Page-0 Registers */
1616
#define WCD9335_PAGE0_PAGE_REGISTER WCD9335_REG(0x00, 0x000)
@@ -600,7 +600,8 @@
600600
#define WCD9335_CDC_CLK_RST_CTRL_FS_CNT_ENABLE BIT(0)
601601
#define WCD9335_CDC_CLK_RST_CTRL_FS_CNT_DISABLE 0
602602
#define WCD9335_CDC_TOP_TOP_CFG1 WCD9335_REG(0x0d, 0x082)
603-
#define WCD9335_MAX_REGISTER WCD9335_REG(0x80, 0x0FF)
603+
#define WCD9335_MAX_REGISTER 0xffff
604+
#define WCD9335_SEL_REGISTER 0x800
604605

605606
/* SLIMBUS Slave Registers */
606607
#define WCD9335_SLIM_PGD_PORT_INT_EN0 WCD9335_REG(0, 0x30)

‎sound/soc/codecs/wm_adsp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,12 +1436,12 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
14361436
subname = NULL; /* don't append subname */
14371437
break;
14381438
case 2:
1439-
ret = snprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN,
1439+
ret = scnprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN,
14401440
"%s%c %.12s %x", dsp->name, *region_name,
14411441
wm_adsp_fw_text[dsp->fw], alg_region->alg);
14421442
break;
14431443
default:
1444-
ret = snprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN,
1444+
ret = scnprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN,
14451445
"%s %.12s %x", dsp->name,
14461446
wm_adsp_fw_text[dsp->fw], alg_region->alg);
14471447
break;

‎sound/soc/codecs/wsa881x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,7 @@ static int wsa881x_probe(struct sdw_slave *pdev,
11501150
wsa881x->sconfig.type = SDW_STREAM_PDM;
11511151
pdev->prop.sink_ports = GENMASK(WSA881X_MAX_SWR_PORTS, 0);
11521152
pdev->prop.sink_dpn_prop = wsa_sink_dpn_prop;
1153-
gpiod_set_value(wsa881x->sd_n, 1);
1153+
gpiod_direction_output(wsa881x->sd_n, 1);
11541154

11551155
wsa881x->regmap = devm_regmap_init_sdw(pdev, &wsa881x_regmap_config);
11561156
if (IS_ERR(wsa881x->regmap)) {

0 commit comments

Comments
 (0)