|
@@ -15,10 +15,6 @@
|
|
#include <linux/slab.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of.h>
|
|
-#include <linux/of_irq.h>
|
|
|
|
-#include <linux/of_address.h>
|
|
|
|
-#include <linux/of_device.h>
|
|
|
|
-#include <linux/of_platform.h>
|
|
|
|
#include <linux/err.h>
|
|
#include <linux/err.h>
|
|
#include "xillybus.h"
|
|
#include "xillybus.h"
|
|
|
|
|
|
@@ -123,7 +119,7 @@ static int xilly_drv_probe(struct platform_device *op)
|
|
struct xilly_endpoint *endpoint;
|
|
struct xilly_endpoint *endpoint;
|
|
int rc;
|
|
int rc;
|
|
int irq;
|
|
int irq;
|
|
- struct resource res;
|
|
|
|
|
|
+ struct resource *res;
|
|
struct xilly_endpoint_hardware *ephw = &of_hw;
|
|
struct xilly_endpoint_hardware *ephw = &of_hw;
|
|
|
|
|
|
if (of_property_read_bool(dev->of_node, "dma-coherent"))
|
|
if (of_property_read_bool(dev->of_node, "dma-coherent"))
|
|
@@ -136,13 +132,13 @@ static int xilly_drv_probe(struct platform_device *op)
|
|
|
|
|
|
dev_set_drvdata(dev, endpoint);
|
|
dev_set_drvdata(dev, endpoint);
|
|
|
|
|
|
- rc = of_address_to_resource(dev->of_node, 0, &res);
|
|
|
|
- endpoint->registers = devm_ioremap_resource(dev, &res);
|
|
|
|
|
|
+ res = platform_get_resource(op, IORESOURCE_MEM, 0);
|
|
|
|
+ endpoint->registers = devm_ioremap_resource(dev, res);
|
|
|
|
|
|
if (IS_ERR(endpoint->registers))
|
|
if (IS_ERR(endpoint->registers))
|
|
return PTR_ERR(endpoint->registers);
|
|
return PTR_ERR(endpoint->registers);
|
|
|
|
|
|
- irq = irq_of_parse_and_map(dev->of_node, 0);
|
|
|
|
|
|
+ irq = platform_get_irq(op, 0);
|
|
|
|
|
|
rc = devm_request_irq(dev, irq, xillybus_isr, 0, xillyname, endpoint);
|
|
rc = devm_request_irq(dev, irq, xillybus_isr, 0, xillyname, endpoint);
|
|
|
|
|