Signed-off-by: Peter Mamonov <[email protected]>
---
drivers/ata/intf_platform_ide.c | 34 +++++++++++++++++++++++++++++-----
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
index 0d392d8..ab633c0 100644
--- a/drivers/ata/intf_platform_ide.c
+++ b/drivers/ata/intf_platform_ide.c
@@ -29,6 +29,7 @@
#include <ata_drive.h>
#include <platform_ide.h>
#include <linux/err.h>
+#include <of.h>
/**
* Setup the register specific addresses for an ATA like divice
@@ -85,8 +86,22 @@ static int platform_ide_probe(struct device_d *dev)
void *reg_base, *alt_base = NULL;
struct resource *reg, *alt;
int mmio = 0;
-
- if (pdata == NULL) {
+ struct device_node *dn = dev->device_node;
+ unsigned ioport_shift = 0;
+ int dataif_be = 0;
+ void (*reset)(int) = NULL;
+
+ if (pdata) {
+ ioport_shift = pdata->ioport_shift;
+ dataif_be = pdata->dataif_be;
+ reset = pdata->reset;
+ } else if (dn) {
+ /* try to get platform data from the device tree */
+ u32 tmp32;
+
+ if (of_property_read_u32(dn, "reg-shift", &tmp32) == 0)
+ ioport_shift = (unsigned)tmp32;
+ } else {
dev_err(dev, "No platform data. Cannot continue\n");
return -EINVAL;
}
@@ -123,9 +138,9 @@ static int platform_ide_probe(struct device_d *dev)
ide = xzalloc(sizeof(*ide));
ide->io.mmio = mmio;
- platform_ide_setup_port(reg_base, alt_base, &ide->io,
pdata->ioport_shift);
- ide->io.reset = pdata->reset;
- ide->io.dataif_be = pdata->dataif_be;
+ platform_ide_setup_port(reg_base, alt_base, &ide->io, ioport_shift);
+ ide->io.reset = reset;
+ ide->io.dataif_be = dataif_be;
rc = ide_port_register(ide);
if (rc != 0) {
@@ -136,9 +151,18 @@ static int platform_ide_probe(struct device_d *dev)
return rc;
}
+static __maybe_unused struct of_device_id platform_ide_dt_ids[] = {
+ {
+ .compatible = "ata-generic",
+ }, {
+ /* sentinel */
+ }
+};
+
static struct driver_d platform_ide_driver = {
.name = "ide_intf",
.probe = platform_ide_probe,
+ .of_compatible = DRV_OF_COMPAT(platform_ide_dt_ids),
};
device_platform_driver(platform_ide_driver);
--
2.1.4
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
