From 422309e7553fb87fae4b3244fbaa522050cd825a Mon Sep 17 00:00:00 2001 From: kettenis Date: Mon, 13 Feb 2023 19:19:29 +0000 Subject: [PATCH] Add RK356x TSADC clocks. ok patrick@ --- sys/dev/fdt/rkclock.c | 17 ++++++++++++++++- sys/dev/fdt/rkclock_clocks.h | 7 +++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/sys/dev/fdt/rkclock.c b/sys/dev/fdt/rkclock.c index 5154b26aa40..ef0a6e9cc4a 100644 --- a/sys/dev/fdt/rkclock.c +++ b/sys/dev/fdt/rkclock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rkclock.c,v 1.63 2022/10/09 20:31:30 kettenis Exp $ */ +/* $OpenBSD: rkclock.c,v 1.64 2023/02/13 19:19:29 kettenis Exp $ */ /* * Copyright (c) 2017, 2018 Mark Kettenis * @@ -3017,6 +3017,16 @@ const struct rkclock rk3568_clocks[] = { { RK3568_XIN24M, RK3568_GPLL_400M, RK3568_GPLL_300M, RK3568_CPLL_100M, RK3568_CPLL_50M, RK3568_CLK_OSC0_DIV_750K } }, + { + RK3568_CLK_TSADC_TSEN, RK3568_CRU_CLKSEL_CON(51), + SEL(5, 4), DIV(2, 0), + { RK3568_XIN24M, RK3568_GPLL_100M, RK3568_CPLL_100M } + }, + { + RK3568_CLK_TSADC, RK3568_CRU_CLKSEL_CON(51), + 0, DIV(14, 8), + { RK3568_CLK_TSADC_TSEN } + }, { RK3568_SCLK_UART1, RK3568_CRU_CLKSEL_CON(52), SEL(13, 12), 0, @@ -3107,6 +3117,11 @@ const struct rkclock rk3568_clocks[] = { 0, DIV(12, 8), { RK3568_PLL_GPLL } }, + { + RK3568_GPLL_100M, RK3568_CRU_CLKSEL_CON(77), + 0, DIV(4, 0), + { RK3568_PLL_GPLL } + }, { RK3568_CLK_OSC0_DIV_750K, RK3568_CRU_CLKSEL_CON(82), 0, DIV(13, 8), diff --git a/sys/dev/fdt/rkclock_clocks.h b/sys/dev/fdt/rkclock_clocks.h index 9ac62eee37b..15ba3dc8473 100644 --- a/sys/dev/fdt/rkclock_clocks.h +++ b/sys/dev/fdt/rkclock_clocks.h @@ -285,6 +285,8 @@ #define RK3568_CLK_SDMMC0 177 #define RK3568_CLK_SDMMC1 179 +#define RK3568_CLK_TSADC_TSEN 272 +#define RK3568_CLK_TSADC 273 #define RK3568_SCLK_UART1 287 #define RK3568_SCLK_UART2 291 #define RK3568_SCLK_UART3 295 @@ -304,8 +306,9 @@ #define RK3568_CPLL_50M 415 #define RK3568_CPLL_100M 417 -#define RK3568_GPLL_400M 1020 -#define RK3568_GPLL_300M 1021 +#define RK3568_GPLL_400M 1019 +#define RK3568_GPLL_300M 1020 +#define RK3568_GPLL_100M 1021 #define RK3568_CLK_OSC0_DIV_750K 1022 #define RK3568_XIN24M 1023 -- 2.20.1