diff options
author | Krzysztof Kozlowski <krzk@kernel.org> | 2018-07-23 13:52:56 -0400 |
---|---|---|
committer | Krzysztof Kozlowski <krzk@kernel.org> | 2018-07-24 15:50:29 -0400 |
commit | bb928dfd06e5e5cef0b090ba23e894b2f37ee14e (patch) | |
tree | 9b429289e37974b3e016f88a43f9055707c08cae | |
parent | 615a673ce9a99122a3a44e5dee2f61bae82a757c (diff) |
pinctrl: samsung: Add dedicated compatible for S5Pv210 wakeup interrupts
The S5Pv210 external wakeup interrupts differ from Exynos therefore
separate compatible is needed. Duplicate existing flavor specific data
from exynos4210_wkup_irq_chip and add new compatible for S5Pv210.
At this point this new compatible does not bring anything new and works
exactly as existing "samsung,exynos4210-wakeup-eint".
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Sylwester Nawrocki <snawrocki@kernel.org>
Acked-by: Tomasz Figa <tomasz.figa@gmail.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
-rw-r--r-- | Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt | 2 | ||||
-rw-r--r-- | drivers/pinctrl/samsung/pinctrl-exynos.c | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt index f7700c9e0d0b..843a6cbf4774 100644 --- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt | |||
@@ -161,6 +161,8 @@ B. External Wakeup Interrupts: For supporting external wakeup interrupts, a | |||
161 | found on Samsung S3C2412 and S3C2413 SoCs, | 161 | found on Samsung S3C2412 and S3C2413 SoCs, |
162 | - samsung,s3c64xx-wakeup-eint: represents wakeup interrupt controller | 162 | - samsung,s3c64xx-wakeup-eint: represents wakeup interrupt controller |
163 | found on Samsung S3C64xx SoCs, | 163 | found on Samsung S3C64xx SoCs, |
164 | - samsung,s5pv210-wakeup-eint: represents wakeup interrupt controller | ||
165 | found on Samsung S5Pv210 SoCs, | ||
164 | - samsung,exynos4210-wakeup-eint: represents wakeup interrupt controller | 166 | - samsung,exynos4210-wakeup-eint: represents wakeup interrupt controller |
165 | found on Samsung Exynos4210 and S5PC110/S5PV210 SoCs. | 167 | found on Samsung Exynos4210 and S5PC110/S5PV210 SoCs. |
166 | - samsung,exynos7-wakeup-eint: represents wakeup interrupt controller | 168 | - samsung,exynos7-wakeup-eint: represents wakeup interrupt controller |
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c index a263ddd94945..29d86d704b0c 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos.c | |||
@@ -346,6 +346,22 @@ static int exynos_wkup_irq_set_wake(struct irq_data *irqd, unsigned int on) | |||
346 | /* | 346 | /* |
347 | * irq_chip for wakeup interrupts | 347 | * irq_chip for wakeup interrupts |
348 | */ | 348 | */ |
349 | static const struct exynos_irq_chip s5pv210_wkup_irq_chip __initconst = { | ||
350 | .chip = { | ||
351 | .name = "s5pv210_wkup_irq_chip", | ||
352 | .irq_unmask = exynos_irq_unmask, | ||
353 | .irq_mask = exynos_irq_mask, | ||
354 | .irq_ack = exynos_irq_ack, | ||
355 | .irq_set_type = exynos_irq_set_type, | ||
356 | .irq_set_wake = exynos_wkup_irq_set_wake, | ||
357 | .irq_request_resources = exynos_irq_request_resources, | ||
358 | .irq_release_resources = exynos_irq_release_resources, | ||
359 | }, | ||
360 | .eint_con = EXYNOS_WKUP_ECON_OFFSET, | ||
361 | .eint_mask = EXYNOS_WKUP_EMASK_OFFSET, | ||
362 | .eint_pend = EXYNOS_WKUP_EPEND_OFFSET, | ||
363 | }; | ||
364 | |||
349 | static const struct exynos_irq_chip exynos4210_wkup_irq_chip __initconst = { | 365 | static const struct exynos_irq_chip exynos4210_wkup_irq_chip __initconst = { |
350 | .chip = { | 366 | .chip = { |
351 | .name = "exynos4210_wkup_irq_chip", | 367 | .name = "exynos4210_wkup_irq_chip", |
@@ -380,6 +396,8 @@ static const struct exynos_irq_chip exynos7_wkup_irq_chip __initconst = { | |||
380 | 396 | ||
381 | /* list of external wakeup controllers supported */ | 397 | /* list of external wakeup controllers supported */ |
382 | static const struct of_device_id exynos_wkup_irq_ids[] = { | 398 | static const struct of_device_id exynos_wkup_irq_ids[] = { |
399 | { .compatible = "samsung,s5pv210-wakeup-eint", | ||
400 | .data = &s5pv210_wkup_irq_chip }, | ||
383 | { .compatible = "samsung,exynos4210-wakeup-eint", | 401 | { .compatible = "samsung,exynos4210-wakeup-eint", |
384 | .data = &exynos4210_wkup_irq_chip }, | 402 | .data = &exynos4210_wkup_irq_chip }, |
385 | { .compatible = "samsung,exynos7-wakeup-eint", | 403 | { .compatible = "samsung,exynos7-wakeup-eint", |