From 52426d08918eadfba178f74e1bd5d1663f9c73e0 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Sun, 16 Jun 2013 21:15:09 +0200 Subject: imx233: fix pinctrl for stmp3600 and stmp3700 Change-Id: I87281b89315890fa285cb9a63fda5c90bdc8cdbf --- firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c') diff --git a/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c index c3f1908511..f89297b80c 100644 --- a/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c +++ b/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c @@ -144,7 +144,7 @@ void button_init_device(void) bool button_hold(void) { /* B0P04: #hold */ - return !imx233_pinctrl_get_gpio_mask(0, 0x10); + return !imx233_pinctrl_get_gpio(0, 4); } int button_read_device(void) @@ -172,10 +172,9 @@ int button_read_device(void) /* B2P07: #volume- * B2P08: #volume+ * PSWITCH: power */ - uint32_t mask = imx233_pinctrl_get_gpio_mask(2, 0x180); - if(!(mask & 0x80)) + if(!imx233_pinctrl_get_gpio(2, 7)) res |= BUTTON_VOL_DOWN; - if(!(mask & 0x100)) + if(!imx233_pinctrl_get_gpio(2, 8)) res |= BUTTON_VOL_UP; if(BF_RD(POWER_STS, PSWITCH) != 0 && power_ignore_counter == 0) res |= BUTTON_POWER; -- cgit v1.2.3