diff --git a/libplatsupport/CMakeLists.txt b/libplatsupport/CMakeLists.txt
index 0bae33f2c..d1432a6d8 100644
--- a/libplatsupport/CMakeLists.txt
+++ b/libplatsupport/CMakeLists.txt
@@ -96,13 +96,13 @@ elseif(KernelPlatformExynos4 OR KernelPlatformExynos5410 OR KernelPlatformExynos
     list(APPEND deps src/mach/${LibPlatSupportMach}/clock/exynos_common_clock.c)
 endif()
 
-if(KernelPlatImx6 OR KernelPlatformImx7Sabre)
+if(KernelPlatImx6)
     list(APPEND deps src/mach/${LibPlatSupportMach}/epit/epit.c)
 endif()
 
 if(
     KernelPlatImx6
-    OR KernelPlatformImx7Sabre
+    OR KernelPlatImx7
     OR KernelPlatformImx8mq-evk
     OR KernelPlatformImx8mm-evk
     OR KernelPlatformImx8mp-evk
diff --git a/libplatsupport/plat_include/imx7/platsupport/plat/timer.h b/libplatsupport/plat_include/imx7/platsupport/plat/timer.h
index 9ecffaae2..4f17bdf1a 100644
--- a/libplatsupport/plat_include/imx7/platsupport/plat/timer.h
+++ b/libplatsupport/plat_include/imx7/platsupport/plat/timer.h
@@ -50,7 +50,7 @@ static inline void imx_stop_timeout(imx_timers_t *timers)
     gpt_stop(&timers->timeout);
 }
 
-static inline int imx_init_timer(gpt_t *gpt, ps_io_ops_t *io_ops, ltimer_callback_fn_t user_callback,
+static inline int imx_init_timer(gpt_t *gpt, ps_io_ops_t io_ops, ltimer_callback_fn_t user_callback,
                                  void *user_callback_token, char *device_path)
 {
     gpt_config_t config = {
@@ -63,7 +63,7 @@ static inline int imx_init_timer(gpt_t *gpt, ps_io_ops_t *io_ops, ltimer_callbac
     return gpt_init(gpt, config);
 }
 
-static inline int imx_init_timestamp(imx_timers_t *timers, ps_io_ops_t *io_ops, ltimer_callback_fn_t user_callback,
+static inline int imx_init_timestamp(imx_timers_t *timers, ps_io_ops_t io_ops, ltimer_callback_fn_t user_callback,
                                      void *user_callback_token)
 {
     return imx_init_timer(&timers->timestamp, io_ops, user_callback, user_callback_token, GPT1_PATH);
@@ -74,7 +74,7 @@ static inline int imx_destroy_timestamp(imx_timers_t *timers)
     return gpt_destroy(&timers->timestamp);
 }
 
-static inline int imx_init_timeout(imx_timers_t *timers, ps_io_ops_t *io_ops, ltimer_callback_fn_t user_callback,
+static inline int imx_init_timeout(imx_timers_t *timers, ps_io_ops_t io_ops, ltimer_callback_fn_t user_callback,
                                    void *user_callback_token)
 {
     return imx_init_timer(&timers->timeout, io_ops, user_callback, user_callback_token, GPT2_PATH);