Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'samsung-dt-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM changes for v5.20, part two

1. Cleanups: align SDHCI node names.
2. DT bindings: Document preferred compatible naming schema.
3. DT bindings: fixes and improvements to Exynos PMU bindings.

* tag 'samsung-dt-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
dt-bindings: soc: samsung: exynos-pmu: add reboot-mode
dt-bindings: soc: samsung: exynos-pmu: use abolute ref paths
dt-bindings: soc: samsung: exynos-pmu: cleanup assigned clocks
dt-bindings: samsung: document preferred compatible naming
ARM: dts: s5pv210: align SDHCI node name with dtschema
ARM: dts: s3c64xx: align SDHCI node name with dtschema
ARM: dts: s3c24xx: align SDHCI node name with dtschema
ARM: dts: exynos: align SDHCI node name with dtschema

Link: https://lore.kernel.org/r/20220707080408.69251-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+61 -18
+40
Documentation/devicetree/bindings/arm/samsung/samsung-soc.yaml
··· 1 + # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause 2 + %YAML 1.2 3 + --- 4 + $id: http://devicetree.org/schemas/arm/samsung/samsung-soc.yaml# 5 + $schema: http://devicetree.org/meta-schemas/core.yaml# 6 + 7 + title: Samsung S3C, S5P and Exynos SoC compatibles naming convention 8 + 9 + maintainers: 10 + - Krzysztof Kozlowski <krzk@kernel.org> 11 + 12 + description: | 13 + Guidelines for new compatibles for SoC blocks/components. 14 + When adding new compatibles in new bindings, use the format:: 15 + samsung,SoC-IP 16 + 17 + For example:: 18 + samsung,exynos5433-cmu-isp 19 + 20 + select: 21 + properties: 22 + compatible: 23 + pattern: "^samsung,.*(s3c|s5pv|exynos)[0-9a-z]+.*$" 24 + required: 25 + - compatible 26 + 27 + properties: 28 + compatible: 29 + oneOf: 30 + - description: Preferred naming style for compatibles of SoC components 31 + pattern: "^samsung,(s3c|s5pv|exynos|exynosautov)[0-9]+-.*$" 32 + 33 + # Legacy compatibles with wild-cards - list cannot grow with new bindings: 34 + - enum: 35 + - samsung,exynos4x12-pinctrl 36 + - samsung,exynos4x12-usb2-phy 37 + - samsung,s3c64xx-pinctrl 38 + - samsung,s3c64xx-wakeup-eint 39 + 40 + additionalProperties: true
+8 -5
Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml
··· 49 49 reg: 50 50 maxItems: 1 51 51 52 - assigned-clock-parents: true 53 - assigned-clocks: true 54 - 55 52 '#clock-cells': 56 53 const: 1 57 54 ··· 74 77 Must be identical to the that of the parent interrupt controller. 75 78 const: 3 76 79 80 + reboot-mode: 81 + $ref: /schemas/power/reset/syscon-reboot-mode.yaml 82 + type: object 83 + description: 84 + Reboot mode to alter bootloader behavior for the next boot 85 + 77 86 syscon-poweroff: 78 - $ref: "../../power/reset/syscon-poweroff.yaml#" 87 + $ref: /schemas/power/reset/syscon-poweroff.yaml# 79 88 type: object 80 89 description: 81 90 Node for power off method 82 91 83 92 syscon-reboot: 84 - $ref: "../../power/reset/syscon-reboot.yaml#" 93 + $ref: /schemas/power/reset/syscon-reboot.yaml# 85 94 type: object 86 95 description: 87 96 Node for reboot method
+4 -4
arch/arm/boot/dts/exynos4.dtsi
··· 316 316 status = "disabled"; 317 317 }; 318 318 319 - sdhci_0: sdhci@12510000 { 319 + sdhci_0: mmc@12510000 { 320 320 compatible = "samsung,exynos4210-sdhci"; 321 321 reg = <0x12510000 0x100>; 322 322 interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; ··· 325 325 status = "disabled"; 326 326 }; 327 327 328 - sdhci_1: sdhci@12520000 { 328 + sdhci_1: mmc@12520000 { 329 329 compatible = "samsung,exynos4210-sdhci"; 330 330 reg = <0x12520000 0x100>; 331 331 interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; ··· 334 334 status = "disabled"; 335 335 }; 336 336 337 - sdhci_2: sdhci@12530000 { 337 + sdhci_2: mmc@12530000 { 338 338 compatible = "samsung,exynos4210-sdhci"; 339 339 reg = <0x12530000 0x100>; 340 340 interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>; ··· 343 343 status = "disabled"; 344 344 }; 345 345 346 - sdhci_3: sdhci@12540000 { 346 + sdhci_3: mmc@12540000 { 347 347 compatible = "samsung,exynos4210-sdhci"; 348 348 reg = <0x12540000 0x100>; 349 349 interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
+2 -2
arch/arm/boot/dts/s3c2416.dtsi
··· 45 45 status = "disabled"; 46 46 }; 47 47 48 - sdhci_1: sdhci@4ac00000 { 48 + sdhci_1: mmc@4ac00000 { 49 49 compatible = "samsung,s3c6410-sdhci"; 50 50 reg = <0x4AC00000 0x100>; 51 51 interrupts = <0 0 21 3>; ··· 56 56 status = "disabled"; 57 57 }; 58 58 59 - sdhci_0: sdhci@4a800000 { 59 + sdhci_0: mmc@4a800000 { 60 60 compatible = "samsung,s3c6410-sdhci"; 61 61 reg = <0x4A800000 0x100>; 62 62 interrupts = <0 0 20 3>;
+3 -3
arch/arm/boot/dts/s3c64xx.dtsi
··· 59 59 #interrupt-cells = <1>; 60 60 }; 61 61 62 - sdhci0: sdhci@7c200000 { 62 + sdhci0: mmc@7c200000 { 63 63 compatible = "samsung,s3c6410-sdhci"; 64 64 reg = <0x7c200000 0x100>; 65 65 interrupt-parent = <&vic1>; ··· 70 70 status = "disabled"; 71 71 }; 72 72 73 - sdhci1: sdhci@7c300000 { 73 + sdhci1: mmc@7c300000 { 74 74 compatible = "samsung,s3c6410-sdhci"; 75 75 reg = <0x7c300000 0x100>; 76 76 interrupt-parent = <&vic1>; ··· 81 81 status = "disabled"; 82 82 }; 83 83 84 - sdhci2: sdhci@7c400000 { 84 + sdhci2: mmc@7c400000 { 85 85 compatible = "samsung,s3c6410-sdhci"; 86 86 reg = <0x7c400000 0x100>; 87 87 interrupt-parent = <&vic1>;
+4 -4
arch/arm/boot/dts/s5pv210.dtsi
··· 357 357 status = "disabled"; 358 358 }; 359 359 360 - sdhci0: sdhci@eb000000 { 360 + sdhci0: mmc@eb000000 { 361 361 compatible = "samsung,s3c6410-sdhci"; 362 362 reg = <0xeb000000 0x100000>; 363 363 interrupt-parent = <&vic1>; ··· 368 368 status = "disabled"; 369 369 }; 370 370 371 - sdhci1: sdhci@eb100000 { 371 + sdhci1: mmc@eb100000 { 372 372 compatible = "samsung,s3c6410-sdhci"; 373 373 reg = <0xeb100000 0x100000>; 374 374 interrupt-parent = <&vic1>; ··· 379 379 status = "disabled"; 380 380 }; 381 381 382 - sdhci2: sdhci@eb200000 { 382 + sdhci2: mmc@eb200000 { 383 383 compatible = "samsung,s3c6410-sdhci"; 384 384 reg = <0xeb200000 0x100000>; 385 385 interrupt-parent = <&vic1>; ··· 390 390 status = "disabled"; 391 391 }; 392 392 393 - sdhci3: sdhci@eb300000 { 393 + sdhci3: mmc@eb300000 { 394 394 compatible = "samsung,s3c6410-sdhci"; 395 395 reg = <0xeb300000 0x100000>; 396 396 interrupt-parent = <&vic3>;