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

Commit c0717602 authored by Richard Purdie's avatar Richard Purdie Committed by Russell King
Browse files

[ARM] 2915/1: SA1100 Collie: Correct scoop device calls 



Patch from Richard Purdie

This patch adds a missing parameter to the scoop calls made by collie.c

Signed-off-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b2b8c694

arch/arm/mach-sa1100/collie.c

+5 −6
Original line number Diff line number Diff line
@@ -111,12 +111,11 @@ static struct mtd_partition collie_partitions[] = { 


static void collie_set_vpp(int vpp)

{

	write_scoop_reg(SCOOP_GPCR, read_scoop_reg(SCOOP_GPCR) | COLLIE_SCP_VPEN);

	if (vpp) {

		write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) | COLLIE_SCP_VPEN);

	} else {

		write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) & ~COLLIE_SCP_VPEN);

	}

	write_scoop_reg(&colliescoop_device.dev, SCOOP_GPCR, read_scoop_reg(SCOOP_GPCR) | COLLIE_SCP_VPEN);

	if (vpp)

		write_scoop_reg(&colliescoop_device.dev, SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) | COLLIE_SCP_VPEN);

	else

		write_scoop_reg(&colliescoop_device.dev, SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) & ~COLLIE_SCP_VPEN);

}



static struct flash_platform_data collie_flash_data = {