diff options
author | Arnd Bergmann <arnd@arndb.de> | 2024-09-02 09:44:21 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2024-09-02 09:44:22 +0000 |
commit | 8f99d776b940817357c63f6fd155576e8665f258 (patch) | |
tree | f00bfc8b82f86f5e6de9bc091cd75c6573bafbec /Documentation | |
parent | a79f256fc99d6d7aa4a8c738c28cc876e5ef1435 (diff) | |
parent | 259f5082721f1d17b4e5b9dc2bb430821afd95aa (diff) |
Merge tag 'samsung-drivers-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/drivers
Samsung SoC drivers for v6.12
1. Improve Samsung USI (Universal Serial Interface) DT binding,
2. Cleanup old Samsung MFC TXT binding.
* tag 'samsung-drivers-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
dt-bindings: media: s5p-mfc: Remove s5p-mfc.txt binding
dt-bindings: samsung: exynos-usi: add missing constraints
Link: https://lore.kernel.org/r/20240827121638.29707-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/media/s5p-mfc.txt | 0 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml | 15 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/Documentation/devicetree/bindings/media/s5p-mfc.txt +++ /dev/null diff --git a/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml b/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml index 8b478d6cdc30..f80fcbc3128b 100644 --- a/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml +++ b/Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml @@ -32,11 +32,16 @@ properties: - enum: - samsung,exynos850-usi - reg: true + reg: + maxItems: 1 - clocks: true + clocks: + maxItems: 2 - clock-names: true + clock-names: + items: + - const: pclk + - const: ipclk ranges: true @@ -113,9 +118,7 @@ then: - description: Operating clock for UART/SPI/I2C protocol clock-names: - items: - - const: pclk - - const: ipclk + maxItems: 2 required: - reg |