From: Richard Purdie Date: Thu, 15 Sep 2005 13:52:00 +0000 (+0100) Subject: [ARM] 2915/1: SA1100 Collie: Correct scoop device calls X-Git-Tag: v2.6.16.28-rc1~2806^2~352^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c071760224d8418f65606bd67e755c6a5463ec53;p=karo-tx-linux.git [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: Richard Purdie Signed-off-by: Russell King --- diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 8cb69113a57c..25d6a4e27533 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -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 = {