]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
clk: lpc32xx: allow peripheral clock selection in device tree
authorSylvain Lemieux <slemieux@tycoint.com>
Fri, 3 Jun 2016 19:34:35 +0000 (15:34 -0400)
committerMichael Turquette <mturquette@baylibre.com>
Thu, 7 Jul 2016 00:51:14 +0000 (17:51 -0700)
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

drivers/clk/nxp/clk-lpc32xx.c
include/dt-bindings/clock/lpc32xx-clock.h

index 481b2646b4964ba5974dc7a4f4f0f40742796b3e..90d740a2fc0dd1c1765098d5d25904ef1f4f3c0e 100644 (file)
@@ -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,
 
index d41b6fea145079d0da22a5d195ab7f001e7335a7..e624d3a527983135e14862a5580e7e1a4112ee53 100644 (file)
@@ -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