diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-12-04 00:39:45 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-12-04 00:39:45 +0100 |
| commit | fef92cd2bc04c64bb3743d40c0b4be47aedf9e23 (patch) | |
| tree | 2a67e73223d40cd16f4b799830b0d13f711ad8b0 /include | |
| parent | b996544916429946bf4934c1c01a306d1690972c (diff) | |
| parent | ab3105446f1ec4e98fadfc998ee24feec271c16c (diff) | |
Merge tag 'timers-v5.11' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clocksource/event driver updates from Daniel Lezcano:
- Add static annotation for the sp804 init functions (Zhen Lei)
- Code cleanups and error code path at init time fixes on the sp804
(Kefen Wang)
- Add new OST timer driver device tree bindings (Zhou Yanjie)
- Remove EZChip NPS clocksource driver corresponding to the NPS
platform which was removed from the ARC architecture (Vineet Gupta)
- Add missing clk_disable_unprepare() on error path for Orion (Yang
Yingliang)
- Add device tree bindings documentation for Renesas r8a774e1
(Marian-Cristian Rotariu)
- Convert Renesas TMU to json-schema (Geert Uytterhoeven)
- Fix memory leak on the error path at init time on the cadence_ttc
driver (Yu Kuai)
- Fix section mismatch for Ingenic timer driver (Daniel Lezcano)
- Make RISCV_TIMER depends on RISCV_SBI (Kefeng Wang)
Link: https://lore.kernel.org/r/028084fa-d29b-a1d5-7eab-17f77ef69863@linaro.org
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/ingenic,sysost.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/dt-bindings/clock/ingenic,sysost.h b/include/dt-bindings/clock/ingenic,sysost.h index 9ac88e90babf..063791b01ab3 100644 --- a/include/dt-bindings/clock/ingenic,sysost.h +++ b/include/dt-bindings/clock/ingenic,sysost.h @@ -1,12 +1,16 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* - * This header provides clock numbers for the ingenic,tcu DT binding. + * This header provides clock numbers for the Ingenic OST DT binding. */ #ifndef __DT_BINDINGS_CLOCK_INGENIC_OST_H__ #define __DT_BINDINGS_CLOCK_INGENIC_OST_H__ -#define OST_CLK_PERCPU_TIMER 0 -#define OST_CLK_GLOBAL_TIMER 1 +#define OST_CLK_PERCPU_TIMER 1 +#define OST_CLK_GLOBAL_TIMER 0 +#define OST_CLK_PERCPU_TIMER0 1 +#define OST_CLK_PERCPU_TIMER1 2 +#define OST_CLK_PERCPU_TIMER2 3 +#define OST_CLK_PERCPU_TIMER3 4 #endif /* __DT_BINDINGS_CLOCK_INGENIC_OST_H__ */ |