diff options
-rw-r--r-- | arch/arm/mach-s3c2410/pm.c | 4 | ||||
-rw-r--r-- | arch/arm/mm/mmu.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c index 966119c8efee..6a61486ca755 100644 --- a/arch/arm/mach-s3c2410/pm.c +++ b/arch/arm/mach-s3c2410/pm.c | |||
@@ -60,10 +60,10 @@ static void s3c2410_pm_prepare(void) | |||
60 | __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM)); | 60 | __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM)); |
61 | } | 61 | } |
62 | 62 | ||
63 | /* the RX3715 uses similar code and the same H1940 and the | 63 | /* RX3715 and RX1950 use similar to H1940 code and the |
64 | * same offsets for resume and checksum pointers */ | 64 | * same offsets for resume and checksum pointers */ |
65 | 65 | ||
66 | if (machine_is_rx3715()) { | 66 | if (machine_is_rx3715() || machine_is_rx1950()) { |
67 | void *base = phys_to_virt(H1940_SUSPEND_CHECK); | 67 | void *base = phys_to_virt(H1940_SUSPEND_CHECK); |
68 | unsigned long ptr; | 68 | unsigned long ptr; |
69 | unsigned long calc = 0; | 69 | unsigned long calc = 0; |
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 241c24a1c18f..45a1bc275f0a 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -869,9 +869,10 @@ void __init reserve_node_zero(pg_data_t *pgdat) | |||
869 | if (machine_is_p720t()) | 869 | if (machine_is_p720t()) |
870 | res_size = 0x00014000; | 870 | res_size = 0x00014000; |
871 | 871 | ||
872 | /* H1940 and RX3715 need to reserve this for suspend */ | 872 | /* H1940, RX3715 and RX1950 need to reserve this for suspend */ |
873 | 873 | ||
874 | if (machine_is_h1940() || machine_is_rx3715()) { | 874 | if (machine_is_h1940() || machine_is_rx3715() |
875 | || machine_is_rx1950()) { | ||
875 | reserve_bootmem_node(pgdat, 0x30003000, 0x1000, | 876 | reserve_bootmem_node(pgdat, 0x30003000, 0x1000, |
876 | BOOTMEM_DEFAULT); | 877 | BOOTMEM_DEFAULT); |
877 | reserve_bootmem_node(pgdat, 0x30081000, 0x1000, | 878 | reserve_bootmem_node(pgdat, 0x30081000, 0x1000, |