Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix libplatsupport for Imx7 #187

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libplatsupport/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions libplatsupport/plat_include/imx7/platsupport/plat/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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);
Expand All @@ -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);
Expand Down
Loading