diff options
author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-11-01 17:11:16 +0000 |
---|---|---|
committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-11-01 17:11:16 +0000 |
commit | a3f3528dd9590bd321122f96e65c935afc5176a7 (patch) | |
tree | 52f82585d91888442e882a14874ef740cf614953 /target/linux/adm5120/files/drivers/block/rb1xx/ata.c | |
parent | a40177e0b251b982970f3a230945c1f19519aef4 (diff) |
CF driver cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9473 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/files/drivers/block/rb1xx/ata.c')
-rw-r--r-- | target/linux/adm5120/files/drivers/block/rb1xx/ata.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/adm5120/files/drivers/block/rb1xx/ata.c b/target/linux/adm5120/files/drivers/block/rb1xx/ata.c index b396317f5f..5447be5219 100644 --- a/target/linux/adm5120/files/drivers/block/rb1xx/ata.c +++ b/target/linux/adm5120/files/drivers/block/rb1xx/ata.c @@ -16,8 +16,9 @@ #include <linux/pci.h> #include <linux/ioport.h> /* request_mem_region() */ -#include <asm/unaligned.h> /* ioremap() */ -#include <asm/io.h> /* ioremap() */ +#include <asm/unaligned.h> +#include <asm/io.h> +#include <asm/gpio.h> #include <gpio.h> #include <adm5120_defs.h> @@ -69,7 +70,7 @@ static inline u8 rareg(unsigned reg, struct cf_mips_dev* dev) static inline int cfrdy(struct cf_mips_dev *dev) { - return (SW_READ_REG(GPIO_CONF0) & (1 << 12)); + return gpio_get_value(12); } static inline void prepare_cf_irq(struct cf_mips_dev *dev) @@ -92,7 +93,7 @@ static inline int cf_present(struct cf_mips_dev* dev) int i; /* on RB100 WAIT is LOW all the time => read will hang */ - if (SW_READ_REG(GPIO_CONF0) & (1 << 8)) + if (gpio_read_value(8)) cmd |= EXTIO_WAIT_EN; SW_WRITE_REG(GPIO_CONF2, cmd); |