diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2014-02-16 20:47:09 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2014-02-16 20:53:08 +0100 |
commit | f0f1758067b7afb9d8b56d12f1672861269fd7da (patch) | |
tree | 75413c27a3d4e6d8c51ddabe33c6fcb8c8e3a61b | |
parent | 6b3c29da6979aeb31e9e0eccaed9a3cfd4b9ad3c (diff) | |
download | rockbox-f0f1758067b7afb9d8b56d12f1672861269fd7da.tar.gz rockbox-f0f1758067b7afb9d8b56d12f1672861269fd7da.zip |
zenxfi2: implement headphones detection
Change-Id: Ifbc8b10cebb3b7b126f1d6a212f6731f91e234e4
-rw-r--r-- | firmware/export/config/creativezenxfi2.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c | 9 |
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 | ||
83 | static int touch_to_pixels(int *val_x, int *val_y) | 87 | static 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 | ||
126 | bool headphones_inserted(void) | ||
127 | { | ||
128 | return imx233_pinctrl_get_gpio(2, 7); | ||
129 | } | ||
130 | |||
122 | int button_read_device(int *data) | 131 | int button_read_device(int *data) |
123 | { | 132 | { |
124 | int res = 0; | 133 | int res = 0; |