Skip to contentSkip to conversation

ARM: SAMSUNG: devs: Add names to fimd0 IRQ resources

PATCH New Tomasz Figa 4 participants 4 messages May 15, 2013 – May 24, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: SAMSUNG: devs: Add names to fimd0 IRQ resources

Since commit 1977e6d8 (drm/exynos: change the method for getting the interrupt) the Exynos DRM FIMD driver requires IRQ resources to be named. This patch fixes probe failure in non-DT cases by adding appropriate resource names to fimd0 platform device.

---
 arch/arm/plat-samsung/devs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/plat-samsung/devs.c +3 -3
index 30c2fe2..0f9c3f4 100644
@@ -311,9 +311,9 @@ struct platform_device s5p_device_jpeg = {
 #ifdef CONFIG_S5P_DEV_FIMD0
 static struct resource s5p_fimd0_resource[] = {
 	[0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K),
-	[1] = DEFINE_RES_IRQ(IRQ_FIMD0_VSYNC),
-	[2] = DEFINE_RES_IRQ(IRQ_FIMD0_FIFO),
-	[3] = DEFINE_RES_IRQ(IRQ_FIMD0_SYSTEM),
+	[1] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_VSYNC, "vsync"),
+	[2] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_FIFO, "fifo"),
+	[3] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_SYSTEM, "lcd_sys"),
 };
 
 struct platform_device s5p_device_fimd0 = {
Signature · 1 line
1.8.2.1
#1 lore raw

PATCH 1/1 ARM: SAMSUNG: devs: Add names to fimd0 IRQ resources

Hi Kukjin,

Quoted 18 lines · On Wednesday 15 of May 2013 17:09:44 Tomasz Figa wrote:

Since commit 1977e6d8 (drm/exynos: change the method for getting the interrupt) the Exynos DRM FIMD driver requires IRQ resources to be named. This patch fixes probe failure in non-DT cases by adding appropriate resource names to fimd0 platform device.

---
 arch/arm/plat-samsung/devs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/plat-samsung/devs.c +0 -0
index 30c2fe2..0f9c3f4 100644
@@ -311,9 +311,9 @@ struct platform_device s5p_device_jpeg = {
 #ifdef CONFIG_S5P_DEV_FIMD0
 static struct resource s5p_fimd0_resource[] = {

arch/arm/plat-samsung/devs.c struct platform_device s5p_device_jpeg = { · line 319

Quoted 10 lines
arch/arm/plat-samsung/devs.c +3 -3
 	[0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K),
-	[1] = DEFINE_RES_IRQ(IRQ_FIMD0_VSYNC),
-	[2] = DEFINE_RES_IRQ(IRQ_FIMD0_FIFO),
-	[3] = DEFINE_RES_IRQ(IRQ_FIMD0_SYSTEM),
+	[1] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_VSYNC, "vsync"),
+	[2] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_FIFO, "fifo"),
+	[3] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_SYSTEM, "lcd_sys"),
 };
 
 struct platform_device s5p_device_fimd0 = {

This is a fix of a regression introduced to 3.10-rc1. Could you apply this patch to your fixes branch, please?

Best regards,
Tomasz

Applied
#2 lore raw

PATCH 1/1 ARM: SAMSUNG: devs: Add names to fimd0 IRQ resources

In reply to Tomasz Figa
Quoted 18 lines · Tomasz Figa

Since commit 1977e6d8 (drm/exynos: change the method for getting the interrupt) the Exynos DRM FIMD driver requires IRQ resources to be named. This patch fixes probe failure in non-DT cases by adding appropriate resource names to fimd0 platform device.

---
  arch/arm/plat-samsung/devs.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/plat-samsung/devs.c +0 -0
index 30c2fe2..0f9c3f4 100644
@@ -311,9 +311,9 @@ struct platform_device s5p_device_jpeg = {
  #ifdef CONFIG_S5P_DEV_FIMD0
  static struct resource s5p_fimd0_resource[] = {

arch/arm/plat-samsung/devs.c struct platform_device s5p_device_jpeg = { · line 319

Quoted 10 lines
arch/arm/plat-samsung/devs.c +3 -3
  	[0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K),
-	[1] = DEFINE_RES_IRQ(IRQ_FIMD0_VSYNC),
-	[2] = DEFINE_RES_IRQ(IRQ_FIMD0_FIFO),
-	[3] = DEFINE_RES_IRQ(IRQ_FIMD0_SYSTEM),
+	[1] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_VSYNC, "vsync"),
+	[2] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_FIFO, "fifo"),
+	[3] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_SYSTEM, "lcd_sys"),
  };
 
  struct platform_device s5p_device_fimd0 = {

Applied into fixes.

Thanks.

- Kukjin

Applied
#3 lore raw

PATCH 1/1 ARM: SAMSUNG: devs: Add names to fimd0 IRQ resources

In reply to Tomasz Figa
Quoted 18 lines · Tomasz Figa

Since commit 1977e6d8 (drm/exynos: change the method for getting the interrupt) the Exynos DRM FIMD driver requires IRQ resources to be named. This patch fixes probe failure in non-DT cases by adding appropriate resource names to fimd0 platform device.

---
  arch/arm/plat-samsung/devs.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/plat-samsung/devs.c +0 -0
index 30c2fe2..0f9c3f4 100644
@@ -311,9 +311,9 @@ struct platform_device s5p_device_jpeg = {
  #ifdef CONFIG_S5P_DEV_FIMD0
  static struct resource s5p_fimd0_resource[] = {

arch/arm/plat-samsung/devs.c struct platform_device s5p_device_jpeg = { · line 319

Quoted 10 lines
arch/arm/plat-samsung/devs.c +3 -3
  	[0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K),
-	[1] = DEFINE_RES_IRQ(IRQ_FIMD0_VSYNC),
-	[2] = DEFINE_RES_IRQ(IRQ_FIMD0_FIFO),
-	[3] = DEFINE_RES_IRQ(IRQ_FIMD0_SYSTEM),
+	[1] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_VSYNC, "vsync"),
+	[2] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_FIFO, "fifo"),
+	[3] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_SYSTEM, "lcd_sys"),
  };
 
  struct platform_device s5p_device_fimd0 = {

Applied into fixes.

Thanks.

- Kukjin