summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config/creativezenxfi2.h1
-rw-r--r--firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c9
2 files changed, 10 insertions, 0 deletions
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h
index b60c4441ee..cc38aae123 100644
--- a/firmware/export/config/creativezenxfi2.h
+++ b/firmware/export/config/creativezenxfi2.h
@@ -88,6 +88,7 @@
88#define HAVE_SW_TONE_CONTROLS 88#define HAVE_SW_TONE_CONTROLS
89 89
90#define CONFIG_KEYPAD CREATIVE_ZENXFI2_PAD 90#define CONFIG_KEYPAD CREATIVE_ZENXFI2_PAD
91#define HAVE_HEADPHONE_DETECTION
91#define HAVE_TOUCHSCREEN 92#define HAVE_TOUCHSCREEN
92#define HAVE_BUTTON_DATA 93#define HAVE_BUTTON_DATA
93 94
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c
index 4f2a2775bf..2e72eabdb4 100644
--- a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c
+++ b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c
@@ -78,6 +78,10 @@ void button_init_device(void)
78 imx233_pinctrl_acquire(0, 14, "select"); 78 imx233_pinctrl_acquire(0, 14, "select");
79 imx233_pinctrl_set_function(0, 14, PINCTRL_FUNCTION_GPIO); 79 imx233_pinctrl_set_function(0, 14, PINCTRL_FUNCTION_GPIO);
80 imx233_pinctrl_enable_gpio(0, 14, false); 80 imx233_pinctrl_enable_gpio(0, 14, false);
81 /* jack detect */
82 imx233_pinctrl_acquire(2, 7, "jack_detect");
83 imx233_pinctrl_set_function(2, 7, PINCTRL_FUNCTION_GPIO);
84 imx233_pinctrl_enable_gpio(2, 7, false);
81} 85}
82 86
83static int touch_to_pixels(int *val_x, int *val_y) 87static int touch_to_pixels(int *val_x, int *val_y)
@@ -119,6 +123,11 @@ static int touchscreen_read_device(int *data)
119 return touchscreen_to_pixels(x, y, data); 123 return touchscreen_to_pixels(x, y, data);
120} 124}
121 125
126bool headphones_inserted(void)
127{
128 return imx233_pinctrl_get_gpio(2, 7);
129}
130
122int button_read_device(int *data) 131int button_read_device(int *data)
123{ 132{
124 int res = 0; 133 int res = 0;