leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v4.12-shared/clkids' into v4.12-clk/next

Browse Source
This commit is contained in:
Heiko Stuebner 2017-03-10 11:18:53 +01:00
commit 4d00542b27
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dt-bindings/clock/rk3328-cru.h
View File

@ -97,6 +97,7 @@
#define SCLK_MAC2IO_SRC 99 #define SCLK_MAC2IO_SRC 99
#define SCLK_MAC2IO 100 #define SCLK_MAC2IO 100
#define SCLK_MAC2PHY 101 #define SCLK_MAC2PHY 101
#define SCLK_MAC2IO_EXT 102
/* dclk gates */ /* dclk gates */
#define DCLK_LCDC 120 #define DCLK_LCDC 120

19
include/dt-bindings/clock/rk3368-cru.h
View File

@ -44,13 +44,12 @@
#define SCLK_I2S_8CH 82 #define SCLK_I2S_8CH 82
#define SCLK_SPDIF_8CH 83 #define SCLK_SPDIF_8CH 83
#define SCLK_I2S_2CH 84 #define SCLK_I2S_2CH 84
#define SCLK_TIMER0 85 #define SCLK_TIMER00 85
#define SCLK_TIMER1 86 #define SCLK_TIMER01 86
#define SCLK_TIMER2 87 #define SCLK_TIMER02 87
#define SCLK_TIMER3 88 #define SCLK_TIMER03 88
#define SCLK_TIMER4 89 #define SCLK_TIMER04 89
#define SCLK_TIMER5 90 #define SCLK_TIMER05 90
#define SCLK_TIMER6 91
#define SCLK_OTGPHY0 93 #define SCLK_OTGPHY0 93
#define SCLK_OTG_ADP 96 #define SCLK_OTG_ADP 96
#define SCLK_HSICPHY480M 97 #define SCLK_HSICPHY480M 97
@ -82,6 +81,12 @@
#define SCLK_SFC 126 #define SCLK_SFC 126
#define SCLK_MAC 127 #define SCLK_MAC 127
#define SCLK_MACREF_OUT 128 #define SCLK_MACREF_OUT 128
#define SCLK_TIMER10 133
#define SCLK_TIMER11 134
#define SCLK_TIMER12 135
#define SCLK_TIMER13 136
#define SCLK_TIMER14 137
#define SCLK_TIMER15 138
#define DCLK_VOP 190 #define DCLK_VOP 190
#define MCLK_CRYPTO 191 #define MCLK_CRYPTO 191