From: Jolly Shah <jolly.shah@xilinx.com>
To: ard.biesheuvel@linaro.org, mingo@kernel.org,
gregkh@linuxfoundation.org, matt@codeblueprint.co.uk,
sudeep.holla@arm.com, hkallweit1@gmail.com,
keescook@chromium.org, dmitry.torokhov@gmail.com,
michal.simek@xilinx.com
Cc: rajanv@xilinx.com, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Rajan Vaja <rajan.vaja@xilinx.com>,
Jolly Shah <jolly.shah@xilinx.com>
Subject: [PATCH v4 04/25] firmware: xilinx: Remove eemi ops for clock_enable
Date: Thu, 9 Apr 2020 12:11:53 -0700 [thread overview]
Message-ID: <1586459534-8997-5-git-send-email-jolly.shah@xilinx.com> (raw)
In-Reply-To: <1586459534-8997-1-git-send-email-jolly.shah@xilinx.com>
From: Rajan Vaja <rajan.vaja@xilinx.com>
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>
---
drivers/clk/zynqmp/clk-gate-zynqmp.c | 2 +-
drivers/clk/zynqmp/pll.c | 3 +--
drivers/firmware/xilinx/zynqmp.c | 4 ++--
include/linux/firmware/xlnx-zynqmp.h | 6 +++++-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/clk/zynqmp/clk-gate-zynqmp.c b/drivers/clk/zynqmp/clk-gate-zynqmp.c
index 83b236f..437b921 100644
--- a/drivers/clk/zynqmp/clk-gate-zynqmp.c
+++ b/drivers/clk/zynqmp/clk-gate-zynqmp.c
@@ -39,7 +39,7 @@ static int zynqmp_clk_gate_enable(struct clk_hw *hw)
int ret;
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)
pr_warn_once("%s() clock enabled failed for %s, ret = %d\n",
diff --git a/drivers/clk/zynqmp/pll.c b/drivers/clk/zynqmp/pll.c
index 89b5995..153aa67 100644
--- a/drivers/clk/zynqmp/pll.c
+++ b/drivers/clk/zynqmp/pll.c
@@ -246,12 +246,11 @@ static int zynqmp_pll_enable(struct clk_hw *hw)
const char *clk_name = clk_hw_get_name(hw);
u32 clk_id = clk->clk_id;
int ret;
- const struct zynqmp_eemi_ops *eemi_ops = zynqmp_pm_get_eemi_ops();
if (zynqmp_pll_is_enabled(hw))
return 0;
- ret = eemi_ops->clock_enable(clk_id);
+ ret = zynqmp_pm_clock_enable(clk_id);
if (ret)
pr_warn_once("%s() clock enable failed for %s, ret = %d\n",
__func__, clk_name, ret);
diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 3fbab29..da13627 100644
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -351,10 +351,11 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_query_data);
*
* 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);
}
+EXPORT_SYMBOL_GPL(zynqmp_pm_clock_enable);
/**
* 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 = {
- .clock_enable = zynqmp_pm_clock_enable,
.clock_disable = zynqmp_pm_clock_disable,
.clock_getstate = zynqmp_pm_clock_getstate,
.clock_setdivider = zynqmp_pm_clock_setdivider,
diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
index fa1195c7..77365d1 100644
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -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_enable)(u32 clock_id);
int (*clock_disable)(u32 clock_id);
int (*clock_getstate)(u32 clock_id, u32 *state);
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_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);
#else
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;
}
+static inline int zynqmp_pm_clock_enable(u32 clock_id)
+{
+ return -ENODEV;
+}
#endif
#endif /* __FIRMWARE_ZYNQMP_H__ */
--
2.7.4
next prev parent reply other threads:[~2020-04-09 19:13 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 19:11 [PATCH v4 00/25] firmware: xilinx: Add xilinx specific sysfs interface Jolly Shah
2020-04-09 19:11 ` [PATCH v4 01/25] firmware: xilinx: Remove eemi ops for get_api_version Jolly Shah
2020-04-09 19:11 ` [PATCH v4 02/25] firmware: xilinx: Remove eemi ops for get_chipid Jolly Shah
2020-04-09 19:11 ` [PATCH v4 03/25] firmware: xilinx: Remove eemi ops for query_data Jolly Shah
2020-04-09 19:11 ` Jolly Shah [this message]
2020-04-09 19:11 ` [PATCH v4 05/25] firmware: xilinx: Remove eemi ops for clock_disable Jolly Shah
2020-04-09 19:11 ` [PATCH v4 06/25] firmware: xilinx: Remove eemi ops for clock_getstate Jolly Shah
2020-04-09 19:11 ` [PATCH v4 07/25] firmware: xilinx: Remove eemi ops for clock_setdivider Jolly Shah
2020-04-09 19:11 ` [PATCH v4 08/25] firmware: xilinx: Remove eemi ops for clock_getdivider Jolly Shah
2020-04-09 19:11 ` [PATCH v4 09/25] firmware: xilinx: Remove eemi ops for clock set/get rate Jolly Shah
2020-04-09 19:11 ` [PATCH v4 10/25] firmware: xilinx: Remove eemi ops for clock set/get parent Jolly Shah
2020-04-09 19:12 ` [PATCH v4 11/25] firmware: xilinx: Use APIs instead of IOCTLs Jolly Shah
2020-04-09 19:12 ` [PATCH v4 12/25] firmware: xilinx: Remove eemi ops for reset_assert Jolly Shah
2020-04-09 19:12 ` [PATCH v4 13/25] firmware: xilinx: Remove eemi ops for reset_get_status Jolly Shah
2020-04-09 19:12 ` [PATCH v4 14/25] firmware: xilinx: Remove eemi ops for init_finalize Jolly Shah
2020-04-09 19:12 ` [PATCH v4 15/25] firmware: xilinx: Remove eemi ops for set_suspend_mode Jolly Shah
2020-04-09 19:12 ` [PATCH v4 16/25] firmware: xilinx: Remove eemi ops for request_node Jolly Shah
2020-04-09 19:12 ` [PATCH v4 17/25] firmware: xilinx: Remove eemi ops for release_node Jolly Shah
2020-04-09 19:12 ` [PATCH v4 18/25] firmware: xilinx: Remove eemi ops for set_requirement Jolly Shah
2020-04-09 19:12 ` [PATCH v4 19/25] firmware: xilinx: Remove eemi ops for aes engine Jolly Shah
2020-04-09 19:12 ` [PATCH v4 20/25] firmware: xilinx: Remove eemi ops for fpga related APIs Jolly Shah
2020-04-09 19:12 ` [PATCH v4 21/25] firmware: xilinx: Add APIs to read/write GGS/PGGS registers Jolly Shah
2020-04-09 19:12 ` [PATCH v4 22/25] firmware: xilinx: Add sysfs interface Jolly Shah
2020-04-09 19:12 ` [PATCH v4 23/25] firmware: xilinx: Add system shutdown API interface Jolly Shah
2020-04-09 19:12 ` [PATCH v4 24/25] firmware: xilinx: Add sysfs to set shutdown scope Jolly Shah
2020-04-09 19:12 ` [PATCH v4 25/25] firmware: xilinx: Add sysfs and API to set boot health status Jolly Shah
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1586459534-8997-5-git-send-email-jolly.shah@xilinx.com \
--to=jolly.shah@xilinx.com \
--cc=ard.biesheuvel@linaro.org \
--cc=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hkallweit1@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=michal.simek@xilinx.com \
--cc=mingo@kernel.org \
--cc=rajan.vaja@xilinx.com \
--cc=rajanv@xilinx.com \
--cc=sudeep.holla@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).