Skip to content

Commit 0e67413

Browse files
committed
Merge tag 'samsung-drivers-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/dt
Samsung SoC drivers for v6.17 1. Google GS101: Minor improvement PMU binding. 2. ExynosAutov920: Add HSI2 system registers binding. * tag 'samsung-drivers-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: dt-bindings: soc: samsung: exynos-sysreg: add hsi2 for ExynosAutov920 dt-bindings: soc: samsung: exynos-pmu: Constrain google,pmu-intr-gen-syscon Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 11949d2 + 687d974 commit 0e67413

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,9 @@ allOf:
203203
then:
204204
required:
205205
- google,pmu-intr-gen-syscon
206+
else:
207+
properties:
208+
google,pmu-intr-gen-syscon: false
206209

207210
examples:
208211
- |

Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ properties:
3030
- samsung,exynos8895-fsys1-sysreg
3131
- samsung,exynos8895-peric0-sysreg
3232
- samsung,exynos8895-peric1-sysreg
33+
- samsung,exynosautov920-hsi2-sysreg
3334
- samsung,exynosautov920-peric0-sysreg
3435
- samsung,exynosautov920-peric1-sysreg
3536
- tesla,fsd-cam-sysreg

0 commit comments

Comments
 (0)