Merge tag 'for-f2fs-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[cascardo/linux.git] / drivers / gpio / gpio-mmio.c

diff --git a/drivers/gpio/gpio-mmio.c b/drivers/gpio/gpio-mmio.c
index 6c1cb3b..6ec144b 100644 (file)
--- a/drivers/gpio/gpio-mmio.c
+++ b/drivers/gpio/gpio-mmio.c
@@ -61,6 +61,8 @@ o        `                     ~~~~\___/~~~~    ` controller in FPGA is ,.`
 #include <linux/bitops.h>
 #include <linux/platform_device.h>
 #include <linux/mod_devicetable.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 
 static void bgpio_write8(void __iomem *reg, unsigned long data)
 {
@@ -569,6 +571,41 @@ static void __iomem *bgpio_map(struct platform_device *pdev,
        return devm_ioremap_resource(&pdev->dev, r);
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id bgpio_of_match[] = {
+       { .compatible = "wd,mbl-gpio" },
+       { }
+};
+MODULE_DEVICE_TABLE(of, bgpio_of_match);
+
+static struct bgpio_pdata *bgpio_parse_dt(struct platform_device *pdev,
+                                         unsigned long *flags)
+{
+       struct bgpio_pdata *pdata;
+
+       if (!of_match_device(bgpio_of_match, &pdev->dev))
+               return NULL;
+
+       pdata = devm_kzalloc(&pdev->dev, sizeof(struct bgpio_pdata),
+                            GFP_KERNEL);
+       if (!pdata)
+               return ERR_PTR(-ENOMEM);
+
+       pdata->base = -1;
+
+       if (of_property_read_bool(pdev->dev.of_node, "no-output"))
+               *flags |= BGPIOF_NO_OUTPUT;
+
+       return pdata;
+}
+#else
+static struct bgpio_pdata *bgpio_parse_dt(struct platform_device *pdev,
+                                         unsigned long *flags)
+{
+       return NULL;
+}
+#endif /* CONFIG_OF */
+
 static int bgpio_pdev_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -579,10 +616,19 @@ static int bgpio_pdev_probe(struct platform_device *pdev)
        void __iomem *dirout;
        void __iomem *dirin;
        unsigned long sz;
-       unsigned long flags = pdev->id_entry->driver_data;
+       unsigned long flags = 0;
        int err;
        struct gpio_chip *gc;
-       struct bgpio_pdata *pdata = dev_get_platdata(dev);
+       struct bgpio_pdata *pdata;
+
+       pdata = bgpio_parse_dt(pdev, &flags);
+       if (IS_ERR(pdata))
+               return PTR_ERR(pdata);
+
+       if (!pdata) {
+               pdata = dev_get_platdata(dev);
+               flags = pdev->id_entry->driver_data;
+       }
 
        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dat");
        if (!r)
@@ -646,6 +692,7 @@ MODULE_DEVICE_TABLE(platform, bgpio_id_table);
 static struct platform_driver bgpio_driver = {
        .driver = {
                .name = "basic-mmio-gpio",
+               .of_match_table = of_match_ptr(bgpio_of_match),
        },
        .id_table = bgpio_id_table,
        .probe = bgpio_pdev_probe,