Skip to content

Commit ef15f68

Browse files
committed
Merge tag 'samsung-pinctrl-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel
Samsung pinctrl drivers changes for v6.13 1. Add new pin controller drivers for new Samsung SoCs: Exynos8895, Exynos9810, Exynos990. 2. Correct the condition when applying further interrupt constraints on certain Samsung pin controllers. The condition was simply not effective. Signed-off-by: Linus Walleij <[email protected]>
2 parents c34b206 + 6d2dbd4 commit ef15f68

File tree

6 files changed

+468
-8
lines changed

6 files changed

+468
-8
lines changed

Documentation/devicetree/bindings/pinctrl/samsung,pinctrl-wakeup-interrupt.yaml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,13 @@ properties:
4242
- samsung,exynos5433-wakeup-eint
4343
- samsung,exynos7885-wakeup-eint
4444
- samsung,exynos850-wakeup-eint
45+
- samsung,exynos8895-wakeup-eint
4546
- const: samsung,exynos7-wakeup-eint
4647
- items:
4748
- enum:
4849
- google,gs101-wakeup-eint
50+
- samsung,exynos9810-wakeup-eint
51+
- samsung,exynos990-wakeup-eint
4952
- samsung,exynosautov9-wakeup-eint
5053
- const: samsung,exynos850-wakeup-eint
5154
- const: samsung,exynos7-wakeup-eint
@@ -91,14 +94,18 @@ allOf:
9194
- if:
9295
properties:
9396
compatible:
94-
# Match without "contains", to skip newer variants which are still
95-
# compatible with samsung,exynos7-wakeup-eint
96-
enum:
97-
- samsung,s5pv210-wakeup-eint
98-
- samsung,exynos4210-wakeup-eint
99-
- samsung,exynos5433-wakeup-eint
100-
- samsung,exynos7-wakeup-eint
101-
- samsung,exynos7885-wakeup-eint
97+
oneOf:
98+
# Match without "contains", to skip newer variants which are still
99+
# compatible with samsung,exynos7-wakeup-eint
100+
- enum:
101+
- samsung,exynos4210-wakeup-eint
102+
- samsung,exynos7-wakeup-eint
103+
- samsung,s5pv210-wakeup-eint
104+
- contains:
105+
enum:
106+
- samsung,exynos5433-wakeup-eint
107+
- samsung,exynos7885-wakeup-eint
108+
- samsung,exynos8895-wakeup-eint
102109
then:
103110
properties:
104111
interrupts:

Documentation/devicetree/bindings/pinctrl/samsung,pinctrl.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ properties:
5353
- samsung,exynos7-pinctrl
5454
- samsung,exynos7885-pinctrl
5555
- samsung,exynos850-pinctrl
56+
- samsung,exynos8895-pinctrl
57+
- samsung,exynos9810-pinctrl
58+
- samsung,exynos990-pinctrl
5659
- samsung,exynosautov9-pinctrl
5760
- samsung,exynosautov920-pinctrl
5861
- tesla,fsd-pinctrl

0 commit comments

Comments
 (0)