Unverified Commit 999462d3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Samsung DTS ARM64 changes for v5.20, part two

1. Correct SPI11 pin names on ExynosAutov9.
2. Add more USI (I2C/SPI/UART) devices to ExynosAutov9.

* tag 'samsung-dt64-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynosautov9: add usi device tree nodes
  arm64: dts: exynosautov9: prepare usi0 changes
  arm64: dts: exynosautov9: add pdma0 device tree node
  dt-bindings: soc: samsung: usi: add exynosautov9-usi compatible
  arm64: dts: exynosautov9: correct spi11 pin names

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8873d6b8 1ba1fd7d

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

+6 −2
Original line number Diff line number Diff line
@@ -22,8 +22,12 @@ properties: 
    pattern: "^usi@[0-9a-f]+$"



  compatible:

    enum:

      - samsung,exynos850-usi   # for USIv2 (Exynos850, ExynosAutoV9)

    oneOf:

      - items:

          - const: samsung,exynosautov9-usi

          - const: samsung,exynos850-usi

      - enum:

          - samsung,exynos850-usi



  reg: true

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

+3 −3
Original line number Diff line number Diff line
@@ -1089,21 +1089,21 @@ spi10_cs_func: spi10-cs-func-pins { 


	/* PERIC1 USI11_SPI */

	spi11_bus: spi11-pins {

		samsung,pins = "gpp3-6", "gpp3-5", "gpp3-4";

		samsung,pins = "gpp5-6", "gpp5-5", "gpp5-4";

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;

	};



	spi11_cs: spi11-cs-pins {

		samsung,pins = "gpp3-7";

		samsung,pins = "gpp5-7";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;

	};



	spi11_cs_func: spi11-cs-func-pins {

		samsung,pins = "gpp3-7";

		samsung,pins = "gpp5-7";

		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

		samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;

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

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ ufs_1_fixed_vcc_reg: regulator-1 { 
};



&serial_0 {

	pinctrl-0 = <&uart0_bus_dual>;

	status = "okay";

};
@@ -74,6 +75,7 @@ &ufs_1 { 
};



&usi_0 {

	samsung,clkreq-on; /* needed for UART mode */

	status = "okay";

};

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

+1082 −5

File changed.

Preview size limit exceeded, changes collapsed.