diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2005-11-08 20:15:43 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-08 20:15:43 +0100 |
| commit | a63ae4427c6af66d6eda26e5da8fed53f8fbede3 (patch) | |
| tree | cb30bd5993c07bae7f66564713292d8b224d591f /include/asm-arm/hardware | |
| parent | [ARM] 3126/1: BAST: fix map_desc initialisation (diff) | |
| download | linux-a63ae4427c6af66d6eda26e5da8fed53f8fbede3.tar.xz linux-a63ae4427c6af66d6eda26e5da8fed53f8fbede3.zip | |
[ARM] 3093/1: SharpSL PCMCIA Updates for Cxx00 models
Patch from Richard Purdie
The Sharp SL-Cxx00 models have a combined power control for the SD
and CF slot 0. This patch adds hooks to the scoop driver to allow
machines to provide a custom control function for this and such a
function is added for spitz/akita/borzoi.
It also moves the gpio init code into the machine files as this
is machine dependent and differs between some models. A couple of
warnings when compiling for collie are also fixed.
Signed-off-by: Richard Purdie
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/hardware')
| -rw-r--r-- | include/asm-arm/hardware/scoop.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/asm-arm/hardware/scoop.h b/include/asm-arm/hardware/scoop.h index a8f1013930e3..d37bf7443264 100644 --- a/include/asm-arm/hardware/scoop.h +++ b/include/asm-arm/hardware/scoop.h @@ -52,8 +52,14 @@ struct scoop_pcmcia_dev { unsigned char keep_rd; }; -extern int scoop_num; -extern struct scoop_pcmcia_dev *scoop_devs; +struct scoop_pcmcia_config { + struct scoop_pcmcia_dev *devs; + int num_devs; + void (*pcmcia_init)(void); + void (*power_ctrl)(struct device *scoop, unsigned short cpr, int nr); +}; + +extern struct scoop_pcmcia_config *platform_scoop_config; void reset_scoop(struct device *dev); unsigned short set_scoop_gpio(struct device *dev, unsigned short bit); |