projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compact flash driver is now working
[openwrt.git]
/
target
/
linux
/
adm5120
/
files
/
drivers
/
block
/
rb1xx
/
ata.c
diff --git
a/target/linux/adm5120/files/drivers/block/rb1xx/ata.c
b/target/linux/adm5120/files/drivers/block/rb1xx/ata.c
index
c73d219
..
9769c08
100644
(file)
--- 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 <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>
#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)
{
static inline int cfrdy(struct cf_mips_dev *dev)
{
- return
(SW_READ_REG(GPIO_CONF0) & (1 << ADM5120_GPIO_PIN4)
);
+ return
gpio_get_value(12
);
}
static inline void prepare_cf_irq(struct cf_mips_dev *dev)
}
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 */
int i;
/* on RB100 WAIT is LOW all the time => read will hang */
- if (
SW_READ_REG(GPIO_CONF0) & (1 << ADM5120_GPIO_PIN0
))
+ if (
gpio_get_value(8
))
cmd |= EXTIO_WAIT_EN;
SW_WRITE_REG(GPIO_CONF2, cmd);
cmd |= EXTIO_WAIT_EN;
SW_WRITE_REG(GPIO_CONF2, cmd);
This page took
0.019794 seconds
and
4
git commands to generate.