diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2023-04-26 11:03:57 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2023-04-26 11:06:00 +0200 |
| commit | 7e0664b660bc8f977d2948d8c8fbfc4809b3e6b4 (patch) | |
| tree | e7b9eeb7053a8612699b7a910d61d27446528a7b /include | |
| parent | f7abf14f0001a5a47539d9f60bbdca649e43536b (diff) | |
| parent | e2a1406c84c43bd104e2f85c4d8ab0b0b1609ab0 (diff) | |
Merge tag 'timers-v6.4-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clocksource and clockevent updates from Daniel Lezcano:
- Fix error returned for shared timers on Exynos MCT timers (Krzysztof Kozlowski)
- Code reorg by splitting the CPUXGPT timer code (AngeloGioacchino Del Regno)
- Remove the unused mxc_timer_init() function on i.MX (Fabio Estevam)
- Replace of_get_address() and of_translate_address() calls with
single call to of_address_to_resource() on TI timer (Rob Herring)
- Mark driver as non-removable and remove useless remove() callback on
SH MTU2 and STM32 LP timers. Improve the error message in the remove
callback of the TI DM timer (Uwe Kleine-König)
- Convert to platform remove callback returning void on Tegra186, TI
DM timers (Uwe Kleine-König)
- Drop pointless of_match_ptr for ID table in the STM32 LP timer
(Krzysztof Kozlowski)
- Fix memory leak in davinci_timer_register when init fails on DaVinci
(Qinrun Dai)
- Fix finding alwon timer regression on Timer TI DM (Tony Lindgren)
- Use of_property_read_bool() for boolean properties on TI timer (Rob
Herring)
- Drop superfluous rk3288 compatible and add rk3588 compatible DT
bindings (Cristian Ciocaltea)
Link: htttps://lore.kernel.org/lkml/d30fd923-e6e5-a1a6-ca76-1b39f8fad6c9@linaro.org
Diffstat (limited to 'include')
| -rw-r--r-- | include/soc/imx/timer.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/soc/imx/timer.h b/include/soc/imx/timer.h index b888d5076b4d..25f29c6bbd0b 100644 --- a/include/soc/imx/timer.h +++ b/include/soc/imx/timer.h @@ -13,11 +13,4 @@ enum imx_gpt_type { GPT_TYPE_IMX6DL, /* i.MX6DL/SX/SL */ }; -/* - * This is a stop-gap solution for clock drivers like imx1/imx21 which call - * mxc_timer_init() to initialize timer for non-DT boot. It can be removed - * when these legacy non-DT support is converted or dropped. - */ -void mxc_timer_init(unsigned long pbase, int irq, enum imx_gpt_type type); - #endif /* __SOC_IMX_TIMER_H__ */ |