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/button-zenxfi2.c | |
| parent | f4fdf1ffe2189dafd1ebbbbf50f1a4626364ead3 (diff) | |
| download | rockbox-52426d08918eadfba178f74e1bd5d1663f9c73e0.tar.gz rockbox-52426d08918eadfba178f74e1bd5d1663f9c73e0.zip | |
imx233: fix pinctrl for stmp3600 and stmp3700
Change-Id: I87281b89315890fa285cb9a63fda5c90bdc8cdbf
Diffstat (limited to 'firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c')
| -rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c | 5 |
1 files changed, 2 insertions, 3 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) | |||
| 119 | int res = 0; | 119 | int res = 0; |
| 120 | /* B0P11: #power | 120 | /* B0P11: #power |
| 121 | * B0P14: #select */ | 121 | * B0P14: #select */ |
| 122 | uint32_t mask = imx233_pinctrl_get_gpio_mask(0, 0x4800); | 122 | if(!imx233_pinctrl_get_gpio(0, 11)) |
| 123 | if(!(mask & 0x800)) | ||
| 124 | res |= BUTTON_POWER; | 123 | res |= BUTTON_POWER; |
| 125 | if(!(mask & 0x4000)) | 124 | if(!imx233_pinctrl_get_gpio(0, 14)) |
| 126 | res |= BUTTON_MENU; | 125 | res |= BUTTON_MENU; |
| 127 | return res | touchscreen_read_device(data); | 126 | return res | touchscreen_read_device(data); |
| 128 | } | 127 | } |