Skip to content

Commit a0df7e0

Browse files
plbossartvinodkoul
authored andcommitted
soundwire: intel_ace2.x: add support for DOAISE property
Extend previous patches with the DOAISE field and property. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20240429004321.2399754-5-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 75933ba commit a0df7e0

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

drivers/soundwire/intel.h

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ struct sdw_intel {
5959
};
6060

6161
struct sdw_intel_prop {
62+
u16 doaise;
6263
u16 doais;
6364
u16 dodse;
6465
u16 dods;

drivers/soundwire/intel_ace2x.c

+3
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,20 @@ static void intel_shim_vs_init(struct sdw_intel *sdw)
2727
void __iomem *shim_vs = sdw->link_res->shim_vs;
2828
struct sdw_bus *bus = &sdw->cdns.bus;
2929
struct sdw_intel_prop *intel_prop;
30+
u16 doaise;
3031
u16 doais;
3132
u16 dodse;
3233
u16 dods;
3334
u16 act;
3435

3536
intel_prop = bus->vendor_specific_prop;
37+
doaise = intel_prop->doaise;
3638
doais = intel_prop->doais;
3739
dodse = intel_prop->dodse;
3840
dods = intel_prop->dods;
3941

4042
act = intel_readw(shim_vs, SDW_SHIM2_INTEL_VS_ACTMCTL);
43+
u16p_replace_bits(&act, doaise, SDW_SHIM2_INTEL_VS_ACTMCTL_DOAISE);
4144
u16p_replace_bits(&act, doais, SDW_SHIM2_INTEL_VS_ACTMCTL_DOAIS);
4245
u16p_replace_bits(&act, dodse, SDW_SHIM2_INTEL_VS_ACTMCTL_DODSE);
4346
u16p_replace_bits(&act, dods, SDW_SHIM2_INTEL_VS_ACTMCTL_DODS);

drivers/soundwire/intel_auxdevice.c

+6-1
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,14 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)
159159
return -ENOMEM;
160160

161161
/* initialize with hardware defaults, in case the properties are not found */
162+
intel_prop->doaise = 0x1;
162163
intel_prop->doais = 0x3;
163164
intel_prop->dodse = 0x0;
164165
intel_prop->dods = 0x1;
165166

167+
fwnode_property_read_u16(link,
168+
"intel-sdw-doaise",
169+
&intel_prop->doaise);
166170
fwnode_property_read_u16(link,
167171
"intel-sdw-doais",
168172
&intel_prop->doais);
@@ -174,7 +178,8 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)
174178
&intel_prop->dods);
175179
bus->vendor_specific_prop = intel_prop;
176180

177-
dev_dbg(bus->dev, "doais %#x dodse %#x dods %#x\n",
181+
dev_dbg(bus->dev, "doaise %#x doais %#x dodse %#x dods %#x\n",
182+
intel_prop->doaise,
178183
intel_prop->doais,
179184
intel_prop->dodse,
180185
intel_prop->dods);

0 commit comments

Comments
 (0)