Unverified Commit cfb6bb38 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-6.4' of... 

Merge tag 'samsung-dt-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/dt

Samsung DTS ARM changes for v6.4

1. Several cleanups and improvements as a result of dtbs_checks: align
   node names with bindings, drop incorrect properties, fix clock-names,
   add missing "ports" node.
2. Move DP and MIPI phys to PMU node (DTS with binding change).
3. Drop old MSHC aliases (while adding proper mmc-ddr-1_8v which was
   selected by the driver based on the MSHC alias) and add generic MMC
   aliases in each board.  The aliases match known numbering in
   the schematics.

* tag 'samsung-dt-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  dt-bindings: soc: samsung: exynos-pmu: allow phys as child on Exynos3 and Exynos4
  ARM: dts: exynos: add mmc aliases
  ARM: dts: exynos: replace mshc0 alias with mmc-ddr-1_8v property
  ARM: dts: exynos: fix MCT compatible in Universal C210
  ARM: dts: exynos: move DP and MIPI phys to PMU node in Exynos5250
  ARM: dts: exynos: move DP and MIPI phys to PMU node in Exynos5420
  ARM: dts: exynos: move MIPI phy to PMU node in Exynos4
  ARM: dts: exynos: move MIPI phy to PMU node in Exynos3250
  ARM: dts: exynos: drop unused samsung,camclk-out property in Midas
  ARM: dts: s5pv210: correct MIPI CSIS clock name
  ARM: dts: exynos: correct whitespace in Midas
  ARM: dts: exynos: fix WM8960 clock name in Itop Elite
  ARM: dts: exynos: add ports to TC358764 bridge on Arndale
  ARM: dts: exynos: drop fake align STMPE properties in P4 Note
  ARM: dts: exynos: align STMPE ADC node name with bindings in P4 Note

Link: https://lore.kernel.org/r/20230405080438.156805-2-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6dcb6ff6 e154a338

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

+21 −2
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ properties: 
          - const: syscon

      - items:

          - enum:

              - samsung,exynos3250-pmu

              - samsung,exynos4210-pmu

              - samsung,exynos4412-pmu

              - samsung,exynos5250-pmu

              - samsung,exynos5420-pmu

              - samsung,exynos5433-pmu
@@ -138,18 +141,34 @@ allOf: 
        compatible:

          contains:

            enum:

              - samsung,exynos3250-pmu

              - samsung,exynos4210-pmu

              - samsung,exynos4412-pmu

              - samsung,exynos5250-pmu

              - samsung,exynos5420-pmu

              - samsung,exynos5433-pmu

    then:

      properties:

        dp-phy: true

        mipi-phy: true

    else:

      properties:

        dp-phy: false

        mipi-phy: false



  - if:

      properties:

        compatible:

          contains:

            enum:

              - samsung,exynos5250-pmu

              - samsung,exynos5420-pmu

              - samsung,exynos5433-pmu

    then:

      properties:

        dp-phy: true

    else:

      properties:

        dp-phy: false



examples:

  - |

    #include <dt-bindings/clock/exynos5250.h>

arch/arm/boot/dts/exynos3250-artik5-eval.dts

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ / { 
	model = "Samsung ARTIK5 evaluation board";

	compatible = "samsung,artik5-eval", "samsung,artik5",

			"samsung,exynos3250", "samsung,exynos3";



	aliases {

		mmc0 = &mshc_2;

	};

};



&mshc_2 {

arch/arm/boot/dts/exynos3250-artik5.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ 
/ {

	compatible = "samsung,artik5", "samsung,exynos3250", "samsung,exynos3";



	aliases {

		mmc0 = &mshc_0;

		mmc1 = &mshc_1;

	};



	chosen {

		stdout-path = &serial_2;

	};
@@ -321,6 +326,7 @@ &mshc_0 { 
	vmmc-supply = <&ldo12_reg>;

	clock-frequency = <100000000>;

	max-frequency = <100000000>;

	mmc-ddr-1_8v;

	samsung,dw-mshc-ciu-div = <1>;

	samsung,dw-mshc-sdr-timing = <0 1>;

	samsung,dw-mshc-ddr-timing = <1 2>;

arch/arm/boot/dts/exynos3250-monk.dts

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ / { 


	aliases {

		i2c7 = &i2c_max77836;

		mmc0 = &mshc_0;

	};



	memory@40000000 {
@@ -443,6 +444,7 @@ &mshc_0 { 
	vmmc-supply = <&vemmc_reg>;

	clock-frequency = <100000000>;

	max-frequency = <100000000>;

	mmc-ddr-1_8v;

	samsung,dw-mshc-ciu-div = <1>;

	samsung,dw-mshc-sdr-timing = <0 1>;

	samsung,dw-mshc-ddr-timing = <1 2>;

arch/arm/boot/dts/exynos3250-rinato.dts

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ / { 


	aliases {

		i2c7 = &i2c_max77836;

		mmc0 = &mshc_0;

		mmc1 = &mshc_1;

	};



	chosen {
@@ -624,6 +626,7 @@ &mshc_0 { 
	vmmc-supply = <&ldo12_reg>;

	clock-frequency = <100000000>;

	max-frequency = <100000000>;

	mmc-ddr-1_8v;

	samsung,dw-mshc-ciu-div = <1>;

	samsung,dw-mshc-sdr-timing = <0 1>;

	samsung,dw-mshc-ddr-timing = <1 2>;