soundwire: intel: add register_dai callback in hw_ops

No functionality change, only add indirection for DAI registration
helper.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20221111013135.38289-4-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 914f2fb43721a5b1580944aeb50a244a337914ec..0496eb0d60847fc315b47c8f20ae4a6f06176fef 100644 (file)
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -1426,6 +1426,8 @@ const struct sdw_intel_hw_ops sdw_intel_cnl_hw_ops = {
        .debugfs_init = intel_debugfs_init,
        .debugfs_exit = intel_debugfs_exit,
 
+       .register_dai = intel_register_dai,
+
        .pre_bank_switch = intel_pre_bank_switch,
        .post_bank_switch = intel_post_bank_switch,
 };
@@ -1611,7 +1613,7 @@ int intel_link_startup(struct auxiliary_device *auxdev)
                goto err_init;
 
        /* Register DAIs */
-       ret = intel_register_dai(sdw);
+       ret = sdw_intel_register_dai(sdw);
        if (ret) {
                dev_err(dev, "DAI registration failed: %d\n", ret);
                goto err_power_up;

diff --git a/drivers/soundwire/intel.h b/drivers/soundwire/intel.h
index 5548b8451d01423eed9df2d4e5f03092cda45d04..0521cab311a33c19c8b2ebdd0d5a81a7b1f24037 100644 (file)
--- a/drivers/soundwire/intel.h
+++ b/drivers/soundwire/intel.h
@@ -77,4 +77,11 @@ static inline void sdw_intel_debugfs_exit(struct sdw_intel *sdw)
                SDW_INTEL_OPS(sdw, debugfs_exit)(sdw);
 }
 
+static inline int sdw_intel_register_dai(struct sdw_intel *sdw)
+{
+       if (SDW_INTEL_CHECK_OPS(sdw, register_dai))
+               return SDW_INTEL_OPS(sdw, register_dai)(sdw);
+       return -ENOTSUPP;
+}
+
 #endif /* __SDW_INTEL_LOCAL_H */

diff --git a/include/linux/soundwire/sdw_intel.h b/include/linux/soundwire/sdw_intel.h
index 211924e4ebf214c4a26442ee2cdf5047def09072..5be63d4fe62ecc3bc4527a49a32056f7ab63d022 100644 (file)
--- a/include/linux/soundwire/sdw_intel.h
+++ b/include/linux/soundwire/sdw_intel.h
@@ -299,6 +299,7 @@ struct sdw_intel;
 /* struct intel_sdw_hw_ops - SoundWire ops for Intel platforms.
  * @debugfs_init: initialize all debugfs capabilities
  * @debugfs_exit: close and cleanup debugfs capabilities
+ * @register_dai: read all PDI information and register DAIs
  * @pre_bank_switch: helper for bus management
  * @post_bank_switch: helper for bus management
  */
@@ -306,6 +307,8 @@ struct sdw_intel_hw_ops {
        void (*debugfs_init)(struct sdw_intel *sdw);
        void (*debugfs_exit)(struct sdw_intel *sdw);
 
+       int (*register_dai)(struct sdw_intel *sdw);
+
        int (*pre_bank_switch)(struct sdw_intel *sdw);
        int (*post_bank_switch)(struct sdw_intel *sdw);
 };