diff options
author | Sylvain Lemieux <slemieux@tycoint.com> | 2016-06-03 15:34:35 -0400 |
---|---|---|
committer | Michael Turquette <mturquette@baylibre.com> | 2016-07-06 20:51:14 -0400 |
commit | 054e2730088a9c9340b5bc6927000f5c14a8b6d7 (patch) | |
tree | c64da9711d6bef7958b2653184c465b7dc55c64d | |
parent | 1a695a905c18548062509178b98bc91e67510864 (diff) |
clk: lpc32xx: allow peripheral clock selection in device tree
This patch add the support to select the peripheral clock (PERIPH)
as a parent clock source using the "assigned-clock-parents"
parameter in the device tree.
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/1464982475-24738-1-git-send-email-slemieux.tyco@gmail.com
-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 { | |||
87 | 87 | ||
88 | enum { | 88 | enum { |
89 | /* Start from the last defined clock in dt bindings */ | 89 | /* Start from the last defined clock in dt bindings */ |
90 | LPC32XX_CLK_ADC_DIV = LPC32XX_CLK_HCLK_PLL + 1, | 90 | LPC32XX_CLK_ADC_DIV = LPC32XX_CLK_PERIPH + 1, |
91 | LPC32XX_CLK_ADC_RTC, | 91 | LPC32XX_CLK_ADC_RTC, |
92 | LPC32XX_CLK_TEST1, | 92 | LPC32XX_CLK_TEST1, |
93 | LPC32XX_CLK_TEST2, | 93 | LPC32XX_CLK_TEST2, |
@@ -99,7 +99,6 @@ enum { | |||
99 | LPC32XX_CLK_HCLK_DIV_PERIPH, | 99 | LPC32XX_CLK_HCLK_DIV_PERIPH, |
100 | LPC32XX_CLK_HCLK_DIV, | 100 | LPC32XX_CLK_HCLK_DIV, |
101 | LPC32XX_CLK_HCLK, | 101 | LPC32XX_CLK_HCLK, |
102 | LPC32XX_CLK_PERIPH, | ||
103 | LPC32XX_CLK_ARM, | 102 | LPC32XX_CLK_ARM, |
104 | LPC32XX_CLK_ARM_VFP, | 103 | LPC32XX_CLK_ARM_VFP, |
105 | 104 | ||
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 @@ | |||
48 | #define LPC32XX_CLK_PWM2 33 | 48 | #define LPC32XX_CLK_PWM2 33 |
49 | #define LPC32XX_CLK_ADC 34 | 49 | #define LPC32XX_CLK_ADC 34 |
50 | #define LPC32XX_CLK_HCLK_PLL 35 | 50 | #define LPC32XX_CLK_HCLK_PLL 35 |
51 | #define LPC32XX_CLK_PERIPH 36 | ||
51 | 52 | ||
52 | /* LPC32XX USB clocks */ | 53 | /* LPC32XX USB clocks */ |
53 | #define LPC32XX_USB_CLK_I2C 1 | 54 | #define LPC32XX_USB_CLK_I2C 1 |