Commit 5e76731d authored by Rajan Vaja's avatar Rajan Vaja Committed by Greg Kroah-Hartman
Browse files

firmware: xilinx: Remove eemi ops for clock_getstate 



Use direct function call instead of eemi ops for clock_getstate.

Signed-off-by: default avatarRajan Vaja <rajan.vaja@xilinx.com>
Signed-off-by: default avatarJolly Shah <jolly.shah@xilinx.com>
Link: https://lore.kernel.org/r/1587761887-4279-7-git-send-email-jolly.shah@xilinx.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f5ccd54b

drivers/clk/zynqmp/clk-gate-zynqmp.c

+1 −2
Original line number Diff line number Diff line
@@ -77,9 +77,8 @@ static int zynqmp_clk_gate_is_enabled(struct clk_hw *hw) 
	const char *clk_name = clk_hw_get_name(hw);

	u32 clk_id = gate->clk_id;

	int state, ret;

	const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();



	ret = eemi_ops->clock_getstate(clk_id, &state);

	ret = zynqmp_pm_clock_getstate(clk_id, &state);

	if (ret) {

		pr_warn_once("%s() clock get state failed for %s, ret = %d\n",

			     __func__, clk_name, ret);

drivers/clk/zynqmp/pll.c

+1 −2
Original line number Diff line number Diff line
@@ -222,9 +222,8 @@ static int zynqmp_pll_is_enabled(struct clk_hw *hw) 
	u32 clk_id = clk->clk_id;

	unsigned int state;

	int ret;

	const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();



	ret = eemi_ops->clock_getstate(clk_id, &state);

	ret = zynqmp_pm_clock_getstate(clk_id, &state);

	if (ret) {

		pr_warn_once("%s() clock get state failed for %s, ret = %d\n",

			     __func__, clk_name, ret);

drivers/firmware/xilinx/zynqmp.c

+2 −2
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_clock_disable); 
 *

 * Return: Returns status, either success or error+reason

 */

static int zynqmp_pm_clock_getstate(u32 clock_id, u32 *state)

int zynqmp_pm_clock_getstate(u32 clock_id, u32 *state)

{

	u32 ret_payload[PAYLOAD_ARG_CNT];

	int ret;
@@ -393,6 +393,7 @@ static int zynqmp_pm_clock_getstate(u32 clock_id, u32 *state) 


	return ret;

}

EXPORT_SYMBOL_GPL(zynqmp_pm_clock_getstate);



/**

 * zynqmp_pm_clock_setdivider() - Set the clock divider for given id
@@ -739,7 +740,6 @@ static int zynqmp_pm_aes_engine(const u64 address, u32 *out) 
}



static const struct zynqmp_eemi_ops eemi_ops = {

	.clock_getstate = zynqmp_pm_clock_getstate,

	.clock_setdivider = zynqmp_pm_clock_setdivider,

	.clock_getdivider = zynqmp_pm_clock_getdivider,

	.clock_setrate = zynqmp_pm_clock_setrate,

include/linux/firmware/xlnx-zynqmp.h

+5 −1
Original line number Diff line number Diff line
@@ -296,7 +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 (*clock_getstate)(u32 clock_id, u32 *state);

	int (*clock_setdivider)(u32 clock_id, u32 divider);

	int (*clock_getdivider)(u32 clock_id, u32 *divider);

	int (*clock_setrate)(u32 clock_id, u64 rate);
@@ -331,6 +330,7 @@ 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_clock_enable(u32 clock_id);

int zynqmp_pm_clock_disable(u32 clock_id);

int zynqmp_pm_clock_getstate(u32 clock_id, u32 *state);

#else

static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)

{
@@ -357,6 +357,10 @@ static inline int zynqmp_pm_clock_disable(u32 clock_id) 
{

	return -ENODEV;

}

static inline int zynqmp_pm_clock_getstate(u32 clock_id, u32 *state)

{

	return -ENODEV;

}

#endif



#endif /* __FIRMWARE_ZYNQMP_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE