diff options
| author | Tony Lindgren <tony@atomide.com> | 2017-08-10 09:05:53 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-08-10 09:05:53 -0700 |
| commit | c002c27874faaa170b535d03d7efee89ecdd9be4 (patch) | |
| tree | 70d91eba77a9c374e4f0bf9eb8636acba57ca173 /arch/arm/boot/dts/exynos3250-monk.dts | |
| parent | 866b5e447f1ad3a0d72c139fabe3dd71f351f361 (diff) | |
| parent | 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff) | |
Merge tag 'v4.13-rc1' into omap-for-v4.14/mmc-regulator
Linux v4.13-rc1
Diffstat (limited to 'arch/arm/boot/dts/exynos3250-monk.dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos3250-monk.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts index cccfe4b791d1..accee81da266 100644 --- a/arch/arm/boot/dts/exynos3250-monk.dts +++ b/arch/arm/boot/dts/exynos3250-monk.dts @@ -67,7 +67,7 @@ max77836: subpmic@25 { compatible = "maxim,max77836"; interrupt-parent = <&gpx1>; - interrupts = <5 0>; + interrupts = <5 IRQ_TYPE_NONE>; reg = <0x25>; wakeup-source; @@ -191,7 +191,7 @@ s2mps14_pmic@66 { compatible = "samsung,s2mps14-pmic"; interrupt-parent = <&gpx0>; - interrupts = <7 0>; + interrupts = <7 IRQ_TYPE_NONE>; reg = <0x66>; wakeup-source; @@ -414,7 +414,7 @@ fuelgauge@36 { compatible = "maxim,max77836-battery"; interrupt-parent = <&gpx1>; - interrupts = <2 8>; + interrupts = <2 IRQ_TYPE_LEVEL_LOW>; reg = <0x36>; }; }; |