From a8b816ae9cc00fe216e43d9bd9276b5d8cf12b25 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Mon, 18 Nov 2013 15:08:53 +0000 Subject: creativezenmozaic: factor out code with the zen/zenxfi Most of the code is similar, only the lcd driver is significantly different. Change-Id: I9eab1faf08d2356f2d820d6930ef3b0653349aa1 --- firmware/target/arm/imx233/creative-zen/button-zen.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'firmware/target/arm/imx233/creative-zen/button-zen.c') diff --git a/firmware/target/arm/imx233/creative-zen/button-zen.c b/firmware/target/arm/imx233/creative-zen/button-zen.c index cacc47d448..1997f91357 100644 --- a/firmware/target/arm/imx233/creative-zen/button-zen.c +++ b/firmware/target/arm/imx233/creative-zen/button-zen.c @@ -57,6 +57,19 @@ struct imx233_button_lradc_mapping_t imx233_button_lradc_mapping[] = {2945, BUTTON_PLAYPAUSE}, {3400, 0}, {0, IMX233_BUTTON_LRADC_END}, +#elif defined(CREATIVE_ZENMOZAIC) + {0, IMX233_BUTTON_LRADC_HOLD}, + {200, BUTTON_MENU}, + {445, BUTTON_SHORTCUT}, + {645, BUTTON_UP}, + {860, BUTTON_LEFT}, + {1060, BUTTON_RIGHT}, + {1260, BUTTON_DOWN}, + {1480, BUTTON_SELECT}, + {2700, BUTTON_BACK}, + {2945, BUTTON_PLAYPAUSE}, + {3400, 0}, + {0, IMX233_BUTTON_LRADC_END}, #else #error wrong target #endif @@ -65,6 +78,11 @@ struct imx233_button_lradc_mapping_t imx233_button_lradc_mapping[] = void button_init_device(void) { imx233_button_lradc_init(); +#if defined(CREATIVE_ZENXFI) || defined(CREATIVE_ZENMOZAIC) + imx233_pinctrl_acquire(2, 8, "jack_detect"); + imx233_pinctrl_set_function(2, 8, PINCTRL_FUNCTION_GPIO); + imx233_pinctrl_enable_gpio(2, 8, false); +#endif } bool button_hold(void) @@ -72,7 +90,7 @@ bool button_hold(void) return imx233_button_lradc_hold(); } -#ifdef CREATIVE_ZENXFI +#if defined(CREATIVE_ZENXFI) || defined(CREATIVE_ZENMOZAIC) bool headphones_inserted(void) { return !imx233_pinctrl_get_gpio(2, 8); -- cgit v1.2.3