summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-02-13 10:26:24 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-02-14 07:17:23 +0100
commit72141fa925d8ee2b73fe7aad501fde0fb80b9d3e (patch)
treed990dfa661fcf364ebc9aff2a827850ec8d95ce2
parent5da563f1e67df1fd071098c443cbe878c75eeba4 (diff)
downloadbarebox-72141fa925d8ee2b73fe7aad501fde0fb80b9d3e.tar.gz
barebox-72141fa925d8ee2b73fe7aad501fde0fb80b9d3e.tar.xz
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 <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/boards/mioa701/board.c2
-rw-r--r--drivers/pwm/pxa_pwm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boards/mioa701/board.c b/arch/arm/boards/mioa701/board.c
index 6f93900fdc..cdb86fc36e 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 8e22d4988d..8b2ebe4f6f 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;