Unverified Commit 8873d6b8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-5.20-2' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 72e76dc2 3e27bf71

Documentation/devicetree/bindings/arm/samsung/samsung-soc.yaml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/samsung/samsung-soc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Samsung S3C, S5P and Exynos SoC compatibles naming convention



maintainers:

  - Krzysztof Kozlowski <krzk@kernel.org>



description: |

  Guidelines for new compatibles for SoC blocks/components.

  When adding new compatibles in new bindings, use the format::

    samsung,SoC-IP



  For example::

    samsung,exynos5433-cmu-isp



select:

  properties:

    compatible:

      pattern: "^samsung,.*(s3c|s5pv|exynos)[0-9a-z]+.*$"

  required:

    - compatible



properties:

  compatible:

    oneOf:

      - description: Preferred naming style for compatibles of SoC components

        pattern: "^samsung,(s3c|s5pv|exynos|exynosautov)[0-9]+-.*$"



      # Legacy compatibles with wild-cards - list cannot grow with new bindings:

      - enum:

          - samsung,exynos4x12-pinctrl

          - samsung,exynos4x12-usb2-phy

          - samsung,s3c64xx-pinctrl

          - samsung,s3c64xx-wakeup-eint



additionalProperties: true

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

+8 −5
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ properties: 
  reg:

    maxItems: 1



  assigned-clock-parents: true

  assigned-clocks: true



  '#clock-cells':

    const: 1
@@ -77,14 +74,20 @@ properties: 
      Must be identical to the that of the parent interrupt controller.

    const: 3



  reboot-mode:

    $ref: /schemas/power/reset/syscon-reboot-mode.yaml

    type: object

    description:

      Reboot mode to alter bootloader behavior for the next boot



  syscon-poweroff:

    $ref: "../../power/reset/syscon-poweroff.yaml#"

    $ref: /schemas/power/reset/syscon-poweroff.yaml#

    type: object

    description:

      Node for power off method



  syscon-reboot:

    $ref: "../../power/reset/syscon-reboot.yaml#"

    $ref: /schemas/power/reset/syscon-reboot.yaml#

    type: object

    description:

      Node for reboot method

arch/arm/boot/dts/exynos4.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ keypad: keypad@100a0000 { 
			status = "disabled";

		};



		sdhci_0: sdhci@12510000 {

		sdhci_0: mmc@12510000 {

			compatible = "samsung,exynos4210-sdhci";

			reg = <0x12510000 0x100>;

			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
@@ -325,7 +325,7 @@ sdhci_0: sdhci@12510000 { 
			status = "disabled";

		};



		sdhci_1: sdhci@12520000 {

		sdhci_1: mmc@12520000 {

			compatible = "samsung,exynos4210-sdhci";

			reg = <0x12520000 0x100>;

			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
@@ -334,7 +334,7 @@ sdhci_1: sdhci@12520000 { 
			status = "disabled";

		};



		sdhci_2: sdhci@12530000 {

		sdhci_2: mmc@12530000 {

			compatible = "samsung,exynos4210-sdhci";

			reg = <0x12530000 0x100>;

			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
@@ -343,7 +343,7 @@ sdhci_2: sdhci@12530000 { 
			status = "disabled";

		};



		sdhci_3: sdhci@12540000 {

		sdhci_3: mmc@12540000 {

			compatible = "samsung,exynos4210-sdhci";

			reg = <0x12540000 0x100>;

			interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/s3c2416.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ uart_3: serial@5000c000 { 
		status = "disabled";

	};



	sdhci_1: sdhci@4ac00000 {

	sdhci_1: mmc@4ac00000 {

		compatible = "samsung,s3c6410-sdhci";

		reg = <0x4AC00000 0x100>;

		interrupts = <0 0 21 3>;
@@ -56,7 +56,7 @@ sdhci_1: sdhci@4ac00000 { 
		status = "disabled";

	};



	sdhci_0: sdhci@4a800000 {

	sdhci_0: mmc@4a800000 {

		compatible = "samsung,s3c6410-sdhci";

		reg = <0x4A800000 0x100>;

		interrupts = <0 0 20 3>;

arch/arm/boot/dts/s3c64xx.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ vic1: interrupt-controller@71300000 { 
			#interrupt-cells = <1>;

		};



		sdhci0: sdhci@7c200000 {

		sdhci0: mmc@7c200000 {

			compatible = "samsung,s3c6410-sdhci";

			reg = <0x7c200000 0x100>;

			interrupt-parent = <&vic1>;
@@ -70,7 +70,7 @@ sdhci0: sdhci@7c200000 { 
			status = "disabled";

		};



		sdhci1: sdhci@7c300000 {

		sdhci1: mmc@7c300000 {

			compatible = "samsung,s3c6410-sdhci";

			reg = <0x7c300000 0x100>;

			interrupt-parent = <&vic1>;
@@ -81,7 +81,7 @@ sdhci1: sdhci@7c300000 { 
			status = "disabled";

		};



		sdhci2: sdhci@7c400000 {

		sdhci2: mmc@7c400000 {

			compatible = "samsung,s3c6410-sdhci";

			reg = <0x7c400000 0x100>;

			interrupt-parent = <&vic1>;