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-zenxfi2 | |
| parent | f4fdf1ffe2189dafd1ebbbbf50f1a4626364ead3 (diff) | |
imx233: fix pinctrl for stmp3600 and stmp3700
Change-Id: I87281b89315890fa285cb9a63fda5c90bdc8cdbf
Diffstat (limited to 'firmware/target/arm/imx233/creative-zenxfi2')
| -rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c | 5 | ||||
| -rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c index b990becf26..74b8d649b3 100644 --- a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c +++ b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c @@ -119,10 +119,9 @@ int button_read_device(int *data) int res = 0; /* B0P11: #power * B0P14: #select */ - uint32_t mask = imx233_pinctrl_get_gpio_mask(0, 0x4800); - if(!(mask & 0x800)) + if(!imx233_pinctrl_get_gpio(0, 11)) res |= BUTTON_POWER; - if(!(mask & 0x4000)) + if(!imx233_pinctrl_get_gpio(0, 14)) res |= BUTTON_MENU; return res | touchscreen_read_device(data); } diff --git a/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c index 1e60e60463..9ff64c4c14 100644 --- a/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c +++ b/firmware/target/arm/imx233/creative-zenxfi2/lcd-zenxfi2.c @@ -53,7 +53,7 @@ static void setup_lcd_pins(bool use_lcdif) imx233_pinctrl_acquire(1, 23, "lcd enable"); imx233_pinctrl_acquire(1, 24, "lcd hsync"); 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 */ @@ -71,7 +71,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, 0x3ffffff, false); /* lcd_{d{0-17},reset,rs,wr,cs,dotclk,enable,hsync,vsync} */ + HW_PINCTRL_DOEn_CLR(1) = 0x3ffffff; /* lcd_{d{0-17},reset,rs,wr,cs,dotclk,enable,hsync,vsync} */ 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 */ |