From: Joakim Zhang <qiangqing.zhang@nxp.com>
To: mkl@pengutronix.de, robh+dt@kernel.org, shawnguo@kernel.org,
s.hauer@pengutronix.de
Cc: kernel@pengutronix.de, linux-imx@nxp.com, victor.liu@nxp.com,
linux-can@vger.kernel.org, pankaj.bansal@nxp.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH V3 01/10] firmware: imx: always export SCU symbols
Date: Tue, 20 Oct 2020 23:53:53 +0800 [thread overview]
Message-ID: <20201020155402.30318-2-qiangqing.zhang@nxp.com> (raw)
In-Reply-To: <20201020155402.30318-1-qiangqing.zhang@nxp.com>
From: Liu Ying <victor.liu@nxp.com>
Always export SCU symbols for both SCU SoCs and non-SCU SoCs to avoid
build error.
Signed-off-by: Liu Ying <victor.liu@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
---
include/linux/firmware/imx/ipc.h | 15 +++++++++++++++
include/linux/firmware/imx/svc/misc.h | 23 +++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/include/linux/firmware/imx/ipc.h b/include/linux/firmware/imx/ipc.h
index 891057434858..300fa253fc30 100644
--- a/include/linux/firmware/imx/ipc.h
+++ b/include/linux/firmware/imx/ipc.h
@@ -34,6 +34,7 @@ struct imx_sc_rpc_msg {
uint8_t func;
};
+#if IS_ENABLED(CONFIG_IMX_SCU)
/*
* This is an function to send an RPC message over an IPC channel.
* It is called by client-side SCFW API function shims.
@@ -55,4 +56,18 @@ int imx_scu_call_rpc(struct imx_sc_ipc *ipc, void *msg, bool have_resp);
* @return Returns an error code (0 = success, failed if < 0)
*/
int imx_scu_get_handle(struct imx_sc_ipc **ipc);
+
+#else
+static inline int
+imx_scu_call_rpc(struct imx_sc_ipc *ipc, void *msg, bool have_resp)
+{
+ return -EIO;
+}
+
+static inline int imx_scu_get_handle(struct imx_sc_ipc **ipc)
+{
+ return -EIO;
+}
+#endif
+
#endif /* _SC_IPC_H */
diff --git a/include/linux/firmware/imx/svc/misc.h b/include/linux/firmware/imx/svc/misc.h
index 031dd4d3c766..d255048f17de 100644
--- a/include/linux/firmware/imx/svc/misc.h
+++ b/include/linux/firmware/imx/svc/misc.h
@@ -46,6 +46,7 @@ enum imx_misc_func {
* Control Functions
*/
+#if IS_ENABLED(CONFIG_IMX_SCU)
int imx_sc_misc_set_control(struct imx_sc_ipc *ipc, u32 resource,
u8 ctrl, u32 val);
@@ -55,4 +56,26 @@ int imx_sc_misc_get_control(struct imx_sc_ipc *ipc, u32 resource,
int imx_sc_pm_cpu_start(struct imx_sc_ipc *ipc, u32 resource,
bool enable, u64 phys_addr);
+#else
+static inline int
+imx_sc_misc_set_control(struct imx_sc_ipc *ipc, u32 resource,
+ u8 ctrl, u32 val)
+{
+ return -EIO;
+}
+
+static inline int
+imx_sc_misc_get_control(struct imx_sc_ipc *ipc, u32 resource,
+ u8 ctrl, u32 *val)
+{
+ return -EIO;
+}
+
+static inline int imx_sc_pm_cpu_start(struct imx_sc_ipc *ipc, u32 resource,
+ bool enable, u64 phys_addr)
+{
+ return -EIO;
+}
+#endif
+
#endif /* _SC_MISC_API_H */
--
2.17.1
next prev parent reply other threads:[~2020-10-20 7:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 15:53 [PATCH V3 00/10] can: flexcan: add stop mode support for i.MX8QM Joakim Zhang
2020-10-20 9:44 ` Marc Kleine-Budde
2020-10-20 15:53 ` Joakim Zhang [this message]
2020-10-20 15:53 ` [PATCH V3 02/10] dt-bindings: can: flexcan: fix fsl,clk-source property Joakim Zhang
2020-10-20 15:53 ` [PATCH V3 03/10] can: flexcan: remove FLEXCAN_QUIRK_DISABLE_MECR quirk for LS1021A Joakim Zhang
2020-10-20 15:53 ` [PATCH V3 04/10] can: flexcan: add ECC initialization for LX2160A Joakim Zhang
2020-10-20 15:53 ` [PATCH V3 05/10] can: flexcan: add ECC initialization for VF610 Joakim Zhang
2020-10-20 15:53 ` [PATCH V3 06/10] can: flexcan: disable wakeup in flexcan_remove() Joakim Zhang
2020-10-20 9:31 ` Marc Kleine-Budde
2020-10-20 10:29 ` Joakim Zhang
2020-10-20 10:41 ` Marc Kleine-Budde
2020-10-20 15:53 ` [PATCH V3 07/10] dt-bindings: can: flexcan: add fsl,scu-index property to indicate a resource Joakim Zhang
2020-10-20 15:54 ` [PATCH V3 08/10] can: flexcan: rename macro FLEXCAN_QUIRK_SETUP_STOP_MODE -> FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR Joakim Zhang
2020-10-20 15:54 ` [PATCH V3 09/10] dt-bindings: firmware: add IMX_SC_R_CAN(x) macro for CAN Joakim Zhang
2020-10-20 15:54 ` [PATCH V3 10/10] can: flexcan: add CAN wakeup function for i.MX8QM Joakim Zhang
2020-10-20 15:50 ` Marc Kleine-Budde
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=20201020155402.30318-2-qiangqing.zhang@nxp.com \
--to=qiangqing.zhang@nxp.com \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=pankaj.bansal@nxp.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=victor.liu@nxp.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.