Commit 2301dfa7 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

ARM: mxs: Add pwm clocks and device registration 



Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 78159566

arch/arm/mach-mxs/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -8,10 +8,12 @@ config MXS_OCOTP 
config SOC_IMX23

	bool

	select CPU_ARM926T

	select HAVE_PWM



config SOC_IMX28

	bool

	select CPU_ARM926T

	select HAVE_PWM



comment "MXS platforms:"

arch/arm/mach-mxs/clock-mx23.c

+5 −1
Original line number Diff line number Diff line
@@ -447,7 +447,11 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK(NULL, "hclk", hbus_clk)

	_REGISTER_CLOCK(NULL, "usb", usb_clk)

	_REGISTER_CLOCK(NULL, "audio", audio_clk)

	_REGISTER_CLOCK(NULL, "pwm", pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.0", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.1", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.2", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.3", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.4", NULL, pwm_clk)

};



static int clk_misc_init(void)

arch/arm/mach-mxs/clock-mx28.c

+8 −1
Original line number Diff line number Diff line
@@ -622,7 +622,14 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK("flexcan.1", NULL, can1_clk)

	_REGISTER_CLOCK(NULL, "usb0", usb0_clk)

	_REGISTER_CLOCK(NULL, "usb1", usb1_clk)

	_REGISTER_CLOCK(NULL, "pwm", pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.0", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.1", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.2", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.3", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.4", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.5", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.6", NULL, pwm_clk)

	_REGISTER_CLOCK("mxs-pwm.7", NULL, pwm_clk)

	_REGISTER_CLOCK(NULL, "lradc", lradc_clk)

	_REGISTER_CLOCK(NULL, "spdif", spdif_clk)

};

arch/arm/mach-mxs/devices-mx23.h

+2 −0
Original line number Diff line number Diff line
@@ -19,3 +19,5 @@ extern const struct mxs_auart_data mx23_auart_data[] __initconst; 
#define mx23_add_auart(id)	mxs_add_auart(&mx23_auart_data[id])

#define mx23_add_auart0()		mx23_add_auart(0)

#define mx23_add_auart1()		mx23_add_auart(1)



#define mx23_add_mxs_pwm(id)		mxs_add_mxs_pwm(MX23_PWM_BASE_ADDR, id)

arch/arm/mach-mxs/devices-mx28.h

+2 −0
Original line number Diff line number Diff line
@@ -32,3 +32,5 @@ extern const struct mxs_flexcan_data mx28_flexcan_data[] __initconst; 
	mxs_add_flexcan(&mx28_flexcan_data[id], pdata)

#define mx28_add_flexcan0(pdata)	mx28_add_flexcan(0, pdata)

#define mx28_add_flexcan1(pdata)	mx28_add_flexcan(1, pdata)



#define mx28_add_mxs_pwm(id)		mxs_add_mxs_pwm(MX28_PWM_BASE_ADDR, id)