Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/cadence', 'spi/topic...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / syscon.c

diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index dbea55de4397d5055da2b3fe39283fa36abea1f1..ca15878ce5c09ea8c9f2f20c8634c0613ee2cb61 100644 (file)
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -18,6 +18,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
+#include <linux/platform_data/syscon.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/mfd/syscon.h>
@@ -94,7 +95,11 @@ struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np,
        struct device_node *syscon_np;
        struct regmap *regmap;
 
-       syscon_np = of_parse_phandle(np, property, 0);
+       if (property)
+               syscon_np = of_parse_phandle(np, property, 0);
+       else
+               syscon_np = np;
+
        if (!syscon_np)
                return ERR_PTR(-ENODEV);
 
@@ -119,6 +124,7 @@ static struct regmap_config syscon_regmap_config = {
 static int syscon_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
+       struct syscon_platform_data *pdata = dev_get_platdata(dev);
        struct syscon *syscon;
        struct resource *res;
        void __iomem *base;
@@ -136,6 +142,8 @@ static int syscon_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        syscon_regmap_config.max_register = res->end - res->start - 3;
+       if (pdata)
+               syscon_regmap_config.name = pdata->label;
        syscon->regmap = devm_regmap_init_mmio(dev, base,
                                        &syscon_regmap_config);
        if (IS_ERR(syscon->regmap)) {