1464d031c4
Latch2 pins control a number of on-board devices, namely LCD, NAND, MODEM and CODEC. Those pins used to be initialized with safe values from init_machine before that operation was: 1) moved to late_initcall in preparation for conversion of latch2 to GPIO device - see commit f7519d8c8290 ("ARM: OMAP1: ams-delta: register latch dependent devices later"), 2) replaced with non-atomic initialization performed by means of gpio_request_array() - see commit 937eb4bb0058 ("ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio"), 3) made completely asynchronous by delegation of GPIO request operations performed on subsets of pins to respective device drivers in subsequent commits. One visible negative result of that disintegration was corrupt keyboard data reported by serio driver, recently fixed by commit 41f8fee385a0 ("ARM: OMAP1: ams-delta: Hog "keybrd_dataout" GPIO pin"). Moreover, initialization of LATCH2_PIN_MODEM_CODEC still performed with ams_delta_latch2_write() wrapper from late_init() is now done on not requested GPIO pin. Reintroduce atomic initialization of latch2 pins at machine_init to prevent from random values potentially corrupting NAND data or maybe even destroing other hardware. Also take care of MODEM/CODEC related pins so MODEM device probe succeeds even if latch2 GPIO device or dependent regulator is not ready and CODEC can be reached over the MODEM even if audio driver doesn't take control over LATCH2_PIN_MODEM_CODEC. Once done, remove the no longer needed GPIO based implementation of ams_delta_latch_write() and its frontend macro. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> [tony@atomide.com: updated for the header location to remove dependency] Signed-off-by: Tony Lindgren <tony@atomide.com>
65 lines
2.6 KiB
C
65 lines
2.6 KiB
C
/*
|
|
* arch/arm/plat-omap/include/mach/board-ams-delta.h
|
|
*
|
|
* Copyright (C) 2006 Jonathan McDowell <noodles@earth.li>
|
|
*
|
|
* 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 PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
|
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
|
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
#ifndef __ASM_ARCH_OMAP_AMS_DELTA_H
|
|
#define __ASM_ARCH_OMAP_AMS_DELTA_H
|
|
|
|
#if defined (CONFIG_MACH_AMS_DELTA)
|
|
|
|
#define AMD_DELTA_LATCH2_SCARD_RSTIN 0x0400
|
|
#define AMD_DELTA_LATCH2_SCARD_CMDVCC 0x0800
|
|
#define AMS_DELTA_LATCH2_MODEM_CODEC 0x2000
|
|
|
|
#define AMS_DELTA_GPIO_PIN_KEYBRD_DATA 0
|
|
#define AMS_DELTA_GPIO_PIN_KEYBRD_CLK 1
|
|
#define AMS_DELTA_GPIO_PIN_MODEM_IRQ 2
|
|
#define AMS_DELTA_GPIO_PIN_HOOK_SWITCH 4
|
|
#define AMS_DELTA_GPIO_PIN_SCARD_NOFF 6
|
|
#define AMS_DELTA_GPIO_PIN_SCARD_IO 7
|
|
#define AMS_DELTA_GPIO_PIN_CONFIG 11
|
|
#define AMS_DELTA_GPIO_PIN_NAND_RB 12
|
|
|
|
#define AMS_DELTA_GPIO_PIN_LCD_VBLEN 240
|
|
#define AMS_DELTA_GPIO_PIN_LCD_NDISP 241
|
|
#define AMS_DELTA_GPIO_PIN_NAND_NCE 242
|
|
#define AMS_DELTA_GPIO_PIN_NAND_NRE 243
|
|
#define AMS_DELTA_GPIO_PIN_NAND_NWP 244
|
|
#define AMS_DELTA_GPIO_PIN_NAND_NWE 245
|
|
#define AMS_DELTA_GPIO_PIN_NAND_ALE 246
|
|
#define AMS_DELTA_GPIO_PIN_NAND_CLE 247
|
|
#define AMS_DELTA_GPIO_PIN_KEYBRD_PWR 248
|
|
#define AMS_DELTA_GPIO_PIN_KEYBRD_DATAOUT 249
|
|
#define AMS_DELTA_GPIO_PIN_SCARD_RSTIN 250
|
|
#define AMS_DELTA_GPIO_PIN_SCARD_CMDVCC 251
|
|
#define AMS_DELTA_GPIO_PIN_MODEM_NRESET 252
|
|
#define AMS_DELTA_GPIO_PIN_MODEM_CODEC 253
|
|
|
|
#define AMS_DELTA_LATCH2_GPIO_BASE AMS_DELTA_GPIO_PIN_LCD_VBLEN
|
|
#define AMS_DELTA_LATCH2_NGPIO 16
|
|
|
|
#endif /* CONFIG_MACH_AMS_DELTA */
|
|
|
|
#endif /* __ASM_ARCH_OMAP_AMS_DELTA_H */
|