diff options
| author | Octavian Purdila <octavian.purdila@nxp.com> | 2017-02-14 14:56:27 +0200 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 15e40b8035c178af9bf897ad8d8f772d351eca27 (patch) | |
| tree | 4ce94d8a75248c57f2dc5d973bb251f224d4f0cb /drivers/clocksource | |
| parent | 03f1de18c4d0a887f9aa08bd1a6391e6970c3a27 (diff) | |
MLK-13927 ARM: imx: remove time.c
arch/arm/mach-imx/time.c has been moved to a new location upstream but
during the rebase process from 4.1 to 4.9 it was reintroduced in
error.
This patch removes the old file and updates the new file with changes
from commit 67000df ("MLK-13303-7 ARM: imx: add gpt timer support for
i.mx6sll").
Note that commit 4c4769ba1cb5c0f1 ("MLK-12627-01 ARM: imx: add
i.mx6ull msl support") does not introduce changes to the new
implementation since imx6ull DTSs use "fsl,imx6ul-gpt" for compatible
properties.
Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/timer-imx-gpt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index 9a863fab46e0..d65387218418 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -556,6 +556,7 @@ CLOCKSOURCE_OF_DECLARE(imx53_timer, "fsl,imx53-gpt", imx31_timer_init_dt); CLOCKSOURCE_OF_DECLARE(imx6q_timer, "fsl,imx6q-gpt", imx31_timer_init_dt); CLOCKSOURCE_OF_DECLARE(imx6dl_timer, "fsl,imx6dl-gpt", imx6dl_timer_init_dt); CLOCKSOURCE_OF_DECLARE(imx6sl_timer, "fsl,imx6sl-gpt", imx6dl_timer_init_dt); +CLOCKSOURCE_OF_DECLARE(imx6sll_timer, "fsl,imx6sll-gpt", imx6dl_timer_init_dt); CLOCKSOURCE_OF_DECLARE(imx6sx_timer, "fsl,imx6sx-gpt", imx6dl_timer_init_dt); CLOCKSOURCE_OF_DECLARE(imx6ul_timer, "fsl,imx6ul-gpt", imx6dl_timer_init_dt); CLOCKSOURCE_OF_DECLARE(mx7d_timer, "fsl,imx7d-gpt", imx6dl_timer_init_dt); |