Commit b24faef9 authored by Michael Turquette's avatar Michael Turquette

Merge branch 'clk-lpc32xx' into clk-next

parents 439a36d7 054e2730
...@@ -87,7 +87,7 @@ enum { ...@@ -87,7 +87,7 @@ enum {
enum { enum {
/* Start from the last defined clock in dt bindings */ /* 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_ADC_RTC,
LPC32XX_CLK_TEST1, LPC32XX_CLK_TEST1,
LPC32XX_CLK_TEST2, LPC32XX_CLK_TEST2,
...@@ -99,7 +99,6 @@ enum { ...@@ -99,7 +99,6 @@ enum {
LPC32XX_CLK_HCLK_DIV_PERIPH, LPC32XX_CLK_HCLK_DIV_PERIPH,
LPC32XX_CLK_HCLK_DIV, LPC32XX_CLK_HCLK_DIV,
LPC32XX_CLK_HCLK, LPC32XX_CLK_HCLK,
LPC32XX_CLK_PERIPH,
LPC32XX_CLK_ARM, LPC32XX_CLK_ARM,
LPC32XX_CLK_ARM_VFP, LPC32XX_CLK_ARM_VFP,
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#define LPC32XX_CLK_PWM2 33 #define LPC32XX_CLK_PWM2 33
#define LPC32XX_CLK_ADC 34 #define LPC32XX_CLK_ADC 34
#define LPC32XX_CLK_HCLK_PLL 35 #define LPC32XX_CLK_HCLK_PLL 35
#define LPC32XX_CLK_PERIPH 36
/* LPC32XX USB clocks */ /* LPC32XX USB clocks */
#define LPC32XX_USB_CLK_I2C 1 #define LPC32XX_USB_CLK_I2C 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment