ARM: dts: s5pv210: Correct fuelgauge definition on Aries

Correct the fuelgauge definition because only the fuelgauge on
fascinate4g has interrupt support (and even then it was wrong).

Also, assign the GPIO pinctrl so the interrupt is properly configured

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index cf85802..d3aeafc 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -425,10 +425,8 @@
                pinctrl-names = "default";
                pinctrl-0 = <&fg_i2c_pins>;
 
-               fuelgauge@36 {
+               fg: fuelgauge@36 {
                        compatible = "maxim,max17040";
-                       interrupt-parent = <&vic0>;
-                       interrupts = <7>;
                        reg = <0x36>;
                };
        };

diff --git a/arch/arm/boot/dts/s5pv210-fascinate4g.dts b/arch/arm/boot/dts/s5pv210-fascinate4g.dts
index 5e1b818..65eed01 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-fascinate4g.dts
+++ b/arch/arm/boot/dts/s5pv210-fascinate4g.dts
@@ -37,10 +37,27 @@
        };
 };
 
+&fg {
+       compatible = "maxim,max77836-battery";
+
+       interrupt-parent = <&gph3>;
+       interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&fg_irq>;
+};
+
 &pinctrl0 {
        pinctrl-names = "default";
        pinctrl-0 = <&sleep_cfg>;
 
+       fg_irq: fg-irq {
+               samsung,pins = "gph3-3";
+               samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+               samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
+               samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+       };
+
        /* Based on vendor kernel v2.6.35.7 */
        sleep_cfg: sleep-cfg {
                PIN_SLP(gpa0-0, PREV, NONE);