diff options
| author |   Chen-Yu Tsai <wens@csie.org> | 2024-06-22 20:10:05 +0800 |
|---|---|---|
| committer | Chen-Yu Tsai <wens@csie.org> | 2024-06-22 20:10:05 +0800 |
| commit | c45281068fbe1a94b8d4295dc66ecbae4d853af4 (patch) | |
| tree | 81ff2394d198b706696996d920e29cc14c6580b3 | |
| parent | ARM: dts: sunxi: remove duplicated entries in makefile (diff) | |
| parent | dt-bindings: clock: sun50i-h616-ccu: Add GPADC clocks (diff) | |
| download | wireguard-linux-c45281068fbe1a94b8d4295dc66ecbae4d853af4.tar.xz wireguard-linux-c45281068fbe1a94b8d4295dc66ecbae4d853af4.zip | |
Merge branch 'sunxi/shared-clk-ids-for-6.11' into sunxi/dt-for-6.11
Diffstat (limited to '')
| -rw-r--r-- | include/dt-bindings/clock/sun50i-h616-ccu.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/reset/sun50i-h616-ccu.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/sun50i-h616-ccu.h b/include/dt-bindings/clock/sun50i-h616-ccu.h index 6f8f01e67628..ebb146ab7f8c 100644 --- a/include/dt-bindings/clock/sun50i-h616-ccu.h +++ b/include/dt-bindings/clock/sun50i-h616-ccu.h @@ -112,5 +112,6 @@ #define CLK_HDCP 126 #define CLK_BUS_HDCP 127 #define CLK_PLL_SYSTEM_32K 128 +#define CLK_BUS_GPADC 129 #endif /* _DT_BINDINGS_CLK_SUN50I_H616_H_ */ diff --git a/include/dt-bindings/reset/sun50i-h616-ccu.h b/include/dt-bindings/reset/sun50i-h616-ccu.h index 1bd8bb0a11be..ed177c04afdd 100644 --- a/include/dt-bindings/reset/sun50i-h616-ccu.h +++ b/include/dt-bindings/reset/sun50i-h616-ccu.h @@ -66,5 +66,6 @@ #define RST_BUS_TVE0 57 #define RST_BUS_HDCP 58 #define RST_BUS_KEYADC 59 +#define RST_BUS_GPADC 60 #endif /* _DT_BINDINGS_RESET_SUN50I_H616_H_ */ |