Merge branch 'clk-lpc32xx' into clk-next

b24faef9 · Michael Turquette · 439a36d7 · 054e2730 · b24faef9 · b24faef9
Commit b24faef9 authored Jul 06, 2016 by Michael Turquette
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/clk/nxp/clk-lpc32xx.c drivers/clk/nxp/clk-lpc32xx.c +1 -2

include/dt-bindings/clock/lpc32xx-clock.h include/dt-bindings/clock/lpc32xx-clock.h +1 -0

No files found.
--- a/drivers/clk/nxp/clk-lpc32xx.c
+++ b/drivers/clk/nxp/clk-lpc32xx.c
@@ -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,


--- a/include/dt-bindings/clock/lpc32xx-clock.h
+++ b/include/dt-bindings/clock/lpc32xx-clock.h
@@ -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