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

Commit bfd4e070 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[PATCH] ARM: 2678/1: S3C2440 - cpu fixes, hdiv divisors and nand dev name 



Patch from Ben Dooks

Fix the setting of hdiv when set to divide-by-2. Thanks to
Jeonghoon Yoon for pointing this out.
Change name of the NAND device to "s3c2440-nand" as it
is not similar enough to the "s3c2410-nand" device.

Signed-off-by: Ben Dooks
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4ad3a443

arch/arm/mach-s3c2410/s3c2440.c

+4 −2
Original line number Diff line number Diff line
@@ -192,9 +192,11 @@ void __init s3c2440_map_io(struct map_desc *mach_desc, int size) 


	iotable_init(s3c2440_iodesc, ARRAY_SIZE(s3c2440_iodesc));

	iotable_init(mach_desc, size);



	/* rename any peripherals used differing from the s3c2410 */



	s3c_device_i2c.name  = "s3c2440-i2c";

	s3c_device_nand.name = "s3c2440-nand";



	/* change irq for watchdog */
@@ -225,7 +227,7 @@ void __init s3c2440_init_clocks(int xtal) 
		break;



	case S3C2440_CLKDIVN_HDIVN_2:

		hdiv = 1;

		hdiv = 2;

		break;



	case S3C2440_CLKDIVN_HDIVN_4_8: