mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
Merge branch 'clk-lpc32xx' into clk-next
This commit is contained in:
commit
b24faef9a3
2 changed files with 2 additions and 2 deletions
|
@ -87,7 +87,7 @@ enum {
|
|||
|
||||
enum {
|
||||
/* Start from the last defined clock in dt bindings */
|
||||
LPC32XX_CLK_ADC_DIV = LPC32XX_CLK_HCLK_PLL + 1,
|
||||
LPC32XX_CLK_ADC_DIV = LPC32XX_CLK_PERIPH + 1,
|
||||
LPC32XX_CLK_ADC_RTC,
|
||||
LPC32XX_CLK_TEST1,
|
||||
LPC32XX_CLK_TEST2,
|
||||
|
@ -99,7 +99,6 @@ enum {
|
|||
LPC32XX_CLK_HCLK_DIV_PERIPH,
|
||||
LPC32XX_CLK_HCLK_DIV,
|
||||
LPC32XX_CLK_HCLK,
|
||||
LPC32XX_CLK_PERIPH,
|
||||
LPC32XX_CLK_ARM,
|
||||
LPC32XX_CLK_ARM_VFP,
|
||||
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
#define LPC32XX_CLK_PWM2 33
|
||||
#define LPC32XX_CLK_ADC 34
|
||||
#define LPC32XX_CLK_HCLK_PLL 35
|
||||
#define LPC32XX_CLK_PERIPH 36
|
||||
|
||||
/* LPC32XX USB clocks */
|
||||
#define LPC32XX_USB_CLK_I2C 1
|
||||
|
|
Loading…
Reference in a new issue