All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: Jaewon Kim <jaewon02.kim@samsung.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Samuel Ortiz <sameo@linux.intel.com>,
	linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
	Chanwoo Choi <cw00.choi@samsung.com>
Subject: Re: [PATCH 1/3] mfd: max77693: Initialize haptic register map
Date: Thu, 4 Sep 2014 11:31:21 +0100	[thread overview]
Message-ID: <20140904103121.GG1397@lee--X1> (raw)
In-Reply-To: <54083BCB.1000603@samsung.com>

On Thu, 04 Sep 2014, Jaewon Kim wrote:

> 
> 2014년 09월 04일 18:06에 Lee Jones 이(가) 쓴 글:
> >On Mon, 01 Sep 2014, Jaewon Kim wrote:
> >
> >>This patch add regmap_haptic initialization to use haptic register map
> >>in haptic device driver.
> >>
> >>Signed-off-by: Jaewon Kim <jaewon02.kim@samsung.com>
> >>Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
> >>---
> >>  drivers/mfd/max77693.c |   21 ++++++++++++++++++---
> >>  1 file changed, 18 insertions(+), 3 deletions(-)
> >Acked-by: Lee Jones <lee.jones@linaro.org>
> >
> >Can this patch go in without the Input one?
> 
> Yes. There is no problem without Input driver patch.

Once you've split the Documentation patch, I will take them all.

> >>diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
> >>index 249c139..fbfed56 100644
> >>--- a/drivers/mfd/max77693.c
> >>+++ b/drivers/mfd/max77693.c
> >>@@ -144,6 +144,12 @@ static const struct regmap_irq_chip max77693_muic_irq_chip = {
> >>  	.num_irqs		= ARRAY_SIZE(max77693_muic_irqs),
> >>  };
> >>
> >>+static const struct regmap_config max77693_regmap_haptic_config = {
> >>+	.reg_bits = 8,
> >>+	.val_bits = 8,
> >>+	.max_register = MAX77693_HAPTIC_REG_END,
> >>+};
> >>+
> >>  static int max77693_i2c_probe(struct i2c_client *i2c,
> >>  			      const struct i2c_device_id *id)
> >>  {
> >>@@ -193,6 +199,15 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
> >>  	}
> >>  	i2c_set_clientdata(max77693->haptic, max77693);
> >>
> >>+	max77693->regmap_haptic = devm_regmap_init_i2c(max77693->haptic,
> >>+					&max77693_regmap_haptic_config);
> >>+	if (IS_ERR(max77693->regmap_haptic)) {
> >>+		ret = PTR_ERR(max77693->regmap_haptic);
> >>+		dev_err(max77693->dev,
> >>+			"failed to initialize haptic register map: %d\n", ret);
> >>+		goto err_regmap;
> >>+	}
> >>+
> >>  	/*
> >>  	 * Initialize register map for MUIC device because use regmap-muic
> >>  	 * instance of MUIC device when irq of max77693 is initialized
> >>@@ -204,7 +219,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
> >>  		ret = PTR_ERR(max77693->regmap_muic);
> >>  		dev_err(max77693->dev,
> >>  			"failed to allocate register map: %d\n", ret);
> >>-		goto err_regmap_muic;
> >>+		goto err_regmap;
> >>  	}
> >>
> >>  	ret = regmap_add_irq_chip(max77693->regmap, max77693->irq,
> >>@@ -214,7 +229,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
> >>  				&max77693->irq_data_led);
> >>  	if (ret) {
> >>  		dev_err(max77693->dev, "failed to add irq chip: %d\n", ret);
> >>-		goto err_regmap_muic;
> >>+		goto err_regmap;
> >>  	}
> >>
> >>  	ret = regmap_add_irq_chip(max77693->regmap, max77693->irq,
> >>@@ -265,7 +280,7 @@ err_irq_charger:
> >>  	regmap_del_irq_chip(max77693->irq, max77693->irq_data_topsys);
> >>  err_irq_topsys:
> >>  	regmap_del_irq_chip(max77693->irq, max77693->irq_data_led);
> >>-err_regmap_muic:
> >>+err_regmap:
> >>  	i2c_unregister_device(max77693->haptic);
> >>  err_i2c_haptic:
> >>  	i2c_unregister_device(max77693->muic);
> 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

  reply	other threads:[~2014-09-04 10:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-01 11:14 [PATCH 0/3] Add max77693 haptic driver Jaewon Kim
2014-09-01 11:14 ` [PATCH 1/3] mfd: max77693: Initialize haptic register map Jaewon Kim
2014-09-04  9:06   ` Lee Jones
2014-09-04 10:15     ` Jaewon Kim
2014-09-04 10:31       ` Lee Jones [this message]
2014-09-01 11:14 ` [PATCH 2/3] Input: misc: Add haptic driver on max77693 Jaewon Kim
2014-09-01 11:14 ` [PATCH 3/3] mfd: max77693: add haptic of_compatible in mfd_cell Jaewon Kim
2014-09-04  9:10   ` Lee Jones

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=20140904103121.GG1397@lee--X1 \
    --to=lee.jones@linaro.org \
    --cc=cw00.choi@samsung.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=jaewon02.kim@samsung.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.