diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2021-12-16 14:47:38 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2021-12-16 14:48:27 +0100 |
| commit | 9758ff2fa240173e9a45613b07774b7a78b7653e (patch) | |
| tree | 44c1951f9fe4ded7f18d26ca677d006c0e191569 /arch/hexagon/include/asm/timex.h | |
| parent | drm/bridge: ti-sn65dsi86: Set max register for regmap (diff) | |
| parent | drm/vc4: kms: Wait for the commit before increasing our clock rate (diff) | |
| download | linux-9758ff2fa240173e9a45613b07774b7a78b7653e.tar.xz linux-9758ff2fa240173e9a45613b07774b7a78b7653e.zip | |
Merge drm/drm-next into drm-misc-next
Backmerging for v5.16-rc5. Resolves a conflict between drm-misc-next
and drm-misc-fixes in the vc4 driver.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'arch/hexagon/include/asm/timex.h')
| -rw-r--r-- | arch/hexagon/include/asm/timex.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/hexagon/include/asm/timex.h b/arch/hexagon/include/asm/timex.h index 8d4ec76fceb4..dfe69e118b2b 100644 --- a/arch/hexagon/include/asm/timex.h +++ b/arch/hexagon/include/asm/timex.h @@ -7,11 +7,10 @@ #define _ASM_TIMEX_H #include <asm-generic/timex.h> -#include <asm/timer-regs.h> #include <asm/hexagon_vm.h> /* Using TCX0 as our clock. CLOCK_TICK_RATE scheduled to be removed. */ -#define CLOCK_TICK_RATE TCX0_CLK_RATE +#define CLOCK_TICK_RATE 19200 #define ARCH_HAS_READ_CURRENT_TIMER |