3.16.63-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Marek Szyprowski <m.szyprow...@samsung.com>

commit f5e758b8358f6c27e8a351ddf0b441a64cdabb94 upstream.

PMIC_IRQB and PMIC_KEYINB lines on Exynos4210-based Origen board have
external pull-up resistors, so disable any pull control for those lines
in respective pin controller node. This fixes support for MAX8997
interrupts and enables operation of wakeup from MAX8997 RTC alarm.

Signed-off-by: Marek Szyprowski <m.szyprow...@samsung.com>
Fixes: 17419726aaa1 ("ARM: dts: add max8997 device node for exynos4210-origen 
board")
Signed-off-by: Krzysztof Kozlowski <k...@kernel.org>
[bwh: Backported to 3.16:
 - Use literal 0 instead of EXYNOS_PIN_PULL_NONE
 - Adjust context, indentation]
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 arch/arm/boot/dts/exynos4210-origen.dts | 9 +++++++++
 1 file changed, 9 insertions(+)

--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -115,6 +115,8 @@
                        reg = <0x66>;
                        interrupt-parent = <&gpx0>;
                        interrupts = <4 0>, <3 0>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&max8997_irq>;
 
                        max8997,pmic-buck1-dvs-voltage = <1350000>;
                        max8997,pmic-buck2-dvs-voltage = <1100000>;
@@ -334,3 +336,10 @@
                };
        };
 };
+
+&pinctrl_1 {
+       max8997_irq: max8997-irq {
+               samsung,pins = "gpx0-3", "gpx0-4";
+               samsung,pin-pud = <0>;
+       };
+};

Reply via email to