mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: dmitry.torokhov@gmail.com, sameo@linux.intel.com,
	peter.ujfalusi@ti.com, aghayal@codeaurora.org, david@hardeman.nu,
	Shubhrajyoti@ti.com, saaguirre@ti.com, jic23@cam.ac.uk,
	hemanthv@ti.com, linux-input@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Subject: [PATCH 1/5] input/cma3000_d0x: Support devices without pdata
Date: Tue, 18 Oct 2011 10:28:02 +0200	[thread overview]
Message-ID: <1318926486-10330-2-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1318926486-10330-1-git-send-email-ricardo.ribalda@gmail.com>

Architechtures based on device-tree does not have platform data
associated to the spi/i2c devices.
This patch allows those architechtures to use the cma3000 driver with
a default configuration.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 drivers/input/misc/cma3000_d0x.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c
index 1633b63..2f993d5 100644
--- a/drivers/input/misc/cma3000_d0x.c
+++ b/drivers/input/misc/cma3000_d0x.c
@@ -62,6 +62,18 @@
 #define BIT_TO_2G  18
 #define BIT_TO_8G  71
 
+static struct cma3000_platform_data cma3000_default_pdata = {
+	.mdthr = 0x8,
+	.mdfftmr = 0x33,
+	.ffthr = 0x8,
+	.mode = CMAMODE_MEAS400,
+	.g_range = CMARANGE_2G,
+	.fuzz_x = BIT_TO_2G,
+	.fuzz_y = BIT_TO_2G,
+	.fuzz_z = BIT_TO_2G,
+	.irqflags = 0,
+};
+
 struct cma3000_accl_data {
 	const struct cma3000_bus_ops *bus_ops;
 	const struct cma3000_platform_data *pdata;
@@ -283,19 +295,24 @@ EXPORT_SYMBOL(cma3000_resume);
 struct cma3000_accl_data *cma3000_init(struct device *dev, int irq,
 				       const struct cma3000_bus_ops *bops)
 {
-	const struct cma3000_platform_data *pdata = dev->platform_data;
+	const struct cma3000_platform_data *pdata;
 	struct cma3000_accl_data *data;
 	struct input_dev *input_dev;
 	int rev;
 	int error;
 
+	if (!dev->platform_data) {
+		dev_info(dev, "platform data not found, using default\n");
+		pdata = &cma3000_default_pdata;
+	} else
+		pdata = dev->platform_data;
+
 	if (!pdata) {
 		dev_err(dev, "platform data not found\n");
 		error = -EINVAL;
 		goto err_out;
 	}
 
-
 	/* if no IRQ return error */
 	if (irq == 0) {
 		error = -EINVAL;
-- 
1.7.7


  reply	other threads:[~2011-10-18  8:28 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-18  8:28 [PATCH 0/5] Add spi support for CMA3000 driver and new driver CMR3000 Ricardo Ribalda Delgado
2011-10-18  8:28 ` Ricardo Ribalda Delgado [this message]
2011-10-18  8:32   ` [PATCH 1/5] input/cma3000_d0x: Support devices without pdata Jonathan Cameron
2011-10-18 12:07     ` Ricardo Ribalda Delgado
2011-10-18 12:51       ` Jonathan Cameron
2011-10-18  8:28 ` [PATCH 2/5] input/cma3000_d0x: Check silicon version Ricardo Ribalda Delgado
2011-10-18  8:34   ` Jonathan Cameron
2011-10-18 12:07     ` Ricardo Ribalda Delgado
2011-10-18  8:28 ` [PATCH 3/5] input/cma3000_d0x: Keep configuration on poweroff Ricardo Ribalda Delgado
2011-10-18  8:35   ` Jonathan Cameron
2011-10-18 12:07     ` Ricardo Ribalda Delgado
2011-10-18 12:45       ` Jonathan Cameron
2011-10-18  8:28 ` [PATCH 4/5] input/cma3000_d0x: Add CMA3000 spi support Ricardo Ribalda Delgado
2011-10-18  8:44   ` Jonathan Cameron
2011-10-18  8:28 ` [PATCH 5/5] Input: add CMR3000 gyrsocope driver Ricardo Ribalda Delgado
2011-10-18  8:54   ` Jonathan Cameron
2011-10-18 12:07     ` Ricardo Ribalda Delgado

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1318926486-10330-2-git-send-email-ricardo.ribalda@gmail.com \
    --to=ricardo.ribalda@gmail.com \
    --cc=Shubhrajyoti@ti.com \
    --cc=aghayal@codeaurora.org \
    --cc=david@hardeman.nu \
    --cc=dmitry.torokhov@gmail.com \
    --cc=hemanthv@ti.com \
    --cc=jic23@cam.ac.uk \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peter.ujfalusi@ti.com \
    --cc=saaguirre@ti.com \
    --cc=sameo@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®