* [PATCH v2 0/3] Fixes for breakage resulting from syscore_ops patch on s3c24xx
@ 2011-06-01 16:21 ` Heiko Stübner
0 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2011-06-01 16:21 UTC (permalink / raw)
To: linux-arm-kernel
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
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/3] Fix missing struct for s3c2410_dma_chan in s3c2410_dma_suspend_chan
2011-06-01 16:21 ` Heiko Stübner
@ 2011-06-01 16:23 ` Heiko Stübner
-1 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2011-06-01 16:23 UTC (permalink / raw)
To: Kukjin Kim, Rafael J. Wysocki
Cc: linux-arm-kernel, linux-samsung-soc, Heiko Stübner
s3c2410_dma_chan is not a type itself, so struct is required.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/plat-s3c24xx/dma.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index c10d10c..2abf966 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -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);
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 1/3] Fix missing struct for s3c2410_dma_chan in s3c2410_dma_suspend_chan
@ 2011-06-01 16:23 ` Heiko Stübner
0 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2011-06-01 16:23 UTC (permalink / raw)
To: linux-arm-kernel
s3c2410_dma_chan is not a type itself, so struct is required.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/plat-s3c24xx/dma.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index c10d10c..2abf966 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -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);
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/3] Move s3c24xx_irq_syscore_ops to plat-s3c24xx/irq.c
2011-06-01 16:21 ` Heiko Stübner
@ 2011-06-01 16:25 ` Heiko Stübner
-1 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2011-06-01 16:25 UTC (permalink / raw)
To: Kukjin Kim
Cc: Rafael J. Wysocki, linux-arm-kernel, linux-samsung-soc,
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 <heiko@sntech.de>
---
arch/arm/mach-s3c2410/irq.c | 5 -----
arch/arm/plat-s3c24xx/irq.c | 6 ++++++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index 2854129..4428695 100644
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -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,
-};
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c
index 9aee7e1..fc8c5f8 100644
--- a/arch/arm/plat-s3c24xx/irq.c
+++ b/arch/arm/plat-s3c24xx/irq.c
@@ -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,
+};
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 2/3] Move s3c24xx_irq_syscore_ops to plat-s3c24xx/irq.c
@ 2011-06-01 16:25 ` Heiko Stübner
0 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2011-06-01 16:25 UTC (permalink / raw)
To: linux-arm-kernel
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 <heiko@sntech.de>
---
arch/arm/mach-s3c2410/irq.c | 5 -----
arch/arm/plat-s3c24xx/irq.c | 6 ++++++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index 2854129..4428695 100644
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -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,
-};
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c
index 9aee7e1..fc8c5f8 100644
--- a/arch/arm/plat-s3c24xx/irq.c
+++ b/arch/arm/plat-s3c24xx/irq.c
@@ -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,
+};
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] remove the now empty mach-s3c2410/irq.c
2011-06-01 16:21 ` Heiko Stübner
@ 2011-06-01 16:27 ` Heiko Stübner
-1 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2011-06-01 16:27 UTC (permalink / raw)
To: Kukjin Kim, Rafael J. Wysocki
Cc: linux-arm-kernel, linux-samsung-soc, Heiko Stübner
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
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
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 0d468e9..8169535 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -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
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
deleted file mode 100644
index 4428695..0000000
--- a/arch/arm/mach-s3c2410/irq.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* linux/arch/arm/mach-s3c2410/irq.c
- *
- * Copyright (c) 2006 Simtec Electronics
- * Ben Dooks <ben@simtec.co.uk>
- *
- * 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>
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] remove the now empty mach-s3c2410/irq.c
@ 2011-06-01 16:27 ` Heiko Stübner
0 siblings, 0 replies; 8+ messages in thread
From: Heiko Stübner @ 2011-06-01 16:27 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
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
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 0d468e9..8169535 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -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
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
deleted file mode 100644
index 4428695..0000000
--- a/arch/arm/mach-s3c2410/irq.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* linux/arch/arm/mach-s3c2410/irq.c
- *
- * Copyright (c) 2006 Simtec Electronics
- * Ben Dooks <ben@simtec.co.uk>
- *
- * 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>
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread