From 8fa9a67cc4938ce6c2c1c09a2d0c9e3f7dcd835c Mon Sep 17 00:00:00 2001 From: Ranjani Vaidyanathan Date: Mon, 28 Aug 2017 19:16:33 -0500 Subject: Update to the latest SCFW API. Signed-off-by: Ranjani Vaidyanathan --- plat/freescale/common/sci/svc/pad/pad_rpc_clnt.c | 89 +++++++++++++----------- plat/freescale/common/sci/svc/pad/rpc.h | 37 +++++----- 2 files changed, 66 insertions(+), 60 deletions(-) mode change 100644 => 100755 plat/freescale/common/sci/svc/pad/pad_rpc_clnt.c mode change 100644 => 100755 plat/freescale/common/sci/svc/pad/rpc.h (limited to 'plat/freescale/common/sci/svc/pad') diff --git a/plat/freescale/common/sci/svc/pad/pad_rpc_clnt.c b/plat/freescale/common/sci/svc/pad/pad_rpc_clnt.c old mode 100644 new mode 100755 index 4b0ef948..b5e79f1d --- a/plat/freescale/common/sci/svc/pad/pad_rpc_clnt.c +++ b/plat/freescale/common/sci/svc/pad/pad_rpc_clnt.c @@ -7,7 +7,7 @@ /*! * File containing client-side RPC functions for the PAD service. These - * function are ported to clients that communicate to the SC. + * functions are ported to clients that communicate to the SC. * * @addtogroup PAD_SVC * @{ @@ -50,7 +50,8 @@ sc_err_t sc_pad_set_mux(sc_ipc_t ipc, sc_pad_t pad, } sc_err_t sc_pad_get_mux(sc_ipc_t ipc, sc_pad_t pad, - uint8_t *mux, sc_pad_config_t *config, sc_pad_iso_t *iso) + uint8_t *mux, sc_pad_config_t *config, + sc_pad_iso_t *iso) { sc_rpc_msg_t msg; uint8_t result; @@ -110,8 +111,7 @@ sc_err_t sc_pad_get_gp(sc_ipc_t ipc, sc_pad_t pad, uint32_t *ctrl) return (sc_err_t) result; } -sc_err_t sc_pad_set_wakeup(sc_ipc_t ipc, sc_pad_t pad, - sc_pad_wakeup_t wakeup) +sc_err_t sc_pad_set_wakeup(sc_ipc_t ipc, sc_pad_t pad, sc_pad_wakeup_t wakeup) { sc_rpc_msg_t msg; uint8_t result; @@ -129,8 +129,7 @@ sc_err_t sc_pad_set_wakeup(sc_ipc_t ipc, sc_pad_t pad, return (sc_err_t) result; } -sc_err_t sc_pad_get_wakeup(sc_ipc_t ipc, sc_pad_t pad, - sc_pad_wakeup_t *wakeup) +sc_err_t sc_pad_get_wakeup(sc_ipc_t ipc, sc_pad_t pad, sc_pad_wakeup_t *wakeup) { sc_rpc_msg_t msg; uint8_t result; @@ -174,8 +173,8 @@ sc_err_t sc_pad_set_all(sc_ipc_t ipc, sc_pad_t pad, uint8_t mux, } sc_err_t sc_pad_get_all(sc_ipc_t ipc, sc_pad_t pad, uint8_t *mux, - sc_pad_config_t *config, sc_pad_iso_t *iso, uint32_t *ctrl, - sc_pad_wakeup_t *wakeup) + sc_pad_config_t *config, sc_pad_iso_t *iso, + uint32_t *ctrl, sc_pad_wakeup_t *wakeup) { sc_rpc_msg_t msg; uint8_t result; @@ -239,23 +238,19 @@ sc_err_t sc_pad_get(sc_ipc_t ipc, sc_pad_t pad, uint32_t *val) return (sc_err_t) result; } -sc_err_t sc_pad_set_gp_28lpp(sc_ipc_t ipc, sc_pad_t pad, - sc_pad_28lpp_dse_t dse, bool sre, bool hys, bool pe, - sc_pad_28lpp_ps_t ps) +sc_err_t sc_pad_set_gp_28fdsoi(sc_ipc_t ipc, sc_pad_t pad, + sc_pad_28fdsoi_dse_t dse, sc_pad_28fdsoi_ps_t ps) { sc_rpc_msg_t msg; uint8_t result; RPC_VER(&msg) = SC_RPC_VERSION; RPC_SVC(&msg) = SC_RPC_SVC_PAD; - RPC_FUNC(&msg) = PAD_FUNC_SET_GP_28LPP; + RPC_FUNC(&msg) = PAD_FUNC_SET_GP_28FDSOI; RPC_U16(&msg, 0) = pad; RPC_U8(&msg, 2) = dse; RPC_U8(&msg, 3) = ps; - RPC_U8(&msg, 4) = sre; - RPC_U8(&msg, 5) = hys; - RPC_U8(&msg, 6) = pe; - RPC_SIZE(&msg) = 3; + RPC_SIZE(&msg) = 2; sc_call_rpc(ipc, &msg, false); @@ -263,16 +258,16 @@ sc_err_t sc_pad_set_gp_28lpp(sc_ipc_t ipc, sc_pad_t pad, return (sc_err_t) result; } -sc_err_t sc_pad_get_gp_28lpp(sc_ipc_t ipc, sc_pad_t pad, - sc_pad_28lpp_dse_t *dse, bool *sre, bool *hys, bool *pe, - sc_pad_28lpp_ps_t *ps) +sc_err_t sc_pad_get_gp_28fdsoi(sc_ipc_t ipc, sc_pad_t pad, + sc_pad_28fdsoi_dse_t *dse, + sc_pad_28fdsoi_ps_t *ps) { sc_rpc_msg_t msg; uint8_t result; RPC_VER(&msg) = SC_RPC_VERSION; RPC_SVC(&msg) = SC_RPC_SVC_PAD; - RPC_FUNC(&msg) = PAD_FUNC_GET_GP_28LPP; + RPC_FUNC(&msg) = PAD_FUNC_GET_GP_28FDSOI; RPC_U16(&msg, 0) = pad; RPC_SIZE(&msg) = 2; @@ -283,28 +278,27 @@ sc_err_t sc_pad_get_gp_28lpp(sc_ipc_t ipc, sc_pad_t pad, *dse = RPC_U8(&msg, 0); if (ps != NULL) *ps = RPC_U8(&msg, 1); - if (sre != NULL) - *sre = RPC_U8(&msg, 2); - if (hys != NULL) - *hys = RPC_U8(&msg, 3); - if (pe != NULL) - *pe = RPC_U8(&msg, 4); return (sc_err_t) result; } -sc_err_t sc_pad_set_gp_28fdsoi(sc_ipc_t ipc, sc_pad_t pad, - sc_pad_28fdsoi_dse_t dse, sc_pad_28fdsoi_ps_t ps) +sc_err_t sc_pad_set_gp_28fdsoi_hsic(sc_ipc_t ipc, sc_pad_t pad, + sc_pad_28fdsoi_dse_t dse, bool hys, + sc_pad_28fdsoi_pus_t pus, bool pke, + bool pue) { sc_rpc_msg_t msg; uint8_t result; RPC_VER(&msg) = SC_RPC_VERSION; RPC_SVC(&msg) = SC_RPC_SVC_PAD; - RPC_FUNC(&msg) = PAD_FUNC_SET_GP_28FDSOI; + RPC_FUNC(&msg) = PAD_FUNC_SET_GP_28FDSOI_HSIC; RPC_U16(&msg, 0) = pad; RPC_U8(&msg, 2) = dse; - RPC_U8(&msg, 3) = ps; - RPC_SIZE(&msg) = 2; + RPC_U8(&msg, 3) = pus; + RPC_U8(&msg, 4) = hys; + RPC_U8(&msg, 5) = pke; + RPC_U8(&msg, 6) = pue; + RPC_SIZE(&msg) = 3; sc_call_rpc(ipc, &msg, false); @@ -312,15 +306,17 @@ sc_err_t sc_pad_set_gp_28fdsoi(sc_ipc_t ipc, sc_pad_t pad, return (sc_err_t) result; } -sc_err_t sc_pad_get_gp_28fdsoi(sc_ipc_t ipc, sc_pad_t pad, - sc_pad_28fdsoi_dse_t *dse, sc_pad_28fdsoi_ps_t *ps) +sc_err_t sc_pad_get_gp_28fdsoi_hsic(sc_ipc_t ipc, sc_pad_t pad, + sc_pad_28fdsoi_dse_t *dse, bool *hys, + sc_pad_28fdsoi_pus_t * pus, bool *pke, + bool *pue) { sc_rpc_msg_t msg; uint8_t result; RPC_VER(&msg) = SC_RPC_VERSION; RPC_SVC(&msg) = SC_RPC_SVC_PAD; - RPC_FUNC(&msg) = PAD_FUNC_GET_GP_28FDSOI; + RPC_FUNC(&msg) = PAD_FUNC_GET_GP_28FDSOI_HSIC; RPC_U16(&msg, 0) = pad; RPC_SIZE(&msg) = 2; @@ -329,14 +325,21 @@ sc_err_t sc_pad_get_gp_28fdsoi(sc_ipc_t ipc, sc_pad_t pad, result = RPC_R8(&msg); if (dse != NULL) *dse = RPC_U8(&msg, 0); - if (ps != NULL) - *ps = RPC_U8(&msg, 1); + if (pus != NULL) + *pus = RPC_U8(&msg, 1); + if (hys != NULL) + *hys = RPC_U8(&msg, 2); + if (pke != NULL) + *pke = RPC_U8(&msg, 3); + if (pue != NULL) + *pue = RPC_U8(&msg, 4); return (sc_err_t) result; } sc_err_t sc_pad_set_gp_28fdsoi_comp(sc_ipc_t ipc, sc_pad_t pad, - uint8_t compen, bool fastfrz, uint8_t rasrcp, uint8_t rasrcn, - bool nasrc_sel) + uint8_t compen, bool fastfrz, + uint8_t rasrcp, uint8_t rasrcn, + bool nasrc_sel, bool psw_ovr) { sc_rpc_msg_t msg; uint8_t result; @@ -350,6 +353,7 @@ sc_err_t sc_pad_set_gp_28fdsoi_comp(sc_ipc_t ipc, sc_pad_t pad, RPC_U8(&msg, 4) = rasrcn; RPC_U8(&msg, 5) = fastfrz; RPC_U8(&msg, 6) = nasrc_sel; + RPC_U8(&msg, 7) = psw_ovr; RPC_SIZE(&msg) = 3; sc_call_rpc(ipc, &msg, false); @@ -359,8 +363,10 @@ sc_err_t sc_pad_set_gp_28fdsoi_comp(sc_ipc_t ipc, sc_pad_t pad, } sc_err_t sc_pad_get_gp_28fdsoi_comp(sc_ipc_t ipc, sc_pad_t pad, - uint8_t *compen, bool *fastfrz, uint8_t *rasrcp, uint8_t *rasrcn, - bool *nasrc_sel, bool *compok, uint8_t *nasrc) + uint8_t *compen, bool *fastfrz, + uint8_t *rasrcp, uint8_t *rasrcn, + bool *nasrc_sel, bool *compok, + uint8_t *nasrc, bool *psw_ovr) { sc_rpc_msg_t msg; uint8_t result; @@ -388,8 +394,9 @@ sc_err_t sc_pad_get_gp_28fdsoi_comp(sc_ipc_t ipc, sc_pad_t pad, *nasrc_sel = RPC_U8(&msg, 5); if (compok != NULL) *compok = RPC_U8(&msg, 6); + if (psw_ovr != NULL) + *psw_ovr = RPC_U8(&msg, 7); return (sc_err_t) result; } /**@}*/ - diff --git a/plat/freescale/common/sci/svc/pad/rpc.h b/plat/freescale/common/sci/svc/pad/rpc.h old mode 100644 new mode 100755 index f0f32aff..c86b295a --- a/plat/freescale/common/sci/svc/pad/rpc.h +++ b/plat/freescale/common/sci/svc/pad/rpc.h @@ -24,25 +24,24 @@ /*! * This type is used to indicate RPC PAD function calls. */ -typedef enum pad_func_e -{ - PAD_FUNC_UNKNOWN = 0, /*!< Unknown function */ - PAD_FUNC_SET_MUX = 1, /*!< Index for pad_set_mux() RPC call */ - PAD_FUNC_GET_MUX = 6, /*!< Index for pad_get_mux() RPC call */ - PAD_FUNC_SET_GP = 2, /*!< Index for pad_set_gp() RPC call */ - PAD_FUNC_GET_GP = 7, /*!< Index for pad_get_gp() RPC call */ - PAD_FUNC_SET_WAKEUP = 4, /*!< Index for pad_set_wakeup() RPC call */ - PAD_FUNC_GET_WAKEUP = 9, /*!< Index for pad_get_wakeup() RPC call */ - PAD_FUNC_SET_ALL = 5, /*!< Index for pad_set_all() RPC call */ - PAD_FUNC_GET_ALL = 10, /*!< Index for pad_get_all() RPC call */ - PAD_FUNC_SET = 15, /*!< Index for pad_set() RPC call */ - PAD_FUNC_GET = 16, /*!< Index for pad_get() RPC call */ - PAD_FUNC_SET_GP_28LPP = 3, /*!< Index for pad_set_gp_28lpp() RPC call */ - PAD_FUNC_GET_GP_28LPP = 8, /*!< Index for pad_get_gp_28lpp() RPC call */ - PAD_FUNC_SET_GP_28FDSOI = 11, /*!< Index for pad_set_gp_28fdsoi() RPC call */ - PAD_FUNC_GET_GP_28FDSOI = 12, /*!< Index for pad_get_gp_28fdsoi() RPC call */ - PAD_FUNC_SET_GP_28FDSOI_COMP = 13, /*!< Index for pad_set_gp_28fdsoi_comp() RPC call */ - PAD_FUNC_GET_GP_28FDSOI_COMP = 14, /*!< Index for pad_get_gp_28fdsoi_comp() RPC call */ +typedef enum pad_func_e { + PAD_FUNC_UNKNOWN = 0, /* Unknown function */ + PAD_FUNC_SET_MUX = 1, /* Index for pad_set_mux() RPC call */ + PAD_FUNC_GET_MUX = 6, /* Index for pad_get_mux() RPC call */ + PAD_FUNC_SET_GP = 2, /* Index for pad_set_gp() RPC call */ + PAD_FUNC_GET_GP = 7, /* Index for pad_get_gp() RPC call */ + PAD_FUNC_SET_WAKEUP = 4, /* Index for pad_set_wakeup() RPC call */ + PAD_FUNC_GET_WAKEUP = 9, /* Index for pad_get_wakeup() RPC call */ + PAD_FUNC_SET_ALL = 5, /* Index for pad_set_all() RPC call */ + PAD_FUNC_GET_ALL = 10, /* Index for pad_get_all() RPC call */ + PAD_FUNC_SET = 15, /* Index for pad_set() RPC call */ + PAD_FUNC_GET = 16, /* Index for pad_get() RPC call */ + PAD_FUNC_SET_GP_28FDSOI = 11, /* Index for pad_set_gp_28fdsoi() RPC call */ + PAD_FUNC_GET_GP_28FDSOI = 12, /* Index for pad_get_gp_28fdsoi() RPC call */ + PAD_FUNC_SET_GP_28FDSOI_HSIC = 3, /* Index for pad_set_gp_28fdsoi_hsic() RPC call */ + PAD_FUNC_GET_GP_28FDSOI_HSIC = 8, /* Index for pad_get_gp_28fdsoi_hsic() RPC call */ + PAD_FUNC_SET_GP_28FDSOI_COMP = 13, /* Index for pad_set_gp_28fdsoi_comp() RPC call */ + PAD_FUNC_GET_GP_28FDSOI_COMP = 14, /* Index for pad_get_gp_28fdsoi_comp() RPC call */ } pad_func_t; /* Functions */ -- cgit v1.2.3