firmware: xilinx: Remove eemi ops for reset_assert

Use direct function call instead of using eemi ops for
reset_assert.

Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
Signed-off-by: Jolly Shah <jolly.shah@xilinx.com>
Link: https://lore.kernel.org/r/1587761887-4279-13-git-send-email-jolly.shah@xilinx.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 94fd755b19c604e28fac973279ed166edf1b5b88..2a790917ef8e8c0335fe7a5904457bcca166315d 100644 (file)
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -627,12 +627,13 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_sd_dll_reset);
  *
  * Return: Returns status, either success or error+reason
  */
-static int zynqmp_pm_reset_assert(const enum zynqmp_pm_reset reset,
-                                 const enum zynqmp_pm_reset_action assert_flag)
+int zynqmp_pm_reset_assert(const enum zynqmp_pm_reset reset,
+                          const enum zynqmp_pm_reset_action assert_flag)
 {
        return zynqmp_pm_invoke_fn(PM_RESET_ASSERT, reset, assert_flag,
                                   0, 0, NULL);
 }
+EXPORT_SYMBOL_GPL(zynqmp_pm_reset_assert);
 
 /**
  * zynqmp_pm_reset_get_status - Get status of the reset
@@ -807,7 +808,6 @@ static int zynqmp_pm_aes_engine(const u64 address, u32 *out)
 }
 
 static const struct zynqmp_eemi_ops eemi_ops = {
-       .reset_assert = zynqmp_pm_reset_assert,
        .reset_get_status = zynqmp_pm_reset_get_status,
        .init_finalize = zynqmp_pm_init_finalize,
        .set_suspend_mode = zynqmp_pm_set_suspend_mode,

diff --git a/drivers/reset/reset-zynqmp.c b/drivers/reset/reset-zynqmp.c
index 0144075b11a6e1a2f341b5f05b6757f761fa144c..4a01b7e94549dc72b0a40645719e03f959a60037 100644 (file)
--- a/drivers/reset/reset-zynqmp.c
+++ b/drivers/reset/reset-zynqmp.c
@@ -27,19 +27,15 @@ to_zynqmp_reset_data(struct reset_controller_dev *rcdev)
 static int zynqmp_reset_assert(struct reset_controller_dev *rcdev,
                               unsigned long id)
 {
-       struct zynqmp_reset_data *priv = to_zynqmp_reset_data(rcdev);
-
-       return priv->eemi_ops->reset_assert(ZYNQMP_RESET_ID + id,
-                                           PM_RESET_ACTION_ASSERT);
+       return zynqmp_pm_reset_assert(ZYNQMP_RESET_ID + id,
+                                     PM_RESET_ACTION_ASSERT);
 }
 
 static int zynqmp_reset_deassert(struct reset_controller_dev *rcdev,
                                 unsigned long id)
 {
-       struct zynqmp_reset_data *priv = to_zynqmp_reset_data(rcdev);
-
-       return priv->eemi_ops->reset_assert(ZYNQMP_RESET_ID + id,
-                                           PM_RESET_ACTION_RELEASE);
+       return zynqmp_pm_reset_assert(ZYNQMP_RESET_ID + id,
+                                     PM_RESET_ACTION_RELEASE);
 }
 
 static int zynqmp_reset_status(struct reset_controller_dev *rcdev,
@@ -58,10 +54,8 @@ static int zynqmp_reset_status(struct reset_controller_dev *rcdev,
 static int zynqmp_reset_reset(struct reset_controller_dev *rcdev,
                              unsigned long id)
 {
-       struct zynqmp_reset_data *priv = to_zynqmp_reset_data(rcdev);
-
-       return priv->eemi_ops->reset_assert(ZYNQMP_RESET_ID + id,
-                                           PM_RESET_ACTION_PULSE);
+       return zynqmp_pm_reset_assert(ZYNQMP_RESET_ID + id,
+                                     PM_RESET_ACTION_PULSE);
 }
 
 static const struct reset_control_ops zynqmp_reset_ops = {

diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
index 5aff8963c11a233c3ddff989e2f18099b0019b25..22b2bbe0faea1e0a45e923f16d968d3c857afd96 100644 (file)
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -296,8 +296,6 @@ struct zynqmp_pm_query_data {
 struct zynqmp_eemi_ops {
        int (*fpga_load)(const u64 address, const u32 size, const u32 flags);
        int (*fpga_get_status)(u32 *value);
-       int (*reset_assert)(const enum zynqmp_pm_reset reset,
-                           const enum zynqmp_pm_reset_action assert_flag);
        int (*reset_get_status)(const enum zynqmp_pm_reset reset, u32 *status);
        int (*init_finalize)(void);
        int (*set_suspend_mode)(u32 mode);
@@ -336,6 +334,8 @@ int zynqmp_pm_set_pll_frac_data(u32 clk_id, u32 data);
 int zynqmp_pm_get_pll_frac_data(u32 clk_id, u32 *data);
 int zynqmp_pm_set_sd_tapdelay(u32 node_id, u32 type, u32 value);
 int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type);
+int zynqmp_pm_reset_assert(const enum zynqmp_pm_reset reset,
+                          const enum zynqmp_pm_reset_action assert_flag);
 #else
 static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)
 {
@@ -414,6 +414,11 @@ static inline int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type)
 {
        return -ENODEV;
 }
+static inline int zynqmp_pm_reset_assert(const enum zynqmp_pm_reset reset,
+                          const enum zynqmp_pm_reset_action assert_flag)
+{
+       return -ENODEV;
+}
 #endif
 
 #endif /* __FIRMWARE_ZYNQMP_H__ */