Unverified Commit 08caced4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Samsung DTS ARM64 changes for v6.6

1. Add dedicated compatibles for PWM block.
2. Add PWM to ExynosAutov9 SADK board.
3. Few white-space and other cleanups.

* tag 'samsung-dt64-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: exynos5433-tm2: drop redundant status=okay
  arm64: dts: exynos: add pwm node for exynosautov9-sadk
  dt-bindings: pwm: samsung: add exynosautov9 compatible
  arm64: dts: fsd: minor whitespace cleanup around '='
  arm64: dts: exynos: minor whitespace cleanup around '='
  arm64: dts: exynos: add missing space before {

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 083f1015 d157d437

Documentation/devicetree/bindings/pwm/pwm-samsung.yaml

+11 −6
Original line number Diff line number Diff line
@@ -20,12 +20,17 @@ description: |+ 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - samsung,s3c2410-pwm             # 16-bit, S3C24xx

          - samsung,s3c6400-pwm             # 32-bit, S3C64xx

          - samsung,s5p6440-pwm             # 32-bit, S5P64x0

          - samsung,s5pc100-pwm             # 32-bit, S5PC100, S5PV210, Exynos4210 rev0 SoCs

          - samsung,exynos4210-pwm          # 32-bit, Exynos

      - items:

          - enum:

              - samsung,exynosautov9-pwm

          - const: samsung,exynos4210-pwm



  reg:

    maxItems: 1

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

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ sound { 
			/* Receiver */

			"RCV", "HPOUT3L",

			"RCV", "HPOUT3R";

		status = "okay";

	};

};

arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts

+6 −0
Original line number Diff line number Diff line
@@ -49,6 +49,12 @@ ufs_1_fixed_vcc_reg: regulator-1 { 
	};

};



&pwm {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm_tout3>;

	status = "okay";

};



&serial_0 {

	pinctrl-0 = <&uart0_bus_dual>;

	status = "okay";

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

+12 −1
Original line number Diff line number Diff line
@@ -1560,6 +1560,17 @@ watchdog_cl1: watchdog@10060000 { 
			samsung,syscon-phandle = <&pmu_system_controller>;

			samsung,cluster-index = <1>;

		};



		pwm: pwm@103f0000 {

			compatible = "samsung,exynosautov9-pwm",

				     "samsung,exynos4210-pwm";

			reg = <0x103f0000 0x100>;

			samsung,pwm-outputs = <0>, <1>, <2>, <3>;

			#pwm-cells = <3>;

			clocks = <&xtcxo>;

			clock-names = "timers";

			status = "disabled";

		};

	};

};

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

+4 −4

File changed.

Contains only whitespace changes.

arch/arm64/boot/dts/tesla/fsd.dtsi

+2 −2

File changed.

Contains only whitespace changes.