From c2c2274e0adacc1a0c5bdb57fa1367badb7b047f Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Tue, 19 Nov 2013 19:04:03 +0000 Subject: imx233: factor adc accross targets The old code allowed each target to specify its adc targets but this proved useless since the target rely directly on imx233/lradc for input method and generic adc is mostly used for battery and debug. Remove all target specific files and provide a generic implemenation. The targets can still specify a battery temperature channel in powermgmt-target.h Change-Id: I68cf2e3e46379d174ac6d774ffb237bb15a19ae3 --- .../target/arm/imx233/creative-zen/adc-target.h | 29 ------------------ firmware/target/arm/imx233/creative-zen/adc-zen.c | 34 ---------------------- firmware/target/arm/imx233/creative-zen/lcd-zen.c | 10 +++---- 3 files changed, 5 insertions(+), 68 deletions(-) delete mode 100644 firmware/target/arm/imx233/creative-zen/adc-target.h delete mode 100644 firmware/target/arm/imx233/creative-zen/adc-zen.c (limited to 'firmware/target/arm/imx233/creative-zen') diff --git a/firmware/target/arm/imx233/creative-zen/adc-target.h b/firmware/target/arm/imx233/creative-zen/adc-target.h deleted file mode 100644 index 5a525152f6..0000000000 --- a/firmware/target/arm/imx233/creative-zen/adc-target.h +++ /dev/null @@ -1,29 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2013 by Amaury Pouly - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - -#define NUM_ADC_CHANNELS 2 - -#define ADC_BATTERY 0 -#define ADC_DIE_TEMP 1 - -#endif diff --git a/firmware/target/arm/imx233/creative-zen/adc-zen.c b/firmware/target/arm/imx233/creative-zen/adc-zen.c deleted file mode 100644 index 92c1063c24..0000000000 --- a/firmware/target/arm/imx233/creative-zen/adc-zen.c +++ /dev/null @@ -1,34 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2013 by Amaury Pouly - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include "adc-target.h" -#include "adc-imx233.h" - -int imx233_adc_mapping[] = -{ - [ADC_DIE_TEMP] = IMX233_ADC_DIE_TEMP, - [ADC_BATTERY] = IMX233_ADC_BATTERY, -}; - -const char *imx233_adc_channel_name[] = -{ - "Die temperature(°C)", - "Battery(raw)", -}; diff --git a/firmware/target/arm/imx233/creative-zen/lcd-zen.c b/firmware/target/arm/imx233/creative-zen/lcd-zen.c index 22d643c778..3b58159df4 100644 --- a/firmware/target/arm/imx233/creative-zen/lcd-zen.c +++ b/firmware/target/arm/imx233/creative-zen/lcd-zen.c @@ -278,15 +278,15 @@ void lcd_init_device(void) imx233_pinctrl_acquire(1, 8, "lcd_power"); imx233_pinctrl_set_function(1, 8, PINCTRL_FUNCTION_GPIO); imx233_pinctrl_enable_gpio(1, 8, true); - // power up - lcd_power(true); // reset lcd imx233_lcdif_reset_lcd(true); - mdelay(1); + mdelay(10); imx233_lcdif_reset_lcd(false); - mdelay(1); + mdelay(10); imx233_lcdif_reset_lcd(true); - mdelay(1); + mdelay(10); + // power up + lcd_power(true); // setup registers imx233_lcdif_enable_sync_signals(true); // we need frame signals during init lcd_power_seq(); -- cgit v1.2.3