soundwire: intel_ace2.x: add support for DODSE property

Extend previous patches with the DODSE 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-4-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/intel.h b/drivers/soundwire/intel.h
index b36d46319f0f351080e419c0f911a85011bacc55..f58860f192f9cb117bb8b8a0990d2f5270ea01dc 100644 (file)
--- a/drivers/soundwire/intel.h
+++ b/drivers/soundwire/intel.h
@@ -60,6 +60,7 @@ struct sdw_intel {
 
 struct sdw_intel_prop {
        u16 doais;
+       u16 dodse;
        u16 dods;
 };
 

diff --git a/drivers/soundwire/intel_ace2x.c b/drivers/soundwire/intel_ace2x.c
index 917cc79d4d853f6353e1ce568aeb2e5c3cc70f93..a07fd4a79f00e721a69445fe30b6d1e9fcb39ffe 100644 (file)
--- a/drivers/soundwire/intel_ace2x.c
+++ b/drivers/soundwire/intel_ace2x.c
@@ -28,15 +28,18 @@ static void intel_shim_vs_init(struct sdw_intel *sdw)
        struct sdw_bus *bus = &sdw->cdns.bus;
        struct sdw_intel_prop *intel_prop;
        u16 doais;
+       u16 dodse;
        u16 dods;
        u16 act;
 
        intel_prop = bus->vendor_specific_prop;
        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, 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);
        act |= SDW_SHIM2_INTEL_VS_ACTMCTL_DACTQE;
        intel_writew(shim_vs, SDW_SHIM2_INTEL_VS_ACTMCTL, act);

diff --git a/drivers/soundwire/intel_auxdevice.c b/drivers/soundwire/intel_auxdevice.c
index 697d640707940f9505cfedac95eb9848deaa3a32..7310441050b1493fe6b2dba25be68ea42021573f 100644 (file)
--- a/drivers/soundwire/intel_auxdevice.c
+++ b/drivers/soundwire/intel_auxdevice.c
@@ -160,18 +160,23 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)
 
        /* initialize with hardware defaults, in case the properties are not found */
        intel_prop->doais = 0x3;
+       intel_prop->dodse  = 0x0;
        intel_prop->dods  = 0x1;
 
        fwnode_property_read_u16(link,
                                 "intel-sdw-doais",
                                 &intel_prop->doais);
+       fwnode_property_read_u16(link,
+                                "intel-sdw-dodse",
+                                &intel_prop->dodse);
        fwnode_property_read_u16(link,
                                 "intel-sdw-dods",
                                 &intel_prop->dods);
        bus->vendor_specific_prop = intel_prop;
 
-       dev_dbg(bus->dev, "doais %#x dods %#x\n",
+       dev_dbg(bus->dev, "doais %#x dodse %#x dods %#x\n",
                intel_prop->doais,
+               intel_prop->dodse,
                intel_prop->dods);
 
        return 0;