diff options
| author |   Michael Turquette <mturquette@baylibre.com> | 2016-07-06 17:51:42 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-07-06 17:51:42 -0700 |
| commit | b24faef9a322022a81cdc0d72cdf4addf7867f22 (patch) | |
| tree | 940781eed05e0a7220bdbdf1bd1ed70e7bfbee83 /drivers/clk | |
| parent | clk: sunxi: make clk-* explicitly non-modular (diff) | |
| parent | clk: lpc32xx: allow peripheral clock selection in device tree (diff) | |
| download | linux-dev-b24faef9a322022a81cdc0d72cdf4addf7867f22.tar.xz linux-dev-b24faef9a322022a81cdc0d72cdf4addf7867f22.zip | |
Merge branch 'clk-lpc32xx' into clk-next
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/nxp/clk-lpc32xx.c | 3 |
1 files changed, 1 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, |