introduced by: 96974a24
(omap: consolidate touch screen initialization among different boards)
ads7846 driver can use either gpio_pendown or get_pendown_state()
callback. In case of gpio_pendown, it requests the provided gpio_pendown
thus resulting in double requesting that gpio:
ads7846 spi1.0: failed to request pendown GPIO57
ads7846: probe of spi1.0 failed with error -16
Fix this by restricting the gpio request to the case of
get_pendown_state() callback is used.
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Tested-by: Thomas Weber <weber@corscience.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
		
	
			
		
			
				
	
	
		
			163 lines
		
	
	
	
		
			4.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			163 lines
		
	
	
	
		
			4.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * common-board-devices.c
 | 
						|
 *
 | 
						|
 * Copyright (C) 2011 CompuLab, Ltd.
 | 
						|
 * Author: Mike Rapoport <mike@compulab.co.il>
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU General Public License
 | 
						|
 * version 2 as published by the Free Software Foundation.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful, but
 | 
						|
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 * General Public License for more details.
 | 
						|
 *
 | 
						|
 * 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., 51 Franklin St, Fifth Floor, Boston, MA
 | 
						|
 * 02110-1301 USA
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/i2c.h>
 | 
						|
#include <linux/i2c/twl.h>
 | 
						|
 | 
						|
#include <linux/gpio.h>
 | 
						|
#include <linux/spi/spi.h>
 | 
						|
#include <linux/spi/ads7846.h>
 | 
						|
 | 
						|
#include <plat/i2c.h>
 | 
						|
#include <plat/mcspi.h>
 | 
						|
#include <plat/nand.h>
 | 
						|
 | 
						|
#include "common-board-devices.h"
 | 
						|
 | 
						|
static struct i2c_board_info __initdata pmic_i2c_board_info = {
 | 
						|
	.addr		= 0x48,
 | 
						|
	.flags		= I2C_CLIENT_WAKE,
 | 
						|
};
 | 
						|
 | 
						|
void __init omap_pmic_init(int bus, u32 clkrate,
 | 
						|
			   const char *pmic_type, int pmic_irq,
 | 
						|
			   struct twl4030_platform_data *pmic_data)
 | 
						|
{
 | 
						|
	strncpy(pmic_i2c_board_info.type, pmic_type,
 | 
						|
		sizeof(pmic_i2c_board_info.type));
 | 
						|
	pmic_i2c_board_info.irq = pmic_irq;
 | 
						|
	pmic_i2c_board_info.platform_data = pmic_data;
 | 
						|
 | 
						|
	omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1);
 | 
						|
}
 | 
						|
 | 
						|
#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
 | 
						|
	defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
 | 
						|
static struct omap2_mcspi_device_config ads7846_mcspi_config = {
 | 
						|
	.turbo_mode	= 0,
 | 
						|
	.single_channel	= 1,	/* 0: slave, 1: master */
 | 
						|
};
 | 
						|
 | 
						|
static struct ads7846_platform_data ads7846_config = {
 | 
						|
	.x_max			= 0x0fff,
 | 
						|
	.y_max			= 0x0fff,
 | 
						|
	.x_plate_ohms		= 180,
 | 
						|
	.pressure_max		= 255,
 | 
						|
	.debounce_max		= 10,
 | 
						|
	.debounce_tol		= 3,
 | 
						|
	.debounce_rep		= 1,
 | 
						|
	.gpio_pendown		= -EINVAL,
 | 
						|
	.keep_vref_on		= 1,
 | 
						|
};
 | 
						|
 | 
						|
static struct spi_board_info ads7846_spi_board_info __initdata = {
 | 
						|
	.modalias		= "ads7846",
 | 
						|
	.bus_num		= -EINVAL,
 | 
						|
	.chip_select		= 0,
 | 
						|
	.max_speed_hz		= 1500000,
 | 
						|
	.controller_data	= &ads7846_mcspi_config,
 | 
						|
	.irq			= -EINVAL,
 | 
						|
	.platform_data		= &ads7846_config,
 | 
						|
};
 | 
						|
 | 
						|
