diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2016-07-07 03:51:42 +0300 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-07-07 03:51:42 +0300 |
| commit | b24faef9a322022a81cdc0d72cdf4addf7867f22 (patch) | |
| tree | 940781eed05e0a7220bdbdf1bd1ed70e7bfbee83 | |
| parent | 439a36d7d9318c2709066d853720bd77f201033a (diff) | |
| parent | 054e2730088a9c9340b5bc6927000f5c14a8b6d7 (diff) | |
| download | linux-b24faef9a322022a81cdc0d72cdf4addf7867f22.tar.xz | |
Merge branch 'clk-lpc32xx' into clk-next
| -rw-r--r-- | drivers/clk/nxp/clk-lpc32xx.c | 3 | ||||
| -rw-r--r-- | include/dt-bindings/clock/lpc32xx-clock.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/nxp/clk-lpc32xx.c b/drivers/clk/nxp/clk-lpc32xx.c index 481b2646b496..90d740a2fc0d 100644 --- 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, diff --git a/include/dt-bindings/clock/lpc32xx-clock.h b/include/dt-bindings/clock/lpc32xx-clock.h index d41b6fea1450..e624d3a52798 100644 --- 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 |