summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2012-04-18 22:25:10 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-18 20:43:38 +0200
commit12b96ed87e9f2c50e98fbba35ead4c3e0b244ac4 (patch)
tree198d7408d0d58d143040683fc4c9c64f8ee5513b /drivers
parenta7ddbc40865a8ffe716aca686763780febad575c (diff)
downloadbarebox-12b96ed87e9f2c50e98fbba35ead4c3e0b244ac4.tar.gz
barebox-12b96ed87e9f2c50e98fbba35ead4c3e0b244ac4.tar.xz
Allow use platform_ide driver without ALT-registers
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/intf_platform_ide.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
index 1955a9cb6c..af20e05ba2 100644
--- a/drivers/ata/intf_platform_ide.c
+++ b/drivers/ata/intf_platform_ide.c
@@ -64,10 +64,16 @@ static void platform_ide_setup_port(void *reg_base, void *alt_base,
ioaddr->status_addr = reg_base + (IDE_REG_STATUS << shift);
ioaddr->command_addr = reg_base + (IDE_REG_CMD << shift);
- ioaddr->altstatus_addr = alt_base + (IDE_REG_ALT_STATUS << shift);
- ioaddr->ctl_addr = alt_base + (IDE_REG_DEV_CTL << shift);
-
- ioaddr->alt_dev_addr = alt_base + (IDE_REG_DRV_ADDR << shift);
+ if (alt_base) {
+ ioaddr->altstatus_addr = alt_base + (IDE_REG_ALT_STATUS << shift);
+ ioaddr->ctl_addr = alt_base + (IDE_REG_DEV_CTL << shift);
+
+ ioaddr->alt_dev_addr = alt_base + (IDE_REG_DRV_ADDR << shift);
+ } else {
+ ioaddr->altstatus_addr = ioaddr->status_addr;
+ ioaddr->ctl_addr = ioaddr->status_addr;
+ /* ioaddr->alt_dev_addr not used in driver */
+ }
}
static int platform_ide_probe(struct device_d *dev)