UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Samsung DTS ARM64 changes for v5.12 

Correct Samsung PMIC and S3FWRN5 NFC interrupts trigger levels on
 TM2/TM2E and Espresso boards.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmAPBUwQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD19xPEACX14MjDi/YglhTj+tAQh8dtovyXoR7F+hY
 Fa3fZjUYZ7YMVlngm/dJTCT9i4lmjVQrFidhmx3oNO0LETNU8q0bUT4DevpKCf7J
 Im8hZcSNnIobgpfmiuy45wftgCjOBf4aKF6jUPmyhrPzDQ086udV8np5aGaT8Z2b
 s9Mlke1a3SYvJi5zsVD0un6pGdBwn+sBZwevAeitTj5qlv0nqOCMkbC58XGOgrig
 U+XfMnLowrxiemtDnlCbVz6YyYDPV6GnAEgyLYyQu/ftkRg4LHPUxT+6Z5mYPnZg
 xvFGyINdmb/5ABSOx+QjRv99piyJILqQ6skfcWwgAeUxNhoXCAXdVLitFfUIgKgF
 gsMR7jWQEsjGaQNTfpuhOxgU3bZl9mr0vVdyJrYfEg8R+ht1IBAF7y1zRyBi9Cgk
 t10OtHksjLsKT72Wv68nBYfPU04w/wuLrab10t5k/cZuVX0d0lLT1DT7+ziSPNvg
 A1WC6I/Ez/m+yYx3AE9IqqRMSTdPqRFcHQ+Xu/dcOFgNDkjs/ulutKDcXfHD0CER
 QjLrCDVHDYwoKWfUbd+As1ufwCZsBNybNiqR9MaXTo2hbKU1G9iJJhYnH55hfQo8
 +C7weMwFDxsjLl/N4aDwuy7nC89MXz/7rj6vbJ+LtCr9lHxEpsAz/X517/edEGIC
 d+UbWfKNgg==
 =PJA4
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2021-01-26 23:13:06 +01:00
parent cfd7eed903 545a540a9c
commit 1f99bd1a51
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,7 +388,7 @@
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 @@
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>;
};

2
arch/arm64/boot/dts/exynos/exynos7-espresso.dts
View File

@ -90,7 +90,7 @@
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>;