mfd: intel_soc_pmic_mrfld: Convert to use new SCU IPC API

This converts the Intel Merrifield PMIC driver over the new SCU IPC API
where the SCU IPC instance is passed to the functions.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/intel_soc_pmic_mrfld.c b/drivers/mfd/intel_soc_pmic_mrfld.c
index 26a1551c5faf3233bf49cf458595380acea67493..bd94c989d232e17662cae841def556a4ba385760 100644 (file)
--- a/drivers/mfd/intel_soc_pmic_mrfld.c
+++ b/drivers/mfd/intel_soc_pmic_mrfld.c
@@ -74,10 +74,11 @@ static const struct mfd_cell bcove_dev[] = {
 static int bcove_ipc_byte_reg_read(void *context, unsigned int reg,
                                    unsigned int *val)
 {
+       struct intel_soc_pmic *pmic = context;
        u8 ipc_out;
        int ret;
 
-       ret = intel_scu_ipc_ioread8(reg, &ipc_out);
+       ret = intel_scu_ipc_dev_ioread8(pmic->scu, reg, &ipc_out);
        if (ret)
                return ret;
 
@@ -88,10 +89,11 @@ static int bcove_ipc_byte_reg_read(void *context, unsigned int reg,
 static int bcove_ipc_byte_reg_write(void *context, unsigned int reg,
                                     unsigned int val)
 {
+       struct intel_soc_pmic *pmic = context;
        u8 ipc_in = val;
        int ret;
 
-       ret = intel_scu_ipc_iowrite8(reg, ipc_in);
+       ret = intel_scu_ipc_dev_iowrite8(pmic->scu, reg, ipc_in);
        if (ret)
                return ret;
 
@@ -117,6 +119,10 @@ static int bcove_probe(struct platform_device *pdev)
        if (!pmic)
                return -ENOMEM;
 
+       pmic->scu = devm_intel_scu_ipc_dev_get(dev);
+       if (!pmic->scu)
+               return -ENOMEM;
+
        platform_set_drvdata(pdev, pmic);
        pmic->dev = &pdev->dev;