diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2023-06-26 11:04:01 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2023-06-26 11:04:01 +0200 |
| commit | d2b32be7debd6c0deeae95844997bd89fbe4769d (patch) | |
| tree | ce442ebb18aab798872aa40e1103f41ad98313f8 /include | |
| parent | hrtimer: Add missing sparse annotations to hrtimer locking (diff) | |
| parent | clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe (diff) | |
| download | wireguard-linux-d2b32be7debd6c0deeae95844997bd89fbe4769d.tar.xz wireguard-linux-d2b32be7debd6c0deeae95844997bd89fbe4769d.zip | |
Merge tag 'timers-v6.5-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent/source updates from Daniel Lezcano:
- Fix memory leak on Cadence TTC at probe time (Feng Mingxi)
- Use the pm_sleep_ptr macro for the Ingenic driver (Paul Cercueil)
- Relocate the PMW timer Loongson from the mips arch directory to the
drivers/clocksource (Keguang Zhang)
- Use the same function names instead of using aliases and move data
defined in the header to the driver directly as this one is the only
user of the header file and remove this one on i.MX GPT (Uwe
Kleine-König)
- Convert Broadcom Kona family timer bindings to DT schema (Michael
Kelley)
- Add DT bindings for Ralink SoCs timer (Sergio Paracuellos)
Diffstat (limited to 'include')
| -rw-r--r-- | include/soc/imx/timer.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/soc/imx/timer.h b/include/soc/imx/timer.h deleted file mode 100644 index 25f29c6bbd0b..000000000000 --- a/include/soc/imx/timer.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright 2015 Linaro Ltd. - */ - -#ifndef __SOC_IMX_TIMER_H__ -#define __SOC_IMX_TIMER_H__ - -enum imx_gpt_type { - GPT_TYPE_IMX1, /* i.MX1 */ - GPT_TYPE_IMX21, /* i.MX21/27 */ - GPT_TYPE_IMX31, /* i.MX31/35/25/37/51/6Q */ - GPT_TYPE_IMX6DL, /* i.MX6DL/SX/SL */ -}; - -#endif /* __SOC_IMX_TIMER_H__ */ |