diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2005-09-15 09:52:00 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-09-15 09:52:00 -0400 |
| commit | c071760224d8418f65606bd67e755c6a5463ec53 (patch) | |
| tree | 5d6946b887ab0ea7148f3e5bac95534056f21b5e | |
| parent | b2b8c6944544319caa22ed8bcb3443153a1a3b4c (diff) | |
[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 <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-sa1100/collie.c | 11 |
1 files changed, 5 insertions, 6 deletions
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[] = { | |||
| 111 | 111 | ||
| 112 | static void collie_set_vpp(int vpp) | 112 | static void collie_set_vpp(int vpp) |
| 113 | { | 113 | { |
| 114 | write_scoop_reg(SCOOP_GPCR, read_scoop_reg(SCOOP_GPCR) | COLLIE_SCP_VPEN); | 114 | write_scoop_reg(&colliescoop_device.dev, SCOOP_GPCR, read_scoop_reg(SCOOP_GPCR) | COLLIE_SCP_VPEN); |
| 115 | if (vpp) { | 115 | if (vpp) |
| 116 | write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) | COLLIE_SCP_VPEN); | 116 | write_scoop_reg(&colliescoop_device.dev, SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) | COLLIE_SCP_VPEN); |
| 117 | } else { | 117 | else |
| 118 | write_scoop_reg(SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) & ~COLLIE_SCP_VPEN); | 118 | write_scoop_reg(&colliescoop_device.dev, SCOOP_GPWR, read_scoop_reg(SCOOP_GPWR) & ~COLLIE_SCP_VPEN); |
| 119 | } | ||
| 120 | } | 119 | } |
| 121 | 120 | ||
| 122 | static struct flash_platform_data collie_flash_data = { | 121 | static struct flash_platform_data collie_flash_data = { |