diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-06-16 21:15:09 +0200 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-06-17 00:29:25 +0200 |
| commit | 52426d08918eadfba178f74e1bd5d1663f9c73e0 (patch) | |
| tree | 3a9488a65d7d3f854f84615238ce174dfd956c6a /firmware/target/arm/imx233/creative-zenxfi3 | |
| parent | f4fdf1ffe2189dafd1ebbbbf50f1a4626364ead3 (diff) | |
| download | rockbox-52426d08918eadfba178f74e1bd5d1663f9c73e0.tar.gz rockbox-52426d08918eadfba178f74e1bd5d1663f9c73e0.tar.bz2 rockbox-52426d08918eadfba178f74e1bd5d1663f9c73e0.zip | |
imx233: fix pinctrl for stmp3600 and stmp3700
Change-Id: I87281b89315890fa285cb9a63fda5c90bdc8cdbf
Diffstat (limited to 'firmware/target/arm/imx233/creative-zenxfi3')
| -rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c | 7 | ||||
| -rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c | 4 |
2 files changed, 5 insertions, 6 deletions
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; diff --git a/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c index de9e2df393..7afdaa316e 100644 --- a/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c +++ b/firmware/target/arm/imx233/creative-zenxfi3/lcd-zenxfi3.c @@ -54,7 +54,7 @@ static void setup_lcd_pins(bool use_lcdif) imx233_pinctrl_acquire(1, 21, "lcd cs"); imx233_pinctrl_acquire(1, 23, "lcd enable"); imx233_pinctrl_acquire(1, 25, "lcd vsync"); - imx233_pinctrl_acquire_mask(1, 0x3ffff, "lcd data"); + //imx233_pinctrl_acquire_mask(1, 0x3ffff, "lcd data"); if(use_lcdif) { imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_MAIN); /* lcd_vsync */ @@ -70,7 +70,7 @@ static void setup_lcd_pins(bool use_lcdif) else { HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} */ - imx233_pinctrl_enable_gpio_mask(1, 0x2bfffff, false); /* lcd_{d{0-17},reset,rs,wr,cs,enable,vsync} */ + HW_PINCTRL_DOEn_CLR(1) = 0x2bfffff; imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ |