Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0741b7d2 authored by Vasily Khoruzhick's avatar Vasily Khoruzhick Committed by Ben Dooks
Browse files

ARM: RX1950: Add suspend/resume support for RX1950 



Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent c4761b69

arch/arm/mach-s3c2410/pm.c

+2 −2
Original line number Diff line number Diff line
@@ -60,10 +60,10 @@ static void s3c2410_pm_prepare(void) 
		__raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM));

	}



	/* the RX3715 uses similar code and the same H1940 and the

	/* RX3715 and RX1950 use similar to H1940 code and the

	 * same offsets for resume and checksum pointers */



	if (machine_is_rx3715()) {

	if (machine_is_rx3715() || machine_is_rx1950()) {

		void *base = phys_to_virt(H1940_SUSPEND_CHECK);

		unsigned long ptr;

		unsigned long calc = 0;

arch/arm/mm/mmu.c

+3 −2
Original line number Diff line number Diff line
@@ -869,9 +869,10 @@ void __init reserve_node_zero(pg_data_t *pgdat) 
	if (machine_is_p720t())

		res_size = 0x00014000;



	/* H1940 and RX3715 need to reserve this for suspend */

	/* H1940, RX3715 and RX1950 need to reserve this for suspend */



	if (machine_is_h1940() || machine_is_rx3715()) {

	if (machine_is_h1940() || machine_is_rx3715()

		|| machine_is_rx1950()) {

		reserve_bootmem_node(pgdat, 0x30003000, 0x1000,

				BOOTMEM_DEFAULT);

		reserve_bootmem_node(pgdat, 0x30081000, 0x1000,