Merge tag 'f2fs-for-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeu...

[linux-2.6-microblaze.git] / drivers / soundwire / intel.c

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index fd95f94..c11e3d8 100644 (file)
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -11,7 +11,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/platform_device.h>
+#include <linux/auxiliary_bus.h>
 #include <sound/pcm_params.h>
 #include <linux/pm_runtime.h>
 #include <sound/soc.h>
@@ -1327,11 +1327,14 @@ static int intel_init(struct sdw_intel *sdw)
 }
 
 /*
- * probe and init
+ * probe and init (aux_dev_id argument is required by function prototype but not used)
  */
-static int intel_master_probe(struct platform_device *pdev)
+static int intel_link_probe(struct auxiliary_device *auxdev,
+                           const struct auxiliary_device_id *aux_dev_id)
+
 {
-       struct device *dev = &pdev->dev;
+       struct device *dev = &auxdev->dev;
+       struct sdw_intel_link_dev *ldev = auxiliary_dev_to_sdw_intel_link_dev(auxdev);
        struct sdw_intel *sdw;
        struct sdw_cdns *cdns;
        struct sdw_bus *bus;
@@ -1344,14 +1347,14 @@ static int intel_master_probe(struct platform_device *pdev)
        cdns = &sdw->cdns;
        bus = &cdns->bus;
 
-       sdw->instance = pdev->id;
-       sdw->link_res = dev_get_platdata(dev);
+       sdw->instance = auxdev->id;
+       sdw->link_res = &ldev->link_res;
        cdns->dev = dev;
        cdns->registers = sdw->link_res->registers;
        cdns->instance = sdw->instance;
        cdns->msg_count = 0;
 
-       bus->link_id = pdev->id;
+       bus->link_id = auxdev->id;
 
        sdw_cdns_probe(cdns);
 
@@ -1384,10 +1387,10 @@ static int intel_master_probe(struct platform_device *pdev)
        return 0;
 }
 
-int intel_master_startup(struct platform_device *pdev)
+int intel_link_startup(struct auxiliary_device *auxdev)
 {
        struct sdw_cdns_stream_config config;
-       struct device *dev = &pdev->dev;
+       struct device *dev = &auxdev->dev;
        struct sdw_cdns *cdns = dev_get_drvdata(dev);
        struct sdw_intel *sdw = cdns_to_intel(cdns);
        struct sdw_bus *bus = &cdns->bus;
@@ -1524,9 +1527,9 @@ err_init:
        return ret;
 }
 
-static int intel_master_remove(struct platform_device *pdev)
+static void intel_link_remove(struct auxiliary_device *auxdev)
 {
-       struct device *dev = &pdev->dev;
+       struct device *dev = &auxdev->dev;
        struct sdw_cdns *cdns = dev_get_drvdata(dev);
        struct sdw_intel *sdw = cdns_to_intel(cdns);
        struct sdw_bus *bus = &cdns->bus;
@@ -1542,19 +1545,17 @@ static int intel_master_remove(struct platform_device *pdev)
                snd_soc_unregister_component(dev);
        }
        sdw_bus_master_delete(bus);
-
-       return 0;
 }
 
-int intel_master_process_wakeen_event(struct platform_device *pdev)
+int intel_link_process_wakeen_event(struct auxiliary_device *auxdev)
 {
-       struct device *dev = &pdev->dev;
+       struct device *dev = &auxdev->dev;
        struct sdw_intel *sdw;
        struct sdw_bus *bus;
        void __iomem *shim;
        u16 wake_sts;
 
-       sdw = platform_get_drvdata(pdev);
+       sdw = dev_get_drvdata(dev);
        bus = &sdw->cdns.bus;
 
        if (bus->prop.hw_disabled) {
@@ -1976,17 +1977,22 @@ static const struct dev_pm_ops intel_pm = {
        SET_RUNTIME_PM_OPS(intel_suspend_runtime, intel_resume_runtime, NULL)
 };
 
-static struct platform_driver sdw_intel_drv = {
-       .probe = intel_master_probe,
-       .remove = intel_master_remove,
+static const struct auxiliary_device_id intel_link_id_table[] = {
+       { .name = "soundwire_intel.link" },
+       {},
+};
+MODULE_DEVICE_TABLE(auxiliary, intel_link_id_table);
+
+static struct auxiliary_driver sdw_intel_drv = {
+       .probe = intel_link_probe,
+       .remove = intel_link_remove,
        .driver = {
-               .name = "intel-sdw",
+               /* auxiliary_driver_register() sets .name to be the modname */
                .pm = &intel_pm,
-       }
+       },
+       .id_table = intel_link_id_table
 };
-
-module_platform_driver(sdw_intel_drv);
+module_auxiliary_driver(sdw_intel_drv);
 
 MODULE_LICENSE("Dual BSD/GPL");
-MODULE_ALIAS("platform:intel-sdw");
-MODULE_DESCRIPTION("Intel Soundwire Master Driver");
+MODULE_DESCRIPTION("Intel Soundwire Link Driver");