3 files changed, 40 insertions, 10 deletions

diff --git a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
index e82aaf492517..f80519a98df8 100644
--- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
@@ -136,6 +136,8 @@ B. External Wakeup Interrupts: For supporting external wakeup interrupts, a
        found on Samsung S3C64xx SoCs,
      - samsung,exynos4210-wakeup-eint: represents wakeup interrupt controller
        found on Samsung Exynos4210 and S5PC110/S5PV210 SoCs.
+     - samsung,exynos7-wakeup-eint: represents wakeup interrupt controller
+       found on Samsung Exynos7 SoC.
    - interrupt-parent: phandle of the interrupt parent to which the external
      wakeup interrupts are forwarded to.
    - interrupts: interrupt used by multiplexed wakeup interrupts.
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c
index 7a7eb6a271eb..d97765c20466 100644
--- a/drivers/pinctrl/samsung/pinctrl-exynos.c
+++ b/drivers/pinctrl/samsung/pinctrl-exynos.c
@@ -56,12 +56,6 @@ static const struct samsung_pin_bank_type bank_type_alive = {
         .reg_offset = { 0x00, 0x04, 0x08, 0x0c, },
 };
 
-/* list of external wakeup controllers supported */
-static const struct of_device_id exynos_wkup_irq_ids[] = {
-        { .compatible = "samsung,exynos4210-wakeup-eint", },
-        { }
-};
-
 static void exynos_irq_mask(struct irq_data *irqd)
 {
         struct irq_chip *chip = irq_data_get_irq_chip(irqd);
@@ -384,9 +378,9 @@ static int exynos_wkup_irq_set_wake(struct irq_data *irqd, unsigned int on)
 /*
  * irq_chip for wakeup interrupts
  */
-static struct exynos_irq_chip exynos_wkup_irq_chip = {
+static struct exynos_irq_chip exynos4210_wkup_irq_chip __initdata = {
         .chip = {
-                .name = "exynos_wkup_irq_chip",
+                .name = "exynos4210_wkup_irq_chip",
                 .irq_unmask = exynos_irq_unmask,
                 .irq_mask = exynos_irq_mask,
                 .irq_ack = exynos_irq_ack,
@@ -400,6 +394,31 @@ static struct exynos_irq_chip exynos_wkup_irq_chip = {
         .eint_pend = EXYNOS_WKUP_EPEND_OFFSET,
 };
 
+static struct exynos_irq_chip exynos7_wkup_irq_chip __initdata = {
+        .chip = {
+                .name = "exynos7_wkup_irq_chip",
+                .irq_unmask = exynos_irq_unmask,
+                .irq_mask = exynos_irq_mask,
+                .irq_ack = exynos_irq_ack,
+                .irq_set_type = exynos_irq_set_type,
+                .irq_set_wake = exynos_wkup_irq_set_wake,
+                .irq_request_resources = exynos_irq_request_resources,
+                .irq_release_resources = exynos_irq_release_resources,
+        },
+        .eint_con = EXYNOS7_WKUP_ECON_OFFSET,
+        .eint_mask = EXYNOS7_WKUP_EMASK_OFFSET,
+        .eint_pend = EXYNOS7_WKUP_EPEND_OFFSET,
+};
+
+/* list of external wakeup controllers supported */
+static const struct of_device_id exynos_wkup_irq_ids[] = {
+        { .compatible = "samsung,exynos4210-wakeup-eint",
+                        .data = &exynos4210_wkup_irq_chip },
+        { .compatible = "samsung,exynos7-wakeup-eint",
+                        .data = &exynos7_wkup_irq_chip },
+        { }
+};
+
 /* interrupt handler for wakeup interrupts 0..15 */
 static void exynos_irq_eint0_15(unsigned int irq, struct irq_desc *desc)
 {
@@ -468,12 +487,18 @@ static int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
         struct samsung_pin_bank *bank;
         struct exynos_weint_data *weint_data;
         struct exynos_muxed_weint_data *muxed_data;
+        struct exynos_irq_chip *irq_chip;
         unsigned int muxed_banks = 0;
         unsigned int i;
         int idx, irq;
 
         for_each_child_of_node(dev->of_node, np) {
-                if (of_match_node(exynos_wkup_irq_ids, np)) {
+                const struct of_device_id *match;
+
+                match = of_match_node(exynos_wkup_irq_ids, np);
+                if (match) {
+                        irq_chip = kmemdup(match->data,
+                                sizeof(*irq_chip), GFP_KERNEL);
                         wkup_np = np;
                         break;
                 }
@@ -493,7 +518,7 @@ static int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
                         return -ENXIO;
                 }
 
-                bank->irq_chip = &exynos_wkup_irq_chip;
+                bank->irq_chip = irq_chip;
 
                 if (!of_find_property(bank->of_node, "interrupts", NULL)) {
                         bank->eint_type = EINT_TYPE_WKUP_MUX;
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.h b/drivers/pinctrl/samsung/pinctrl-exynos.h
index 3c91c357792f..0f0f7cedb2dc 100644
--- a/drivers/pinctrl/samsung/pinctrl-exynos.h
+++ b/drivers/pinctrl/samsung/pinctrl-exynos.h
@@ -25,6 +25,9 @@
 #define EXYNOS_WKUP_ECON_OFFSET         0xE00
 #define EXYNOS_WKUP_EMASK_OFFSET        0xF00
 #define EXYNOS_WKUP_EPEND_OFFSET        0xF40
+#define EXYNOS7_WKUP_ECON_OFFSET        0x700
+#define EXYNOS7_WKUP_EMASK_OFFSET       0x900
+#define EXYNOS7_WKUP_EPEND_OFFSET       0xA00
 #define EXYNOS_SVC_OFFSET               0xB08
 #define EXYNOS_EINT_FUNC                0xF