From 72141fa925d8ee2b73fe7aad501fde0fb80b9d3e Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 13 Feb 2014 10:26:24 +0100 Subject: [PATCH] PWM: pxa: use pwmx as devname As this changes the name of the pwm we also have to adjust it in pwm_request. Signed-off-by: Sascha Hauer --- arch/arm/boards/mioa701/board.c | 2 +- drivers/pwm/pxa_pwm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boards/mioa701/board.c b/arch/arm/boards/mioa701/board.c index 6f93900fd..cdb86fc36 100644 --- a/arch/arm/boards/mioa701/board.c +++ b/arch/arm/boards/mioa701/board.c @@ -68,7 +68,7 @@ static void mioa701_lcd_power(int on) static void mioa701_lcd_backlight(int on) { - struct pwm_device *pwm0 = pwm_request("pxa_pwm0"); + struct pwm_device *pwm0 = pwm_request("pwm0"); /* * The backlight has a base frequency of 250kHz (<=> 4 ms). diff --git a/drivers/pwm/pxa_pwm.c b/drivers/pwm/pxa_pwm.c index 8e22d4988..8b2ebe4f6 100644 --- a/drivers/pwm/pxa_pwm.c +++ b/drivers/pwm/pxa_pwm.c @@ -133,7 +133,7 @@ static int pxa_pwm_probe(struct device_d *dev) struct pxa_pwm_chip *chip; chip = xzalloc(sizeof(*chip)); - chip->chip.devname = asprintf("%s", dev_name(dev)); + chip->chip.devname = asprintf("pwm%d", dev->id); chip->chip.ops = &pxa_pwm_ops; chip->iobase = dev_request_mem_region(dev, 0); chip->id = dev->id;