diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-02-20 22:02:40 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-02-20 22:02:40 +0100 |
| commit | b256c24cf876988d538b685540442c6a80229c68 (patch) | |
| tree | 190be7b1fa8d0725b5067b1bed5f5ce80e9dff2e | |
| parent | 6e66213fd5b1c74196fc36b3df4ac1c6b20908aa (diff) | |
| parent | 97d4b55111efd72926eb92cbd81c5ad8e6a7b3b1 (diff) | |
Merge tag 'samsung-drivers-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/drivers
Samsung SoC driver changes for v6.9
1. Add bindings for Google GS101 I2C controller and SYSREG sycon block.
2. Remove Tomasz Figa from Samsung clock and pinctrl maintainer entries.
* tag 'samsung-drivers-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
MAINTAINERS: Remove Tomasz from Samsung clock and pinctrl entries
dt-bindings: samsung: exynos-sysreg: gs101-peric0/1 require a clock
dt-bindings: i2c: exynos5: add google,gs101-hsi2c compatible
Link: https://lore.kernel.org/r/20240218182141.31213-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-exynos5.yaml | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml | 2 | ||||
| -rw-r--r-- | MAINTAINERS | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c-exynos5.yaml b/Documentation/devicetree/bindings/i2c/i2c-exynos5.yaml index df9c57bca2a8..cc8bba5537b9 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-exynos5.yaml +++ b/Documentation/devicetree/bindings/i2c/i2c-exynos5.yaml @@ -33,6 +33,7 @@ properties: - const: samsung,exynos7-hsi2c - items: - enum: + - google,gs101-hsi2c - samsung,exynos850-hsi2c - const: samsung,exynosautov9-hsi2c - const: samsung,exynos5-hsi2c # Exynos5250 and Exynos5420 diff --git a/Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml b/Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml index 1794e3799f21..c0c6ce8fc786 100644 --- a/Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml +++ b/Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml @@ -72,6 +72,8 @@ allOf: compatible: contains: enum: + - google,gs101-peric0-sysreg + - google,gs101-peric1-sysreg - samsung,exynos850-cmgp-sysreg - samsung,exynos850-peri-sysreg - samsung,exynos850-sysreg diff --git a/MAINTAINERS b/MAINTAINERS index 8d1052fa6a69..bd89405e2234 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17339,7 +17339,6 @@ F: Documentation/devicetree/bindings/pinctrl/renesas,* F: drivers/pinctrl/renesas/ PIN CONTROLLER - SAMSUNG -M: Tomasz Figa <tomasz.figa@gmail.com> M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> M: Sylwester Nawrocki <s.nawrocki@samsung.com> R: Alim Akhtar <alim.akhtar@samsung.com> @@ -19388,7 +19387,6 @@ F: drivers/media/platform/samsung/exynos4-is/ SAMSUNG SOC CLOCK DRIVERS M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> M: Sylwester Nawrocki <s.nawrocki@samsung.com> -M: Tomasz Figa <tomasz.figa@gmail.com> M: Chanwoo Choi <cw00.choi@samsung.com> R: Alim Akhtar <alim.akhtar@samsung.com> L: linux-samsung-soc@vger.kernel.org |