Merge tag 'soundwire-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux-block.git] / drivers / soundwire / intel_auxdevice.c

diff --git a/drivers/soundwire/intel_auxdevice.c b/drivers/soundwire/intel_auxdevice.c
index 95125cc2fc599e040be30b3e376fbd93d6cfd88c..17cf27e6ea738c3e2c126437c99cf863f036c97f 100644 (file)
--- a/drivers/soundwire/intel_auxdevice.c
+++ b/drivers/soundwire/intel_auxdevice.c
@@ -122,6 +122,7 @@ static void generic_new_peripheral_assigned(struct sdw_bus *bus,
 static int sdw_master_read_intel_prop(struct sdw_bus *bus)
 {
        struct sdw_master_prop *prop = &bus->prop;
+       struct sdw_intel_prop *intel_prop;
        struct fwnode_handle *link;
        char name[32];
        u32 quirk_mask;
@@ -153,6 +154,36 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)
        prop->quirks = SDW_MASTER_QUIRKS_CLEAR_INITIAL_CLASH |
                SDW_MASTER_QUIRKS_CLEAR_INITIAL_PARITY;
 
+       intel_prop = devm_kzalloc(bus->dev, sizeof(*intel_prop), GFP_KERNEL);
+       if (!intel_prop)
+               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);
+       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, "doaise %#x doais %#x dodse %#x dods %#x\n",
+               intel_prop->doaise,
+               intel_prop->doais,
+               intel_prop->dodse,
+               intel_prop->dods);
+
        return 0;
 }
 
@@ -440,7 +471,7 @@ int intel_link_process_wakeen_event(struct auxiliary_device *auxdev)
  * PM calls
  */
 
-static int intel_resume_child_device(struct device *dev, void *data)
+int intel_resume_child_device(struct device *dev, void *data)
 {
        int ret;
        struct sdw_slave *slave = dev_to_sdw_dev(dev);
@@ -454,9 +485,9 @@ static int intel_resume_child_device(struct device *dev, void *data)
                return 0;
        }
 
-       ret = pm_request_resume(dev);
+       ret = pm_runtime_resume(dev);
        if (ret < 0) {
-               dev_err(dev, "%s: pm_request_resume failed: %d\n", __func__, ret);
+               dev_err(dev, "%s: pm_runtime_resume failed: %d\n", __func__, ret);
                return ret;
        }
 
@@ -499,9 +530,9 @@ static int __maybe_unused intel_pm_prepare(struct device *dev)
                 * first resume the device for this link. This will also by construction
                 * resume the PCI parent device.
                 */
-               ret = pm_request_resume(dev);
+               ret = pm_runtime_resume(dev);
                if (ret < 0) {
-                       dev_err(dev, "%s: pm_request_resume failed: %d\n", __func__, ret);
+                       dev_err(dev, "%s: pm_runtime_resume failed: %d\n", __func__, ret);
                        return 0;
                }