linux-kernel - [PATCH 2/3] Input: tps6507x-ts

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1454308130-12452-4-git-send-email-sushaanth.s@ti.com>
Date:	Mon, 1 Feb 2016 11:58:49 +0530
From:	Sushaanth Srirangapathi <sushaanth.s@...com>
To:	Rob Herring <robh+dt@...nel.org>, Pawel Moll <pawel.moll@....com>,
	Mark Rutland <mark.rutland@....com>,
	Ian Campbell <ijc+devicetree@...lion.org.uk>,
	Kumar Gala <galak@...eaurora.org>,
	Russell King <linux@....linux.org.uk>,
	Dmitry Torokhov <dmitry.torokhov@...il.com>,
	Joe Perches <joe@...ches.com>,
	Javier Martinez Canillas <javier@....samsung.com>
CC:	<devicetree@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	<linux-arm-kernel@...ts.infradead.org>,
	<linux-input@...r.kernel.org>,
	Sushaanth Srirangapathi <sushaanth.s@...com>
Subject: [PATCH 2/3] Input: tps6507x-ts - Add device tree support

Add device tree support for TPS6507x touchscreen input device.

Signed-off-by: Sushaanth Srirangapathi <sushaanth.s@...com>
---
 drivers/input/touchscreen/tps6507x-ts.c |   51 ++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index a340bfc..4c28369 100644
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -19,6 +19,7 @@
 #include <linux/input.h>
 #include <linux/input-polldev.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 #include <linux/mfd/tps6507x.h>
 #include <linux/input/tps6507x-ts.h>
 #include <linux/delay.h>
@@ -32,6 +33,10 @@
 					 TPS6507X_ADCONFIG_INPUT_REAL_TSC)
 #define	TPS6507X_ADCONFIG_POWER_DOWN_TS (TPS6507X_ADCONFIG_INPUT_REAL_TSC)
 
+#define TPS6507X_VENDOR 0
+#define TPS6507X_PRODUCT 65070
+#define TPS6507X_VERSION 0x100
+
 struct ts_event {
 	u16	x;
 	u16	y;
@@ -199,6 +204,44 @@ done:
 	tps6507x_adc_standby(tsc);
 }
 
+static struct tps6507x_board *tps6507x_ts_parse_dt_reg_data(
+		struct platform_device *pdev) {
+	struct tps6507x_board *tps_board;
+	struct device_node *np = pdev->dev.parent->of_node;
+	struct touchscreen_init_data *reg_data;
+	struct device_node *touchscreen;
+	u32 min_pressure;
+
+	tps_board = devm_kzalloc(&pdev->dev, sizeof(*tps_board),
+				GFP_KERNEL);
+	if (!tps_board)
+		return NULL;
+
+	touchscreen = of_get_child_by_name(np, "touchscreen");
+	if (!touchscreen) {
+		dev_err(&pdev->dev, "touchscreen node not found\n");
+		return NULL;
+	}
+
+	reg_data = devm_kzalloc(&pdev->dev, sizeof(struct touchscreen_init_data),
+				GFP_KERNEL);
+	if (!reg_data)
+		return NULL;
+
+	reg_data->poll_period = TSC_DEFAULT_POLL_PERIOD;
+	reg_data->vendor = TPS6507X_VENDOR;
+	reg_data->product = TPS6507X_PRODUCT;
+	reg_data->version = TPS6507X_VERSION;
+	if (!of_property_read_u32(touchscreen, "ti,min-pressure",
+				&min_pressure))
+		reg_data->min_pressure = min_pressure;
+	else
+		reg_data->min_pressure = TPS_DEFAULT_MIN_PRESSURE;
+	tps_board->tps6507x_ts_init_data = reg_data;
+
+	return tps_board;
+}
+
 static int tps6507x_ts_probe(struct platform_device *pdev)
 {
 	struct tps6507x_dev *tps6507x_dev = dev_get_drvdata(pdev->dev.parent);
@@ -214,10 +257,10 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
 	 * coming from the board-evm file.
 	 */
 	tps_board = dev_get_platdata(tps6507x_dev->dev);
-	if (!tps_board) {
-		dev_err(tps6507x_dev->dev,
-			"Could not find tps6507x platform data\n");
-		return -ENODEV;
+
+	if (IS_ENABLED(CONFIG_OF) && !tps_board &&
+			tps6507x_dev->dev->of_node) {
+		tps_board = tps6507x_ts_parse_dt_reg_data(pdev);
 	}
 
 	/*
-- 
1.7.9.5