Unverified Commit 6dcb6ff6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Samsung DTS ARM64 changes for v6.4

1. Exynos850: add headers with AUD, G3D and HSI clock controller clock
   IDs. Add G3D (GPU) clock controller node.
2. Exynos5433: fixes for dtbs_check: move MIPI phy to PMU node.
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-dt64-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: add mmc aliases
  arm64: dts: exynos: drop mshc aliases
  arm64: dts: exynos: Add CMU_G3D node for Exynos850 SoC
  arm64: dts: exynos: move MIPI phy to PMU node in Exynos5433
  dt-bindings: clock: exynos850: Add AUD and HSI main gate clocks
  dt-bindings: clock: exynos850: Add Exynos850 CMU_G3D

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 837be1cc 5f671247

Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml

+19 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ properties: 
      - samsung,exynos850-cmu-cmgp

      - samsung,exynos850-cmu-core

      - samsung,exynos850-cmu-dpu

      - samsung,exynos850-cmu-g3d

      - samsung,exynos850-cmu-hsi

      - samsung,exynos850-cmu-is

      - samsung,exynos850-cmu-mfcmscl
@@ -169,6 +170,24 @@ allOf: 
            - const: oscclk

            - const: dout_dpu



  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos850-cmu-g3d



    then:

      properties:

        clocks:

          items:

            - description: External reference clock (26 MHz)

            - description: G3D clock (from CMU_TOP)



        clock-names:

          items:

            - const: oscclk

            - const: dout_g3d_switch



  - if:

      properties:

        compatible:

arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ aliases { 
		gsc0 = &gsc_0;

		gsc1 = &gsc_1;

		gsc2 = &gsc_2;

		mmc0 = &mshc_0;

		mmc2 = &mshc_2;

		pinctrl0 = &pinctrl_alive;

		pinctrl1 = &pinctrl_aud;

		pinctrl2 = &pinctrl_cpif;
@@ -40,8 +42,6 @@ aliases { 
		spi2 = &spi_2;

		spi3 = &spi_3;

		spi4 = &spi_4;

		mshc0 = &mshc_0;

		mshc2 = &mshc_2;

	};



	chosen {
@@ -952,6 +952,7 @@ &i2s1 { 


&mshc_0 {

	status = "okay";

	mmc-ddr-1_8v;

	mmc-hs200-1_8v;

	mmc-hs400-1_8v;

	cap-mmc-highspeed;

arch/arm64/boot/dts/exynos/exynos5433.dtsi

+9 −10
Original line number Diff line number Diff line
@@ -911,12 +911,20 @@ pinctrl_touch: pinctrl@14ce0000 { 
		};



		pmu_system_controller: system-controller@105c0000 {

			compatible = "samsung,exynos5433-pmu", "syscon";

			compatible = "samsung,exynos5433-pmu", "simple-mfd", "syscon";

			reg = <0x105c0000 0x5008>;

			#clock-cells = <1>;

			clock-names = "clkout16";

			clocks = <&xxti>;



			mipi_phy: mipi-phy {

				compatible = "samsung,exynos5433-mipi-video-phy";

				#phy-cells = <1>;

				samsung,cam0-sysreg = <&syscon_cam0>;

				samsung,cam1-sysreg = <&syscon_cam1>;

				samsung,disp-sysreg = <&syscon_disp>;

			};



			reboot: syscon-reboot {

				compatible = "syscon-reboot";

				regmap = <&pmu_system_controller>;
@@ -936,15 +944,6 @@ gic: interrupt-controller@11001000 { 
			interrupts = <GIC_PPI 9 0xf04>;

		};



		mipi_phy: video-phy {

			compatible = "samsung,exynos5433-mipi-video-phy";

			#phy-cells = <1>;

			samsung,pmu-syscon = <&pmu_system_controller>;

			samsung,cam0-sysreg = <&syscon_cam0>;

			samsung,cam1-sysreg = <&syscon_cam1>;

			samsung,disp-sysreg = <&syscon_disp>;

		};



		decon: decon@13800000 {

			compatible = "samsung,exynos5433-decon";

			reg = <0x13800000 0x2104>;

arch/arm64/boot/dts/exynos/exynos7-espresso.dts

+3 −2
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ / { 
	compatible = "samsung,exynos7-espresso", "samsung,exynos7";



	aliases {

		mmc0 = &mmc_0;

		mmc2 = &mmc_2;

		serial0 = &serial_2;

		mshc0 = &mmc_0;

		mshc2 = &mmc_2;

	};



	chosen {
@@ -362,6 +362,7 @@ pmic_irq: pmic-irq-pins { 
&mmc_0 {

	status = "okay";

	cap-mmc-highspeed;

	mmc-ddr-1_8v;

	mmc-hs200-1_8v;

	non-removable;

	card-detect-delay = <200>;

arch/arm64/boot/dts/exynos/exynos7885-jackpotlte.dts

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ / { 
	chassis-type = "handset";



	aliases {

		mmc0 = &mmc_0;

		serial0 = &serial_0;

		serial1 = &serial_1;

		serial2 = &serial_2;