| Message ID | 1347016499-29354-15-git-send-email-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 7, 2012 at 1:14 PM, Lee Jones <lee.jones@linaro.org> wrote: > This patch ensures the tc3589x and tc3598x-gpio devices are > rightfully given interrupt controller status. We also describe > the tc3598x-gpio GPIO expander in full and specify it as a GPIO > controller. Finally we reference that the external MMC slot's > Card Detection GPIO on the HREF is located on the tc3598x-gpio > expander. > > Signed-off-by: Lee Jones <lee.jones@linaro.org> This should come after the enablement patches instead of before them, right? (Or be merged into them even as we've discussed.) Apart from that it looks good, Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Mon, Sep 10, 2012 at 05:58:41AM -0700, Linus Walleij wrote: > On Fri, Sep 7, 2012 at 1:14 PM, Lee Jones <lee.jones@linaro.org> wrote: > > > This patch ensures the tc3589x and tc3598x-gpio devices are > > rightfully given interrupt controller status. We also describe > > the tc3598x-gpio GPIO expander in full and specify it as a GPIO > > controller. Finally we reference that the external MMC slot's > > Card Detection GPIO on the HREF is located on the tc3598x-gpio > > expander. > > > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > This should come after the enablement patches instead of > before them, right? (Or be merged into them even as > we've discussed.) No, it needs to come before, or else the legacy values will be used which aren't correct. > Apart from that it looks good, > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > Yours, > Linus Walleij
diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts index ec9ec4f..b3290c7 100644 --- a/arch/arm/boot/dts/hrefv60plus.dts +++ b/arch/arm/boot/dts/hrefv60plus.dts @@ -42,7 +42,7 @@ mmc-cap-mmc-highspeed; vmmc-supply = <&ab8500_ldo_aux3_reg>; - cd-gpios = <&gpio2 31 0x4>; // 95 + cd-gpios = <&tc3589x_gpio 3 0x4>; status = "okay"; }; @@ -100,6 +100,21 @@ tc3589x@42 { compatible = "tc3589x"; reg = <0x42>; + interrupt-parent = <&gpio6>; + interrupts = <25 0x1>; + + interrupt-controller; + #interrupt-cells = <2>; + + tc3589x_gpio: tc3589x_gpio { + compatible = "tc3589x-gpio"; + interrupts = <0 0x1>; + + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; + }; }; tps61052@33 { compatible = "tps61052";
This patch ensures the tc3589x and tc3598x-gpio devices are rightfully given interrupt controller status. We also describe the tc3598x-gpio GPIO expander in full and specify it as a GPIO controller. Finally we reference that the external MMC slot's Card Detection GPIO on the HREF is located on the tc3598x-gpio expander. Signed-off-by: Lee Jones <lee.jones@linaro.org> --- arch/arm/boot/dts/hrefv60plus.dts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)