Skip to contentSkip to conversation

clocksource: sh_tmu: Fix channel IRQ retrieval in legacy case

PATCH Applied Laurent Pinchart 2 participants 2 messages May 16, 2014 – May 19, 2014

Subsystems (2)

v2 of 4 Applied Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 clocksource: sh_tmu: Fix channel IRQ retrieval in legacy case

In the legacy platform data case each TMU platform device handles a single channel with a single IRQ for the platform device. Retrieve the IRQ using the logical channel number instead of the hardware channel number.

---
 drivers/clocksource/sh_tmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

This patch applies on top of the clockevents/cmt-mtu2-tmu-cleanups branch of the git://git.linaro.org/people/daniel.lezcano/linux.git tree. It avoids breaking bisection of the TMU-related platform cleanup patches, the issue it fixes will disappear in a later driver cleanup patch. Daniel, could you please apply up to clockevents/cmt-mtu2-tmu-cleanups for v3.16 ?

Changes since v1:

- Replace CMT by TMU in the commit message.

drivers/clocksource/sh_tmu.c +1 -1
index 4ba2c0f..ec34095 100644
@@ -498,7 +498,7 @@ static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index,
 			ch->base = tmu->mapbase + 8 + ch->index * 12;
 	}
 
-	ch->irq = platform_get_irq(tmu->pdev, ch->index);
+	ch->irq = platform_get_irq(tmu->pdev, index);
 	if (ch->irq < 0) {
 		dev_err(&tmu->pdev->dev, "ch%u: failed to get irq\n",
 			ch->index);
Signature · 3 lines
Regards,

Laurent Pinchart
#1 lore raw
Quoted 25 lines · Laurent Pinchart

In the legacy platform data case each TMU platform device handles a single channel with a single IRQ for the platform device. Retrieve the IRQ using the logical channel number instead of the hardware channel number.

---
  drivers/clocksource/sh_tmu.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

This patch applies on top of the clockevents/cmt-mtu2-tmu-cleanups branch of the git://git.linaro.org/people/daniel.lezcano/linux.git tree. It avoids breaking bisection of the TMU-related platform cleanup patches, the issue it fixes will disappear in a later driver cleanup patch. Daniel, could you please apply up to clockevents/cmt-mtu2-tmu-cleanups for v3.16 ?

Changes since v1:

- Replace CMT by TMU in the commit message.

drivers/clocksource/sh_tmu.c +0 -0
index 4ba2c0f..ec34095 100644

drivers/clocksource/sh_tmu.c static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index, · line 504

Quoted 8 lines
drivers/clocksource/sh_tmu.c +1 -1
@@ -498,7 +498,7 @@ static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index,
  			ch->base = tmu->mapbase + 8 + ch->index * 12;
  	}
 
-	ch->irq = platform_get_irq(tmu->pdev, ch->index);
+	ch->irq = platform_get_irq(tmu->pdev, index);
  	if (ch->irq < 0) {
  		dev_err(&tmu->pdev->dev, "ch%u: failed to get irq\n",
  			ch->index);

Applied to my tree for 3.16

Thanks
-- Daniel

Signature · 5 lines
  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog