Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 866a98ae authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Samuel Ortiz
Browse files

input: Enable touch on 88pm860x 



Enable touchscreen driver for the 88pm860x multi function core.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 0a2f915b

drivers/input/touchscreen/88pm860x-ts.c

0 → 100644
+241 −0
Original line number Diff line number Diff line 
/*

 * Touchscreen driver for Marvell 88PM860x

 *

 * Copyright (C) 2009 Marvell International Ltd.

 * 	Haojian Zhuang <haojian.zhuang@marvell.com>

 *

 * 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.

 */

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/i2c.h>

#include <linux/input.h>

#include <linux/mfd/88pm860x.h>



#define MEAS_LEN		(8)

#define ACCURATE_BIT		(12)



/* touch register */

#define MEAS_EN3		(0x52)



#define MEAS_TSIX_1		(0x8D)

#define MEAS_TSIX_2		(0x8E)

#define MEAS_TSIY_1		(0x8F)

#define MEAS_TSIY_2		(0x90)

#define MEAS_TSIZ1_1		(0x91)

#define MEAS_TSIZ1_2		(0x92)

#define MEAS_TSIZ2_1		(0x93)

#define MEAS_TSIZ2_2		(0x94)



/* bit definitions of touch */

#define MEAS_PD_EN		(1 << 3)

#define MEAS_TSIX_EN		(1 << 4)

#define MEAS_TSIY_EN		(1 << 5)

#define MEAS_TSIZ1_EN		(1 << 6)

#define MEAS_TSIZ2_EN		(1 << 7)



struct pm860x_touch {

	struct input_dev *idev;

	struct i2c_client *i2c;

	struct pm860x_chip *chip;

	int irq;

	int res_x;		/* resistor of Xplate */

};



static irqreturn_t pm860x_touch_handler(int irq, void *data)

{

	struct pm860x_touch *touch = data;

	struct pm860x_chip *chip = touch->chip;

	unsigned char buf[MEAS_LEN];

	int x, y, pen_down;

	int z1, z2, rt = 0;

	int ret;



	pm860x_mask_irq(chip, irq);

	ret = pm860x_bulk_read(touch->i2c, MEAS_TSIX_1, MEAS_LEN, buf);

	if (ret < 0)

		goto out;



	pen_down = buf[1] & (1 << 6);

	x = ((buf[0] & 0xFF) << 4) | (buf[1] & 0x0F);

	y = ((buf[2] & 0xFF) << 4) | (buf[3] & 0x0F);

	z1 = ((buf[4] & 0xFF) << 4) | (buf[5] & 0x0F);

	z2 = ((buf[6] & 0xFF) << 4) | (buf[7] & 0x0F);



	if (pen_down) {

		if ((x != 0) && (z1 != 0) && (touch->res_x != 0)) {

			rt = z2 / z1 - 1;

			rt = (rt * touch->res_x * x) >> ACCURATE_BIT;

			dev_dbg(chip->dev, "z1:%d, z2:%d, rt:%d\n",

				z1, z2, rt);

		}

		input_report_abs(touch->idev, ABS_X, x);

		input_report_abs(touch->idev, ABS_Y, y);

		input_report_abs(touch->idev, ABS_PRESSURE, rt);

		input_report_key(touch->idev, BTN_TOUCH, 1);

		dev_dbg(chip->dev, "pen down at [%d, %d].\n", x, y);

	} else {

		input_report_abs(touch->idev, ABS_PRESSURE, 0);

		input_report_key(touch->idev, BTN_TOUCH, 0);

		dev_dbg(chip->dev, "pen release\n");

	}

	input_sync(touch->idev);

	pm860x_unmask_irq(chip, irq);



out:

	return IRQ_HANDLED;

}



static int pm860x_touch_open(struct input_dev *dev)

{

	struct pm860x_touch *touch = input_get_drvdata(dev);

	struct pm860x_chip *chip = touch->chip;

	int data, ret;



	data = MEAS_PD_EN | MEAS_TSIX_EN | MEAS_TSIY_EN

		| MEAS_TSIZ1_EN | MEAS_TSIZ2_EN;

	ret = pm860x_set_bits(touch->i2c, MEAS_EN3, data, data);

	if (ret < 0)

		goto out;

	pm860x_unmask_irq(chip, touch->irq);

	return 0;

out:

	return ret;

}



static void pm860x_touch_close(struct input_dev *dev)

{

	struct pm860x_touch *touch = input_get_drvdata(dev);

	struct pm860x_chip *chip = touch->chip;

	int data;



	data = MEAS_PD_EN | MEAS_TSIX_EN | MEAS_TSIY_EN

		| MEAS_TSIZ1_EN | MEAS_TSIZ2_EN;

	pm860x_set_bits(touch->i2c, MEAS_EN3, data, 0);

	pm860x_mask_irq(chip, touch->irq);

}



static int __devinit pm860x_touch_probe(struct platform_device *pdev)

{

	struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);

	struct pm860x_platform_data *pm860x_pdata =		\

				pdev->dev.parent->platform_data;

	struct pm860x_touch_pdata *pdata = NULL;

	struct pm860x_touch *touch;

	int irq, ret;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(&pdev->dev, "No IRQ resource!\n");

		return -EINVAL;

	}



	if (!pm860x_pdata) {

		dev_err(&pdev->dev, "platform data is missing\n");

		return -EINVAL;

	}



	pdata = pm860x_pdata->touch;

	if (!pdata) {

		dev_err(&pdev->dev, "touchscreen data is missing\n");

		return -EINVAL;

	}



	touch = kzalloc(sizeof(struct pm860x_touch), GFP_KERNEL);

	if (touch == NULL)

		return -ENOMEM;

	dev_set_drvdata(&pdev->dev, touch);



	touch->idev = input_allocate_device();

	if (touch->idev == NULL) {

		dev_err(&pdev->dev, "Failed to allocate input device!\n");

		ret = -ENOMEM;

		goto out;

	}



	touch->idev->name = "88pm860x-touch";

	touch->idev->phys = "88pm860x/input0";

	touch->idev->id.bustype = BUS_I2C;

	touch->idev->dev.parent = &pdev->dev;

	touch->idev->open = pm860x_touch_open;

	touch->idev->close = pm860x_touch_close;

	touch->chip = chip;

	touch->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;

	touch->irq = irq;

	touch->res_x = pdata->res_x;

	input_set_drvdata(touch->idev, touch);



	ret = pm860x_request_irq(chip, irq, pm860x_touch_handler, touch);

	if (ret < 0)

		goto out_irq;



	__set_bit(EV_ABS, touch->idev->evbit);

	__set_bit(ABS_X, touch->idev->absbit);

	__set_bit(ABS_Y, touch->idev->absbit);

	__set_bit(ABS_PRESSURE, touch->idev->absbit);

	__set_bit(EV_SYN, touch->idev->evbit);

	__set_bit(EV_KEY, touch->idev->evbit);

	__set_bit(BTN_TOUCH, touch->idev->keybit);



	input_set_abs_params(touch->idev, ABS_X, 0, 1 << ACCURATE_BIT, 0, 0);

	input_set_abs_params(touch->idev, ABS_Y, 0, 1 << ACCURATE_BIT, 0, 0);

	input_set_abs_params(touch->idev, ABS_PRESSURE, 0, 1 << ACCURATE_BIT,

				0, 0);



	ret = input_register_device(touch->idev);

	if (ret < 0) {

		dev_err(chip->dev, "Failed to register touch!\n");

		goto out_rg;

	}



	platform_set_drvdata(pdev, touch);

	return 0;

out_rg:

	pm860x_free_irq(chip, irq);

out_irq:

	input_free_device(touch->idev);

out:

	kfree(touch);

	return ret;

}



static int __devexit pm860x_touch_remove(struct platform_device *pdev)

{

	struct pm860x_touch *touch = platform_get_drvdata(pdev);



	input_unregister_device(touch->idev);

	pm860x_free_irq(touch->chip, touch->irq);

	platform_set_drvdata(pdev, NULL);

	kfree(touch);

	return 0;

}



static struct platform_driver pm860x_touch_driver = {

	.driver	= {

		.name	= "88pm860x-touch",

		.owner	= THIS_MODULE,

	},

	.probe	= pm860x_touch_probe,

	.remove	= __devexit_p(pm860x_touch_remove),

};



static int __init pm860x_touch_init(void)

{

	return platform_driver_register(&pm860x_touch_driver);

}

module_init(pm860x_touch_init);



static void __exit pm860x_touch_exit(void)

{

	platform_driver_unregister(&pm860x_touch_driver);

}

module_exit(pm860x_touch_exit);



MODULE_DESCRIPTION("Touchscreen driver for Marvell Semiconductor 88PM860x");

MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:88pm860x-touch");

drivers/input/touchscreen/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -11,6 +11,18 @@ menuconfig INPUT_TOUCHSCREEN 


if INPUT_TOUCHSCREEN



config TOUCHSCREEN_88PM860X

	tristate "Marvell 88PM860x touchscreen"

	depends on MFD_88PM860X

	help

	  Say Y here if you have a 88PM860x PMIC and want to enable

	  support for the built-in touchscreen.



	  If unsure, say N.



	  To compile this driver as a module, choose M here: the

	  module will be called 88pm860x-ts.



config TOUCHSCREEN_ADS7846

	tristate "ADS7846/TSC2046 and ADS7843 based touchscreens"

	depends on SPI_MASTER

drivers/input/touchscreen/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


wm97xx-ts-y := wm97xx-core.o



obj-$(CONFIG_TOUCHSCREEN_88PM860X)	+= 88pm860x-ts.o

obj-$(CONFIG_TOUCHSCREEN_AD7877)	+= ad7877.o

obj-$(CONFIG_TOUCHSCREEN_AD7879)	+= ad7879.o

obj-$(CONFIG_TOUCHSCREEN_ADS7846)	+= ads7846.o

include/linux/mfd/88pm860x.h

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ struct pm860x_touch_pdata { 
	int		tsi_prebias;	/* time, slot */

	int		pen_prebias;	/* time, slot */

	int		pen_prechg;	/* time, slot */

	int		res_x;		/* resistor of Xplate */

	unsigned long	flags;

};