Skip to content

L
linux
Commit 29f18411 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai
Browse files
Options

Merge branch 'sunxi/shared-clk-ids-for-6.11' into sunxi/clk-for-6.11

parents 95fd34a8 532857c2
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
include/dt-bindings/clock/sun50i-h616-ccu.h
View file @ 29f18411
...@@ -112,5 +112,6 @@ ...@@ -112,5 +112,6 @@
#define CLK_HDCP 126 #define CLK_HDCP 126
#define CLK_BUS_HDCP 127 #define CLK_BUS_HDCP 127
#define CLK_PLL_SYSTEM_32K 128 #define CLK_PLL_SYSTEM_32K 128
#define CLK_BUS_GPADC 129
#endif /* _DT_BINDINGS_CLK_SUN50I_H616_H_ */ #endif /* _DT_BINDINGS_CLK_SUN50I_H616_H_ */
include/dt-bindings/reset/sun50i-h616-ccu.h
View file @ 29f18411
...@@ -66,5 +66,6 @@ ...@@ -66,5 +66,6 @@
#define RST_BUS_TVE0 57 #define RST_BUS_TVE0 57
#define RST_BUS_HDCP 58 #define RST_BUS_HDCP 58
#define RST_BUS_KEYADC 59 #define RST_BUS_KEYADC 59
#define RST_BUS_GPADC 60
#endif /* _DT_BINDINGS_RESET_SUN50I_H616_H_ */ #endif /* _DT_BINDINGS_RESET_SUN50I_H616_H_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7