Skip to content

Commit 75933ba

Browse files
plbossartvinodkoul
authored andcommitted
soundwire: intel_ace2.x: add support for DODSE property
Extend previous patches with the DODSE field and property. Signed-off-by: Pierre-Louis Bossart <[email protected]> Signed-off-by: Bard Liao <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 3b0b441 commit 75933ba

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

drivers/soundwire/intel.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ struct sdw_intel {
6060

6161
struct sdw_intel_prop {
6262
u16 doais;
63+
u16 dodse;
6364
u16 dods;
6465
};
6566

drivers/soundwire/intel_ace2x.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,18 @@ static void intel_shim_vs_init(struct sdw_intel *sdw)
2828
struct sdw_bus *bus = &sdw->cdns.bus;
2929
struct sdw_intel_prop *intel_prop;
3030
u16 doais;
31+
u16 dodse;
3132
u16 dods;
3233
u16 act;
3334

3435
intel_prop = bus->vendor_specific_prop;
3536
doais = intel_prop->doais;
37+
dodse = intel_prop->dodse;
3638
dods = intel_prop->dods;
3739

3840
act = intel_readw(shim_vs, SDW_SHIM2_INTEL_VS_ACTMCTL);
3941
u16p_replace_bits(&act, doais, SDW_SHIM2_INTEL_VS_ACTMCTL_DOAIS);
42+
u16p_replace_bits(&act, dodse, SDW_SHIM2_INTEL_VS_ACTMCTL_DODSE);
4043
u16p_replace_bits(&act, dods, SDW_SHIM2_INTEL_VS_ACTMCTL_DODS);
4144
act |= SDW_SHIM2_INTEL_VS_ACTMCTL_DACTQE;
4245
intel_writew(shim_vs, SDW_SHIM2_INTEL_VS_ACTMCTL, act);

drivers/soundwire/intel_auxdevice.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,18 +160,23 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)
160160

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

165166
fwnode_property_read_u16(link,
166167
"intel-sdw-doais",
167168
&intel_prop->doais);
169+
fwnode_property_read_u16(link,
170+
"intel-sdw-dodse",
171+
&intel_prop->dodse);
168172
fwnode_property_read_u16(link,
169173
"intel-sdw-dods",
170174
&intel_prop->dods);
171175
bus->vendor_specific_prop = intel_prop;
172176

173-
dev_dbg(bus->dev, "doais %#x dods %#x\n",
177+
dev_dbg(bus->dev, "doais %#x dodse %#x dods %#x\n",
174178
intel_prop->doais,
179+
intel_prop->dodse,
175180
intel_prop->dods);
176181

177182
return 0;

0 commit comments

Comments
 (0)