Commit 3791f783 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre

ARM: at91: at91sam9263: switch to generic PWM framework

Switch to the pwm/pwm-atmel driver instead of misc/atmel_pwm
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent c545dcd3
...@@ -199,6 +199,7 @@ static struct clk_lookup periph_clocks_lookups[] = { ...@@ -199,6 +199,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk),
CLKDEV_CON_DEV_ID(NULL, "at91sam9rl-pwm", &pwm_clk),
/* fake hclk clock */ /* fake hclk clock */
CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
CLKDEV_CON_ID("pioA", &pioA_clk), CLKDEV_CON_ID("pioA", &pioA_clk),
......
...@@ -1131,9 +1131,7 @@ static void __init at91_add_device_watchdog(void) {} ...@@ -1131,9 +1131,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 = AT91SAM9263_BASE_PWMC, .start = AT91SAM9263_BASE_PWMC,
...@@ -1148,11 +1146,8 @@ static struct resource pwm_resources[] = { ...@@ -1148,11 +1146,8 @@ static struct resource pwm_resources[] = {
}; };
static struct platform_device at91sam9263_pwm0_device = { static struct platform_device at91sam9263_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),
}; };
...@@ -1171,8 +1166,6 @@ void __init at91_add_device_pwm(u32 mask) ...@@ -1171,8 +1166,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_PB29, 1); /* enable PWM3 */ at91_set_B_periph(AT91_PIN_PB29, 1); /* enable PWM3 */
pwm_mask = mask;
platform_device_register(&at91sam9263_pwm0_device); platform_device_register(&at91sam9263_pwm0_device);
} }
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment