zynqmp: PM: Remove 'mask' argument from MMIO read FW call

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/soc/xilinx/zynqmp/pm.c b/drivers/soc/xilinx/zynqmp/pm.c
index c1fe6088f0b18aa530c09c14be9785bc2fc1a978..84c046e53aae6b0cd1ff8bc0488cd60496024e72 100644 (file)
--- a/drivers/soc/xilinx/zynqmp/pm.c
+++ b/drivers/soc/xilinx/zynqmp/pm.c
@@ -552,7 +552,6 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_mmio_write);
 /**
  * zynqmp_pm_mmio_read - Read value from protected mmio
  * @address:   Address to write to
- * @mask:      Mask to apply
  * @value:     Value to read
  *
  * This function provides access to PM-related control registers
@@ -560,16 +559,14 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_mmio_write);
  *
  * Return:     Returns status, either success or error+reason
  */
-int zynqmp_pm_mmio_read(const u32 address,
-                                   const u32 mask,
-                                   u32 *value)
+int zynqmp_pm_mmio_read(const u32 address, u32 *value)
 {
        u32 ret_payload[PAYLOAD_ARG_CNT];
 
-       if (value == NULL)
-               return zynqmp_pm_ret_code(XST_PM_CONFLICT);
+       if (!value)
+               return -EINVAL;
 
-       invoke_pm_fn(MMIO_READ, address, mask, 0, 0, ret_payload);
+       invoke_pm_fn(MMIO_READ, address, 0, 0, 0, ret_payload);
        *value = ret_payload[1];
 
        return zynqmp_pm_ret_code((enum pm_ret_status)ret_payload[0]);
@@ -787,9 +784,8 @@ static ssize_t zynqmp_pm_debugfs_api_write(struct file *file,
                pr_info("%s Reset status: %u\n", __func__, pm_api_arg[1]);
                break;
        case MMIO_READ:
-               ret = zynqmp_pm_mmio_read(pm_api_arg[0],
-                                    pm_api_arg[1], &pm_api_arg[2]);
-               pr_info("%s MMIO value: %#x\n", __func__, pm_api_arg[2]);
+               ret = zynqmp_pm_mmio_read(pm_api_arg[0], &pm_api_arg[1]);
+               pr_info("%s MMIO value: %#x\n", __func__, pm_api_arg[1]);
                break;
        case MMIO_WRITE:
                ret = zynqmp_pm_mmio_write(pm_api_arg[0],

diff --git a/include/linux/soc/xilinx/zynqmp/pm.h b/include/linux/soc/xilinx/zynqmp/pm.h
index 41c3c1d43bb5d688b884f77f9cf803601ea59dbd..3f9863ec21b73eb3e15b8837e2ca9fd28b2420bb 100644 (file)
--- a/include/linux/soc/xilinx/zynqmp/pm.h
+++ b/include/linux/soc/xilinx/zynqmp/pm.h
@@ -117,8 +117,6 @@ int zynqmp_pm_reset_get_status(const u32 reset,
 int zynqmp_pm_mmio_write(const u32 address,
                                     const u32 mask,
                                     const u32 value);
-int zynqmp_pm_mmio_read(const u32 address,
-                                   const u32 mask,
-                                   u32 *value);
+int zynqmp_pm_mmio_read(const u32 address, u32 *value);
 
 #endif /* __SOC_ZYNQMP_PM_H__ */