Commit 1f99bd1a authored Jan 26, 2021 by Arnd Bergmann

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

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

Samsung DTS ARM64 changes for v5.12

Correct Samsung PMIC and S3FWRN5 NFC interrupts trigger levels on
TM2/TM2E and Espresso boards.

* tag 'samsung-dt64-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: correct S3FWRN5 NFC interrupt trigger level on TM2
  arm64: dts: exynos: correct PMIC interrupt trigger level on Espresso
  arm64: dts: exynos: correct PMIC interrupt trigger level on TM2

Link: https://lore.kernel.org/r/20210125191240.11278-4-krzk@kernel.org


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents cfd7eed9 545a540a

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -388,7 +388,7 @@ &hsi2c_0 {
		pmic@66 {
		compatible = "samsung,s2mps13-pmic";
		interrupt-parent = <&gpa0>;
		interrupts = <7 IRQ_TYPE_NONE>;
		interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
		reg = <0x66>;
		samsung,s2mps11-wrstbi-ground;

		@@ -793,7 +793,7 @@ s3fwrn5: nfc@27 {
		compatible = "samsung,s3fwrn5-i2c";
		reg = <0x27>;
		interrupt-parent = <&gpa1>;
		interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <3 IRQ_TYPE_EDGE_RISING>;
		en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
		wake-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
		};

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ &hsi2c_4 {
		pmic@66 {
		compatible = "samsung,s2mps15-pmic";
		reg = <0x66>;
		interrupts = <2 IRQ_TYPE_NONE>;
		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
		interrupt-parent = <&gpa0>;
		pinctrl-names = "default";
		pinctrl-0 = <&pmic_irq>;