aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2011-12-31 17:05:56 +0100
committerLars-Dominik Braun <lars@6xq.net>2011-12-31 17:05:56 +0100
commit80a2b4c6aaed80f9762e4be778a7a80d81e495f2 (patch)
treecdbfe011af99cbf1faba5c85207322423a17e5c6
parent79f4ba080df990a6eb81782503b1c8fe89f47082 (diff)
downloadbuildroot-n35-80a2b4c6aaed80f9762e4be778a7a80d81e495f2.zip
buildroot-n35-80a2b4c6aaed80f9762e4be778a7a80d81e495f2.tar.gz
buildroot-n35-80a2b4c6aaed80f9762e4be778a7a80d81e495f2.tar.bz2
Update suspend to ram patch
Affected by MTD patch too
-rw-r--r--linux/3.1.6/0012-n30-Basic-suspend-to-ram-for-Acer-n30-n35.patch28
1 files changed, 13 insertions, 15 deletions
diff --git a/linux/3.1.6/0012-n30-Basic-suspend-to-ram-for-Acer-n30-n35.patch b/linux/3.1.6/0012-n30-Basic-suspend-to-ram-for-Acer-n30-n35.patch
index b00ddcd..fd24427 100644
--- a/linux/3.1.6/0012-n30-Basic-suspend-to-ram-for-Acer-n30-n35.patch
+++ b/linux/3.1.6/0012-n30-Basic-suspend-to-ram-for-Acer-n30-n35.patch
@@ -57,21 +57,19 @@ index 58c1dd7..aaf5bdc 100644
+ zreladdr-y := 0x30208000
+ params_phys-y := 0x30200100
endif
-diff --git a/arch/arm/mach-s3c2410/include/mach/h1940.h b/arch/arm/mach-s3c2410/include/mach/h1940.h
-index 4559784..be48128 100644
---- a/arch/arm/mach-s3c2410/include/mach/h1940.h
-+++ b/arch/arm/mach-s3c2410/include/mach/h1940.h
-@@ -17,5 +17,6 @@
+--- linux-3.1.6/arch/arm/mach-s3c2410/include/mach/h1940.h.orig 2011-12-21 22:00:46.000000000 +0100
++++ linux-3.1.6/arch/arm/mach-s3c2410/include/mach/h1940.h 2011-12-31 17:01:21.985102436 +0100
+@@ -17,6 +17,8 @@
#define H1940_SUSPEND_CHECK (0x30080000)
extern void h1940_pm_return(void);
+extern void h1940_pm_return_end(void);
-
- #endif /* __ASM_ARCH_H1940_H */
-diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
-index 3c784e4..34a7e9e 100644
---- a/arch/arm/mach-s3c2410/mach-n30.c
-+++ b/arch/arm/mach-s3c2410/mach-n30.c
++
+ extern int h1940_led_blink_set(unsigned gpio, int state,
+ unsigned long *delay_on, unsigned long *delay_off);
+
+--- linux-3.1.6/arch/arm/mach-s3c2410/mach-n30.c.orig 2011-12-31 16:57:30.185718019 +0100
++++ linux-3.1.6/arch/arm/mach-s3c2410/mach-n30.c 2011-12-31 17:01:45.708299675 +0100
@@ -19,6 +19,7 @@
#include <linux/delay.h>
@@ -110,10 +108,10 @@ index 3c784e4..34a7e9e 100644
+#define N35_SUSPEND_RESUMEAT (S3C2410_SDRAM_PA + 0x201000)
+
- #ifdef CONFIG_MTD_PARTITIONS
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
-@@ -816,12 +822,26 @@ static void __init n30_map_io(void)
+ #include <linux/mtd/nand_ecc.h>
+@@ -796,12 +802,26 @@
s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs));
}
@@ -140,7 +138,7 @@ index 3c784e4..34a7e9e 100644
s3c24xx_fb_set_platdata(&n30_fb_info);
s3c24xx_ts_set_platdata(&n30_ts_cfg);
s3c24xx_udc_set_platdata(&n30_udc_cfg);
-@@ -892,6 +912,7 @@ MACHINE_START(N30, "Acer-N30")
+@@ -867,6 +887,7 @@
.init_machine = n30_init,
.init_irq = s3c24xx_init_irq,
.map_io = n30_map_io,
@@ -148,7 +146,7 @@ index 3c784e4..34a7e9e 100644
MACHINE_END
MACHINE_START(N35, "Acer-N35")
-@@ -904,4 +925,5 @@ MACHINE_START(N35, "Acer-N35")
+@@ -877,4 +898,5 @@
.init_machine = n30_init,
.init_irq = s3c24xx_init_irq,
.map_io = n30_map_io,