diff options
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) | |||
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 | } |
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) | |||
53 | imx233_pinctrl_acquire(1, 23, "lcd enable"); | 53 | imx233_pinctrl_acquire(1, 23, "lcd enable"); |
54 | imx233_pinctrl_acquire(1, 24, "lcd hsync"); | 54 | imx233_pinctrl_acquire(1, 24, "lcd hsync"); |
55 | imx233_pinctrl_acquire(1, 25, "lcd vsync"); | 55 | imx233_pinctrl_acquire(1, 25, "lcd vsync"); |
56 | imx233_pinctrl_acquire_mask(1, 0x3ffff, "lcd data"); | 56 | //imx233_pinctrl_acquire_mask(1, 0x3ffff, "lcd data"); |
57 | if(use_lcdif) | 57 | if(use_lcdif) |
58 | { | 58 | { |
59 | imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_MAIN); /* lcd_vsync */ | 59 | imx233_pinctrl_set_function(1, 25, PINCTRL_FUNCTION_MAIN); /* lcd_vsync */ |
@@ -71,7 +71,7 @@ static void setup_lcd_pins(bool use_lcdif) | |||
71 | else | 71 | else |
72 | { | 72 | { |
73 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} */ | 73 | HW_PINCTRL_MUXSELn_SET(2) = 0xffffffff; /* lcd_d{0-15} */ |
74 | imx233_pinctrl_enable_gpio_mask(1, 0x3ffffff, false); /* lcd_{d{0-17},reset,rs,wr,cs,dotclk,enable,hsync,vsync} */ | 74 | HW_PINCTRL_DOEn_CLR(1) = 0x3ffffff; /* lcd_{d{0-17},reset,rs,wr,cs,dotclk,enable,hsync,vsync} */ |
75 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ | 75 | imx233_pinctrl_set_function(1, 16, PINCTRL_FUNCTION_GPIO); /* lcd_d16 */ |
76 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ | 76 | imx233_pinctrl_set_function(1, 17, PINCTRL_FUNCTION_GPIO); /* lcd_d17 */ |
77 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ | 77 | imx233_pinctrl_set_function(1, 19, PINCTRL_FUNCTION_GPIO); /* lcd_rs */ |