Skip to contentSkip to conversation

Fixes for breakage resulting from syscore_ops patch on s3c24xx

PATCH New Heiko Stübner 2 participants 5 messages Jun 2, 2011 – Jun 4, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos
lore
Share & tools
lore

Heiko Stübner

author
#0 lore raw

v3 cover Fixes for breakage resulting from syscore_ops patch on s3c24xx

The syscore_ops patch from Rafael J. Wysocki introduced some small glitches for the S3C24XX cpus resulting in compile errors.

Changes since v1: add missing Signed-off-by lines
Changes since v2: fix mangled tabs

Heiko Stuebner (3):
Fix missing struct for s3c2410_dma_chan in s3c2410_dma_suspend_chan Move s3c24xx_irq_syscore_ops to plat-s3c24xx/irq.c remove the now empty mach-s3c2410/irq.c

 arch/arm/mach-s3c2410/Makefile |    1 -
 arch/arm/mach-s3c2410/irq.c    |   34 ----------------------------------
 arch/arm/plat-s3c24xx/dma.c    |    2 +-
 arch/arm/plat-s3c24xx/irq.c    |    6 ++++++
 4 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 arch/arm/mach-s3c2410/irq.c
author
#1 lore raw

PATCH v3 1/3 Fix missing struct for s3c2410_dma_chan in s3c2410_dma_suspend_chan

s3c2410_dma_chan is not a type itself, so struct is required.

Signed-off-by Heiko Stuebner <[email protected]>
---
 arch/arm/plat-s3c24xx/dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/plat-s3c24xx/dma.c +1 -1
index c10d10c..2abf966 100644
@@ -1199,7 +1199,7 @@ EXPORT_SYMBOL(s3c2410_dma_getposition);
 
 #ifdef CONFIG_PM
 
-static void s3c2410_dma_suspend_chan(s3c2410_dma_chan *cp)
+static void s3c2410_dma_suspend_chan(struct s3c2410_dma_chan *cp)
 {
 	printk(KERN_DEBUG "suspending dma channel %d\n", cp->number);
Signature · 1 line
1.7.1
author
#2 lore raw

PATCH v3 2/3 Move s3c24xx_irq_syscore_ops to plat-s3c24xx/irq.c

In reply to Heiko Stübner

s3c24xx_irq_syscore_ops was only defined for s3c2410 cpus leading to compile errors on for example 2412 and 2416.

Signed-off-by Heiko Stuebner <[email protected]>
---
 arch/arm/mach-s3c2410/irq.c |    5 -----
 arch/arm/plat-s3c24xx/irq.c |    6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)
arch/arm/mach-s3c2410/irq.c +0 -5
index 2854129..4428695 100644
@@ -27,8 +27,3 @@
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
-
-struct syscore_ops s3c24xx_irq_syscore_ops = {
-	.suspend	= s3c24xx_irq_suspend,
-	.resume		= s3c24xx_irq_resume,
-};
arch/arm/plat-s3c24xx/irq.c +6 -0
index 9aee7e1..fc8c5f8 100644
@@ -23,6 +23,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 #include <asm/irq.h>
 #include <asm/mach/irq.h>

@@ -668,3 +669,8 @@ void __init s3c24xx_init_irq(void)
 
 	irqdbf("s3c2410: registered interrupt handlers\n");
 }
+
+struct syscore_ops s3c24xx_irq_syscore_ops = {
+	.suspend	= s3c24xx_irq_suspend,
+	.resume		= s3c24xx_irq_resume,
+};
Signature · 1 line
1.7.1
author
#3 lore raw

PATCH v3 3/3 remove the now empty mach-s3c2410/irq.c

In reply to Heiko Stübner
Signed-off-by Heiko Stuebner <[email protected]>
---
 arch/arm/mach-s3c2410/Makefile |    1 -
 arch/arm/mach-s3c2410/irq.c    |   29 -----------------------------
 2 files changed, 0 insertions(+), 30 deletions(-)
 delete mode 100644 arch/arm/mach-s3c2410/irq.c
arch/arm/mach-s3c2410/Makefile +0 -1
index 0d468e9..8169535 100644
@@ -10,7 +10,6 @@ obj-n				:=
 obj-				:=
 
 obj-$(CONFIG_CPU_S3C2410)	+= s3c2410.o
-obj-$(CONFIG_CPU_S3C2410)	+= irq.o
 obj-$(CONFIG_CPU_S3C2410_DMA)	+= dma.o
 obj-$(CONFIG_CPU_S3C2410_DMA)	+= dma.o
 obj-$(CONFIG_S3C2410_PM)	+= pm.o sleep.o
arch/arm/mach-s3c2410/irq.c deleted +0 -29
deleted file mode 100644
index 4428695..0000000
@@ -1,29 +0,0 @@
-/* linux/arch/arm/mach-s3c2410/irq.c
- *
- * Copyright (c) 2006 Simtec Electronics
- *	Ben Dooks <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
-*/
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/syscore_ops.h>
-
-#include <plat/cpu.h>
-#include <plat/pm.h>
Signature · 1 line
1.7.1
#4 lore raw

v3 cover Fixes for breakage resulting from syscore_ops patch on s3c24xx

In reply to Heiko Stübner
Quoted 11 lines · Heiko St?bner

The syscore_ops patch from Rafael J. Wysocki introduced some small glitches for the S3C24XX cpus resulting in compile errors.

Changes since v1: add missing Signed-off-by lines
Changes since v2: fix mangled tabs

Heiko Stuebner (3):
Fix missing struct for s3c2410_dma_chan in s3c2410_dma_suspend_chan Move s3c24xx_irq_syscore_ops to plat-s3c24xx/irq.c remove the now empty mach-s3c2410/irq.c

Quoted 6 lines
  arch/arm/mach-s3c2410/Makefile |    1 -
  arch/arm/mach-s3c2410/irq.c    |   34 ----------------------------------
  arch/arm/plat-s3c24xx/dma.c    |    2 +-
  arch/arm/plat-s3c24xx/irq.c    |    6 ++++++
  4 files changed, 7 insertions(+), 36 deletions(-)

delete mode 100644 arch/arm/mach-s3c2410/irq.c

Looks OK, will apply.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.