openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

firmware: xilinx: Remove eemi ops for clock_enable 

Use direct function call for clock_enable instead of eemi ops.

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-5-git-send-email-jolly.shah@xilinx.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rajan Vaja 2020-04-24 13:57:46 -07:00 committed by Greg Kroah-Hartman
parent 6366c1bac3
commit 3637e84cd2
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/zynqmp/clk-gate-zynqmp.c
View File

@ -39,7 +39,7 @@ static int zynqmp_clk_gate_enable(struct clk_hw *hw)
int ret; int ret;
const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops(); const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();
ret = eemi_ops->clock_enable(clk_id); ret = zynqmp_pm_clock_enable(clk_id);
if (ret) if (ret)
pr_warn_once("%s() clock enabled failed for %s, ret = %d\n", pr_warn_once("%s() clock enabled failed for %s, ret = %d\n",

3
drivers/clk/zynqmp/pll.c
View File

@ -246,12 +246,11 @@ static int zynqmp_pll_enable(struct clk_hw *hw)
const char *clk_name = clk_hw_get_name(hw); const char *clk_name = clk_hw_get_name(hw);
u32 clk_id = clk->clk_id; u32 clk_id = clk->clk_id;
int ret; int ret;
const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();
if (zynqmp_pll_is_enabled(hw)) if (zynqmp_pll_is_enabled(hw))
return 0; return 0;
ret = eemi_ops->clock_enable(clk_id); ret = zynqmp_pm_clock_enable(clk_id);
if (ret) if (ret)
pr_warn_once("%s() clock enable failed for %s, ret = %d\n", pr_warn_once("%s() clock enable failed for %s, ret = %d\n",
__func__, clk_name, ret); __func__, clk_name, ret);

4
drivers/firmware/xilinx/zynqmp.c
View File

@ -351,10 +351,11 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_query_data);
* *
* Return: Returns status, either success or error+reason * Return: Returns status, either success or error+reason
*/ */
static int zynqmp_pm_clock_enable(u32 clock_id) int zynqmp_pm_clock_enable(u32 clock_id)
{ {
return zynqmp_pm_invoke_fn(PM_CLOCK_ENABLE, clock_id, 0, 0, 0, NULL); return zynqmp_pm_invoke_fn(PM_CLOCK_ENABLE, clock_id, 0, 0, 0, NULL);
} }
EXPORT_SYMBOL_GPL(zynqmp_pm_clock_enable);
/** /**
* zynqmp_pm_clock_disable() - Disable the clock for given id * zynqmp_pm_clock_disable() - Disable the clock for given id
@ -737,7 +738,6 @@ static int zynqmp_pm_aes_engine(const u64 address, u32 *out)
} }
static const struct zynqmp_eemi_ops eemi_ops = { static const struct zynqmp_eemi_ops eemi_ops = {
.clock_enable = zynqmp_pm_clock_enable,
.clock_disable = zynqmp_pm_clock_disable, .clock_disable = zynqmp_pm_clock_disable,
.clock_getstate = zynqmp_pm_clock_getstate, .clock_getstate = zynqmp_pm_clock_getstate,
.clock_setdivider = zynqmp_pm_clock_setdivider, .clock_setdivider = zynqmp_pm_clock_setdivider,

6
include/linux/firmware/xlnx-zynqmp.h
View File

@ -296,7 +296,6 @@ struct zynqmp_pm_query_data {
struct zynqmp_eemi_ops { struct zynqmp_eemi_ops {
int (*fpga_load)(const u64 address, const u32 size, const u32 flags); int (*fpga_load)(const u64 address, const u32 size, const u32 flags);
int (*fpga_get_status)(u32 *value); int (*fpga_get_status)(u32 *value);
int (*clock_enable)(u32 clock_id);
int (*clock_disable)(u32 clock_id); int (*clock_disable)(u32 clock_id);
int (*clock_getstate)(u32 clock_id, u32 *state); int (*clock_getstate)(u32 clock_id, u32 *state);
int (*clock_setdivider)(u32 clock_id, u32 divider); int (*clock_setdivider)(u32 clock_id, u32 divider);
@ -331,6 +330,7 @@ const struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void);
int zynqmp_pm_get_api_version(u32 *version); int zynqmp_pm_get_api_version(u32 *version);
int zynqmp_pm_get_chipid(u32 *idcode, u32 *version); int zynqmp_pm_get_chipid(u32 *idcode, u32 *version);
int zynqmp_pm_query_data(struct zynqmp_pm_query_data qdata, u32 *out); int zynqmp_pm_query_data(struct zynqmp_pm_query_data qdata, u32 *out);
int zynqmp_pm_clock_enable(u32 clock_id);
#else #else
static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void) static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)
{ {
@ -349,6 +349,10 @@ static inline int zynqmp_pm_query_data(struct zynqmp_pm_query_data qdata,
{ {
return -ENODEV; return -ENODEV;
} }
static inline int zynqmp_pm_clock_enable(u32 clock_id)
{
return -ENODEV;
}
#endif #endif
#endif /* __FIRMWARE_ZYNQMP_H__ */ #endif /* __FIRMWARE_ZYNQMP_H__ */