Commit a0df7e04 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: intel_ace2.x: add support for DOAISE property 



Extend previous patches with the DOAISE field and property.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarBard 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: default avatarVinod Koul <vkoul@kernel.org>
parent 75933ba5

drivers/soundwire/intel.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ struct sdw_intel { 
};



struct sdw_intel_prop {

	u16 doaise;

	u16 doais;

	u16 dodse;

	u16 dods;

drivers/soundwire/intel_ace2x.c

+3 −0
Original line number Diff line number Diff line
@@ -27,17 +27,20 @@ static void intel_shim_vs_init(struct sdw_intel *sdw) 
	void __iomem *shim_vs = sdw->link_res->shim_vs;

	struct sdw_bus *bus = &sdw->cdns.bus;

	struct sdw_intel_prop *intel_prop;

	u16 doaise;

	u16 doais;

	u16 dodse;

	u16 dods;

	u16 act;



	intel_prop = bus->vendor_specific_prop;

	doaise = intel_prop->doaise;

	doais = intel_prop->doais;

	dodse = intel_prop->dodse;

	dods = intel_prop->dods;



	act = intel_readw(shim_vs, SDW_SHIM2_INTEL_VS_ACTMCTL);

	u16p_replace_bits(&act, doaise, SDW_SHIM2_INTEL_VS_ACTMCTL_DOAISE);

	u16p_replace_bits(&act, doais, SDW_SHIM2_INTEL_VS_ACTMCTL_DOAIS);

	u16p_replace_bits(&act, dodse, SDW_SHIM2_INTEL_VS_ACTMCTL_DODSE);

	u16p_replace_bits(&act, dods, SDW_SHIM2_INTEL_VS_ACTMCTL_DODS);

drivers/soundwire/intel_auxdevice.c

+6 −1
Original line number Diff line number Diff line
@@ -159,10 +159,14 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus) 
		return -ENOMEM;



	/* initialize with hardware defaults, in case the properties are not found */

	intel_prop->doaise = 0x1;

	intel_prop->doais = 0x3;

	intel_prop->dodse  = 0x0;

	intel_prop->dods  = 0x1;



	fwnode_property_read_u16(link,

				 "intel-sdw-doaise",

				 &intel_prop->doaise);

	fwnode_property_read_u16(link,

				 "intel-sdw-doais",

				 &intel_prop->doais);
@@ -174,7 +178,8 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus) 
				 &intel_prop->dods);

	bus->vendor_specific_prop = intel_prop;



	dev_dbg(bus->dev, "doais %#x dodse %#x dods %#x\n",

	dev_dbg(bus->dev, "doaise %#x doais %#x dodse %#x dods %#x\n",

		intel_prop->doaise,

		intel_prop->doais,

		intel_prop->dodse,

		intel_prop->dods);