Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / mfd / mt6397-core.c

diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index 09bc7804952a4a8bb2775e79b6d75fff309742db..03929a6c6fc494bf04c71a3140d7d88630769495 100644 (file)
--- a/drivers/mfd/mt6397-core.c
+++ b/drivers/mfd/mt6397-core.c
@@ -21,9 +21,27 @@
 #include <linux/mfd/mt6397/core.h>
 #include <linux/mfd/mt6397/registers.h>
 
+#define MT6397_RTC_BASE                0xe000
+#define MT6397_RTC_SIZE                0x3e
+
+static const struct resource mt6397_rtc_resources[] = {
+       {
+               .start = MT6397_RTC_BASE,
+               .end   = MT6397_RTC_BASE + MT6397_RTC_SIZE,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = MT6397_IRQ_RTC,
+               .end   = MT6397_IRQ_RTC,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
 static const struct mfd_cell mt6397_devs[] = {
        {
                .name = "mt6397-rtc",
+               .num_resources = ARRAY_SIZE(mt6397_rtc_resources),
+               .resources = mt6397_rtc_resources,
                .of_compatible = "mediatek,mt6397-rtc",
        }, {
                .name = "mt6397-regulator",
@@ -34,6 +52,9 @@ static const struct mfd_cell mt6397_devs[] = {
        }, {
                .name = "mt6397-clk",
                .of_compatible = "mediatek,mt6397-clk",
+       }, {
+               .name = "mt6397-pinctrl",
+               .of_compatible = "mediatek,mt6397-pinctrl",
        },
 };
 
@@ -130,7 +151,7 @@ static int mt6397_irq_domain_map(struct irq_domain *d, unsigned int irq,
        return 0;
 }
 
-static struct irq_domain_ops mt6397_irq_domain_ops = {
+static const struct irq_domain_ops mt6397_irq_domain_ops = {
        .map = mt6397_irq_domain_map,
 };