diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2006-09-25 15:11:48 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-27 15:58:59 -0400 |
commit | 8d48427ecb0639593ccf14e807479b7873254ccb (patch) | |
tree | 7bcc5f49faf33515d5d65fae53d6670cfe76e5c3 /include/asm-arm/hardware | |
parent | 2dc94310bd94d0906febea7d0f7c188da620c952 (diff) |
[ARM] 3847/2: Convert LOMOMO to use struct device for GPIOs
Convert LOMOMO to use struct device * for GPIOs instead of struct
locomo_dev. This enables access to the GPIOs from code which is not
a locomo device itself (such as audio). Access for gpio 31 is removed
for error handling (no such hardware exists).
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
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/locomo.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-arm/hardware/locomo.h b/include/asm-arm/hardware/locomo.h index 22dfb1737768..2599a6bc70e4 100644 --- a/include/asm-arm/hardware/locomo.h +++ b/include/asm-arm/hardware/locomo.h | |||
@@ -197,10 +197,11 @@ int locomo_driver_register(struct locomo_driver *); | |||
197 | void locomo_driver_unregister(struct locomo_driver *); | 197 | void locomo_driver_unregister(struct locomo_driver *); |
198 | 198 | ||
199 | /* GPIO control functions */ | 199 | /* GPIO control functions */ |
200 | void locomo_gpio_set_dir(struct locomo_dev *ldev, unsigned int bits, unsigned int dir); | 200 | void locomo_gpio_set_dir(struct device *dev, unsigned int bits, unsigned int dir); |
201 | unsigned int locomo_gpio_read_level(struct locomo_dev *ldev, unsigned int bits); | 201 | int locomo_gpio_read_level(struct device *dev, unsigned int bits); |
202 | unsigned int locomo_gpio_read_output(struct locomo_dev *ldev, unsigned int bits); | 202 | int locomo_gpio_read_output(struct device *dev, unsigned int bits); |
203 | void locomo_gpio_write(struct locomo_dev *ldev, unsigned int bits, unsigned int set); | 203 | void locomo_gpio_write(struct device *dev, unsigned int bits, unsigned int set); |
204 | |||
204 | 205 | ||
205 | /* M62332 control function */ | 206 | /* M62332 control function */ |
206 | void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int channel); | 207 | void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int channel); |