drivers/rtc/rtc-palmas.c: init wakeup before device register

[cascardo/linux.git] / drivers / irqchip / irq-renesas-intc-irqpin.c

diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
index 5a68e5a..82cec63 100644 (file)
--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
@@ -347,8 +348,14 @@ static int intc_irqpin_probe(struct platform_device *pdev)
        }
 
        /* deal with driver instance configuration */
-       if (pdata)
+       if (pdata) {
                memcpy(&p->config, pdata, sizeof(*pdata));
+       } else {
+               of_property_read_u32(pdev->dev.of_node, "sense-bitfield-width",
+                                    &p->config.sense_bitfield_width);
+               p->config.control_parent = of_property_read_bool(pdev->dev.of_node,
+                                                                "control-parent");
+       }
        if (!p->config.sense_bitfield_width)
                p->config.sense_bitfield_width = 4; /* default to 4 bits */