On Thu, Mar 31, 2011 at 02:30:00PM +0200, Michal Simek wrote:Support OF support. "generic-uio" compatible property is used.
Signed-off-by: Michal Simek <monstr@xxxxxxxxx>
---
drivers/uio/uio_pdrv_genirq.c | 60 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 7174d51..9e89806 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -23,6 +23,10 @@
#include <linux/pm_runtime.h>
#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/of_address.h>
+
#define DRIVER_NAME "uio_pdrv_genirq"
struct uio_pdrv_genirq_platdata {
@@ -92,11 +96,44 @@ static int uio_pdrv_genirq_irqcontrol(struct uio_info *dev_info, s32 irq_on)
static int uio_pdrv_genirq_probe(struct platform_device *pdev)
{
struct uio_info *uioinfo = pdev->dev.platform_data;
- struct uio_pdrv_genirq_platdata *priv;
+ struct uio_pdrv_genirq_platdata *priv = NULL;
struct uio_mem *uiomem;
int ret = -EINVAL;
int i;
+ if (!uioinfo) {
+ struct resource r_irq; /* Interrupt resources */
+ int rc = 0;
+
+ rc = of_address_to_resource(pdev->dev.of_node, 0,
+ &pdev->resource[0]);
+ if (rc) {
+ dev_err(&pdev->dev, "invalid address\n");
+ goto bad2;
+ }
+ pdev->num_resources = 1;
You shouldn't need this anymore. Device tree sourced platform_devices
get their resource table populated automatically. Also, drivers
should /never/ modify the resource values set in the device because it
messes up driver rebinding.
+
+ /* alloc uioinfo for one device */
+ uioinfo = kzalloc(sizeof(*uioinfo), GFP_KERNEL);
+ if (!uioinfo) {
+ ret = -ENOMEM;
+ dev_err(&pdev->dev, "unable to kmalloc\n");
+ goto bad2;
+ }
+ uioinfo->name = pdev->dev.of_node->name;
+ /* Use version for storing full IP name for identification */
+ uioinfo->version = pdev->dev.of_node->full_name;
Comment on the binding: You should probably use the first entry in the
compatible list for the name of the device. Node names should be
generic and usually they will say what a device does, but not what a
device actually /is/ (this is the Generic Names recommended practice).
Modern convention is to rely on the first compatible entry for
describing what ip block it is.