Skip to content

Commit

Permalink
Merge branch 'clk-lpc32xx' into clk-next
Browse files Browse the repository at this point in the history
  • Loading branch information
mturquette committed Jul 7, 2016
2 parents 439a36d + 054e273 commit b24faef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/clk/nxp/clk-lpc32xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,

Expand Down
1 change: 1 addition & 0 deletions include/dt-bindings/clock/lpc32xx-clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b24faef

Please sign in to comment.