Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b24faef9 authored by Michael Turquette's avatar Michael Turquette
Browse files

Merge branch 'clk-lpc32xx' into clk-next

parents 439a36d7 054e2730

drivers/clk/nxp/clk-lpc32xx.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

include/dt-bindings/clock/lpc32xx-clock.h

+1 −0
Original line number Diff line number Diff line
@@ -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