Merge branches 'clk-mvebu', 'clk-phase', 'clk-nxp', 'clk-mtk2712' and 'clk-qcom-rpmcc' into clk-next
* clk-mvebu: clk: mvebu: armada-38x: add support for missing clocks clk: mvebu: cp110: Fix clock tree representation * clk-phase: clk: Don't show the incorrect clock phase clk: update cached phase to respect the fact when setting phase * clk-nxp: clk: lpc32xx: Set name of regmap_config * clk-mtk2712: clk: mediatek: update clock driver of MT2712 dt-bindings: clock: add clocks for MT2712 * clk-qcom-rpmcc: clk: qcom: rpmcc: Add support to XO buffered clocks
This commit is contained in:
@@ -222,7 +222,13 @@
|
||||
#define CLK_TOP_APLL_DIV_PDN5 183
|
||||
#define CLK_TOP_APLL_DIV_PDN6 184
|
||||
#define CLK_TOP_APLL_DIV_PDN7 185
|
||||
#define CLK_TOP_NR_CLK 186
|
||||
#define CLK_TOP_APLL1_D3 186
|
||||
#define CLK_TOP_APLL1_REF_SEL 187
|
||||
#define CLK_TOP_APLL2_REF_SEL 188
|
||||
#define CLK_TOP_NFI2X_EN 189
|
||||
#define CLK_TOP_NFIECC_EN 190
|
||||
#define CLK_TOP_NFI1X_CK_EN 191
|
||||
#define CLK_TOP_NR_CLK 192
|
||||
|
||||
/* INFRACFG */
|
||||
|
||||
@@ -281,7 +287,9 @@
|
||||
#define CLK_PERI_MSDC30_3_EN 41
|
||||
#define CLK_PERI_MSDC50_0_HCLK_EN 42
|
||||
#define CLK_PERI_MSDC50_3_HCLK_EN 43
|
||||
#define CLK_PERI_NR_CLK 44
|
||||
#define CLK_PERI_MSDC30_0_QTR_EN 44
|
||||
#define CLK_PERI_MSDC30_3_QTR_EN 45
|
||||
#define CLK_PERI_NR_CLK 46
|
||||
|
||||
/* MCUCFG */
|
||||
|
||||
|
@@ -40,6 +40,11 @@
|
||||
#define RPM_SMI_CLK 22
|
||||
#define RPM_SMI_A_CLK 23
|
||||
#define RPM_PLL4_CLK 24
|
||||
#define RPM_XO_D0 25
|
||||
#define RPM_XO_D1 26
|
||||
#define RPM_XO_A0 27
|
||||
#define RPM_XO_A1 28
|
||||
#define RPM_XO_A2 29
|
||||
|
||||
/* SMD RPM clocks */
|
||||
#define RPM_SMD_XO_CLK_SRC 0
|
||||
|
Reference in New Issue
Block a user