imx8: move SIP macro to common header

Move the SIP macro to common header and unify the name to
make others could reuse them.

Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/mach-imx/imx8/misc.c b/arch/arm/mach-imx/imx8/misc.c
index 00fe4670bbc10a28b1625e284493fb9ff00dbb36..76d6571d8bfa760811939d05e0f85f94171411d7 100644 (file)
--- a/arch/arm/mach-imx/imx8/misc.c
+++ b/arch/arm/mach-imx/imx8/misc.c
@@ -2,6 +2,7 @@
 #include <common.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/mach-imx/sys_proto.h>
+#include <imx_sip.h>
 
 int sc_pm_setup_uart(sc_rsrc_t uart_rsrc, sc_pm_clock_rate_t clk_rate)
 {
@@ -26,9 +27,6 @@ int sc_pm_setup_uart(sc_rsrc_t uart_rsrc, sc_pm_clock_rate_t clk_rate)
        return 0;
 }
 
-#define FSL_SIP_BUILDINFO                      0xC2000003
-#define FSL_SIP_BUILDINFO_GET_COMMITHASH       0x00
-
 void build_info(void)
 {
        u32 seco_build = 0, seco_commit = 0;
@@ -51,8 +49,8 @@ void build_info(void)
        }
 
        /* Get ARM Trusted Firmware commit id */
-       atf_commit = call_imx_sip(FSL_SIP_BUILDINFO,
-                                 FSL_SIP_BUILDINFO_GET_COMMITHASH, 0, 0, 0);
+       atf_commit = call_imx_sip(IMX_SIP_BUILDINFO,
+                                 IMX_SIP_BUILDINFO_GET_COMMITHASH, 0, 0, 0);
        if (atf_commit == 0xffffffff) {
                debug("ATF does not support build info\n");
                atf_commit = 0x30; /* Display 0 */

diff --git a/include/imx_sip.h b/include/imx_sip.h
index 139ff61b8acf1e3b0d007782c9d953367ca731ff..26dbe0421a078ced6e6e675107e5f53ea9ed3637 100644 (file)
--- a/include/imx_sip.h
+++ b/include/imx_sip.h
@@ -7,7 +7,10 @@
 #define _IMX_SIP_H_
 
 #define IMX_SIP_GPC            0xC2000000
-#define  IMX_SIP_GPC_PM_DOMAIN 0x03
+#define IMX_SIP_GPC_PM_DOMAIN  0x03
+
+#define IMX_SIP_BUILDINFO                      0xC2000003
+#define IMX_SIP_BUILDINFO_GET_COMMITHASH       0x00
 
 #define IMX_SIP_SRC            0xC2000005
 #define IMX_SIP_SRC_M4_START   0x00