Skip to content

L
linux
Commit 149f9e73 authored by Michael Turquette's avatar Michael Turquette
Browse files
Options

Merge branch 'clk-s905' into clk-next

parents 4d252fd5 ca1d2e26
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
drivers/clk/meson/gxbb.h
View file @ 149f9e73
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
#define CLKID_HDMI_PCLK 63 #define CLKID_HDMI_PCLK 63
#define CLKID_USB1_DDR_BRIDGE 64 #define CLKID_USB1_DDR_BRIDGE 64
#define CLKID_USB0_DDR_BRIDGE 65 #define CLKID_USB0_DDR_BRIDGE 65
/* CLKID_MMC_PCLK */ #define CLKID_MMC_PCLK 66
#define CLKID_DVIN 67 #define CLKID_DVIN 67
#define CLKID_UART2 68 #define CLKID_UART2 68
#define CLKID_SANA 69 #define CLKID_SANA 69
......
include/dt-bindings/clock/gxbb-clkc.h
View file @ 149f9e73
...@@ -8,6 +8,5 @@ ...@@ -8,6 +8,5 @@
#define CLKID_CPUCLK 1 #define CLKID_CPUCLK 1
#define CLKID_CLK81 12 #define CLKID_CLK81 12
#define CLKID_ETH 36 #define CLKID_ETH 36
#define CLKID_MMC_PCLK 66
#endif /* __GXBB_CLKC_H */ #endif /* __GXBB_CLKC_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