void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
 | 
						|
			      struct ads7846_platform_data *board_pdata)
 | 
						|
{
 | 
						|
	struct spi_board_info *spi_bi = &ads7846_spi_board_info;
 | 
						|
	int err;
 | 
						|
 | 
						|
	if (board_pdata && board_pdata->get_pendown_state) {
 | 
						|
		err = gpio_request_one(gpio_pendown, GPIOF_IN, "TSPenDown");
 | 
						|
		if (err) {
 | 
						|
			pr_err("Couldn't obtain gpio for TSPenDown: %d\n", err);
 | 
						|
			return;
 | 
						|
		}
 | 
						|
		gpio_export(gpio_pendown, 0);
 | 
						|
 | 
						|
		if (gpio_debounce)
 | 
						|
			gpio_set_debounce(gpio_pendown, gpio_debounce);
 | 
						|
	}
 | 
						|
 | 
						|
	ads7846_config.gpio_pendown = gpio_pendown;
 | 
						|
 | 
						|
	spi_bi->bus_num	= bus_num;
 | 
						|
	spi_bi->irq	= OMAP_GPIO_IRQ(gpio_pendown);
 | 
						|
 | 
						|
	if (board_pdata)
 | 
						|
		spi_bi->platform_data = board_pdata;
 | 
						|
 | 
						|
	spi_register_board_info(&ads7846_spi_board_info, 1);
 | 
						|
}
 | 
						|
#else
 | 
						|
void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
 | 
						|
			      struct ads7846_platform_data *board_pdata)
 | 
						|
{
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
#if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE)
 | 
						|
static struct omap_nand_platform_data nand_data = {
 | 
						|
	.dma_channel	= -1,		/* disable DMA in OMAP NAND driver */
 | 
						|
};
 | 
						|
 | 
						|
void __init omap_nand_flash_init(int options, struct mtd_partition *parts,
 | 
						|
				 int nr_parts)
 | 
						|
{
 | 
						|
	u8 cs = 0;
 | 
						|
	u8 nandcs = GPMC_CS_NUM + 1;
 | 
						|
 | 
						|
	/* find out the chip-select on which NAND exists */
 | 
						|
	while (cs < GPMC_CS_NUM) {
 | 
						|
		u32 ret = 0;
 | 
						|
		ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
 | 
						|
 | 
						|
		if ((ret & 0xC00) == 0x800) {
 | 
						|
			printk(KERN_INFO "Found NAND on CS%d\n", cs);
 | 
						|
			if (nandcs > GPMC_CS_NUM)
 | 
						|
				nandcs = cs;
 | 
						|
		}
 | 
						|
		cs++;
 | 
						|
	}
 | 
						|
 | 
						|
	if (nandcs > GPMC_CS_NUM) {
 | 
						|
		printk(KERN_INFO "NAND: Unable to find configuration "
 | 
						|
				 "in GPMC\n ");
 | 
						|
		return;
 | 
						|
	}
 | 
						|
 | 
						|
	if (nandcs < GPMC_CS_NUM) {
 | 
						|
		nand_data.cs = nandcs;
 | 
						|
		nand_data.parts = parts;
 | 
						|
		nand_data.nr_parts = nr_parts;
 | 
						|
		nand_data.options = options;
 | 
						|
 | 
						|
		printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
 | 
						|
		if (gpmc_nand_init(&nand_data) < 0)
 | 
						|
			printk(KERN_ERR "Unable to register NAND device\n");
 | 
						|
	}
 | 
						|
}
 | 
						|
#else
 | 
						|
void __init omap_nand_flash_init(int options, struct mtd_partition *parts,
 | 
						|
				 int nr_parts)
 | 
						|
{
 | 
						|
}
 | 
						|
#endif
 |