Skip to content

Commit eb85788

Browse files
committed
Merge tag 'samsung-pinctrl-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel
Samsung pinctrl drivers changes for v6.15 1. Add pin controller drivers for newly usptreamed Samsung Exynos2200 and Exynos7870. 2. Correct filter configuration offset of some of Google GS101 SoC pin banks, which later is supposed to be used during system suspend/resume. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2 parents a326b05 + 701d0e9 commit eb85788

File tree

6 files changed

+413
-49
lines changed

6 files changed

+413
-49
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ properties:
4040
- items:
4141
- enum:
4242
- samsung,exynos5433-wakeup-eint
43+
- samsung,exynos7870-wakeup-eint
4344
- samsung,exynos7885-wakeup-eint
4445
- samsung,exynos850-wakeup-eint
4546
- samsung,exynos8895-wakeup-eint
4647
- const: samsung,exynos7-wakeup-eint
4748
- items:
4849
- enum:
4950
- google,gs101-wakeup-eint
51+
- samsung,exynos2200-wakeup-eint
5052
- samsung,exynos9810-wakeup-eint
5153
- samsung,exynos990-wakeup-eint
5254
- samsung,exynosautov9-wakeup-eint
@@ -104,6 +106,7 @@ allOf:
104106
- contains:
105107
enum:
106108
- samsung,exynos5433-wakeup-eint
109+
- samsung,exynos7870-wakeup-eint
107110
- samsung,exynos7885-wakeup-eint
108111
- samsung,exynos8895-wakeup-eint
109112
then:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ properties:
4242
- samsung,s3c2450-pinctrl
4343
- samsung,s3c64xx-pinctrl
4444
- samsung,s5pv210-pinctrl
45+
- samsung,exynos2200-pinctrl
4546
- samsung,exynos3250-pinctrl
4647
- samsung,exynos4210-pinctrl
4748
- samsung,exynos4x12-pinctrl
@@ -51,6 +52,7 @@ properties:
5152
- samsung,exynos5420-pinctrl
5253
- samsung,exynos5433-pinctrl
5354
- samsung,exynos7-pinctrl
55+
- samsung,exynos7870-pinctrl
5456
- samsung,exynos7885-pinctrl
5557
- samsung,exynos850-pinctrl
5658
- samsung,exynos8895-pinctrl

0 commit comments

Comments
 (0)