iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: at91: at91sam9rl: switch to generic PWM framework

Browse Source 
Switch to the pwm/pwm-atmel driver instead of misc/atmel_pwm

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Alexandre Belloni 2014-05-29 01:20:08 +02:00 committed by Nicolas Ferre
parent f2e5b26936
commit 60c07f5e7f
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-at91/at91sam9rl.c
View File

@ -200,6 +200,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("pclk", "fffc4000.ssc", &ssc1_clk), CLKDEV_CON_DEV_ID("pclk", "fffc4000.ssc", &ssc1_clk),
CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi0_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi0_clk),
CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.1", &twi1_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.1", &twi1_clk),
CLKDEV_CON_DEV_ID(NULL, "at91sam9rl-pwm", &pwm_clk),
CLKDEV_CON_ID("pioA", &pioA_clk), CLKDEV_CON_ID("pioA", &pioA_clk),
CLKDEV_CON_ID("pioB", &pioB_clk), CLKDEV_CON_ID("pioB", &pioB_clk),
CLKDEV_CON_ID("pioC", &pioC_clk), CLKDEV_CON_ID("pioC", &pioC_clk),

11
arch/arm/mach-at91/at91sam9rl_devices.c
View File

@ -799,9 +799,7 @@ static void __init at91_add_device_watchdog(void) {}
* PWM * PWM
* --------------------------------------------------------------------*/ * --------------------------------------------------------------------*/
#if defined(CONFIG_ATMEL_PWM) #if IS_ENABLED(CONFIG_PWM_ATMEL)
static u32 pwm_mask;
static struct resource pwm_resources[] = { static struct resource pwm_resources[] = {
[0] = { [0] = {
.start = AT91SAM9RL_BASE_PWMC, .start = AT91SAM9RL_BASE_PWMC,
@ -816,11 +814,8 @@ static struct resource pwm_resources[] = {
}; };
static struct platform_device at91sam9rl_pwm0_device = { static struct platform_device at91sam9rl_pwm0_device = {
.name = "atmel_pwm", .name = "at91sam9rl-pwm",
.id = -1, .id = -1,
.dev = {
.platform_data = &pwm_mask,
},
.resource = pwm_resources, .resource = pwm_resources,
.num_resources = ARRAY_SIZE(pwm_resources), .num_resources = ARRAY_SIZE(pwm_resources),
}; };
@ -839,8 +834,6 @@ void __init at91_add_device_pwm(u32 mask)
if (mask & (1 << AT91_PWM3)) if (mask & (1 << AT91_PWM3))
at91_set_B_periph(AT91_PIN_PD8, 1); /* enable PWM3 */ at91_set_B_periph(AT91_PIN_PD8, 1); /* enable PWM3 */
pwm_mask = mask;
platform_device_register(&at91sam9rl_pwm0_device); platform_device_register(&at91sam9rl_pwm0_device);
} }
#else #else