All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johan Hovold <jhovold@gmail.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: Grant Likely <grant.likely@secretlab.ca>,
	Rob Herring <rob.herring@calxeda.com>,
	devicetree-discuss@lists.ozlabs.org,
	linux-kernel@vger.kernel.org, Johan Hovold <jhovold@gmail.com>
Subject: [PATCH] mfd: add tps65910 32-kHz-crystal-input init
Date: Wed, 11 Jul 2012 15:44:33 +0200	[thread overview]
Message-ID: <1342014273-31665-1-git-send-email-jhovold@gmail.com> (raw)
In-Reply-To: <20120705152334.GH18200@sortiz-mobl>

Replace tps65910_misc_init with a dedicated init function for the
32-kHz-crystal input.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
---

Hi Samuel,

How about something like this? My thought with misc_init was that it could be
extended should more simple initialisation like for the ck32k_xtal need to be
done, but perhaps it's cleaner to stick with dedicated init functions
through-out. At least for now.

Thanks,
Johan


 drivers/mfd/tps65910.c |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 3f27ea1..1c56379 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -68,20 +68,19 @@ static const struct regmap_config tps65910_regmap_config = {
 	.cache_type = REGCACHE_RBTREE,
 };
 
-static int __devinit tps65910_misc_init(struct tps65910 *tps65910,
+static int __devinit tps65910_ck32k_init(struct tps65910 *tps65910,
 					struct tps65910_board *pmic_pdata)
 {
-	struct device *dev = tps65910->dev;
 	int ret;
 
-	if (pmic_pdata->en_ck32k_xtal) {
-		ret = tps65910_reg_clear_bits(tps65910,
-						TPS65910_DEVCTRL,
+	if (!pmic_pdata->en_ck32k_xtal)
+		return 0;
+
+	ret = tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
 						DEVCTRL_CK32K_CTRL_MASK);
-		if (ret < 0) {
-			dev_err(dev, "clear ck32k_ctrl failed: %d\n", ret);
-			return ret;
-		}
+	if (ret < 0) {
+		dev_err(tps65910->dev, "clear ck32k_ctrl failed: %d\n", ret);
+		return ret;
 	}
 
 	return 0;
@@ -265,7 +264,7 @@ static __devinit int tps65910_i2c_probe(struct i2c_client *i2c,
 	init_data->irq_base = pmic_plat_data->irq_base;
 
 	tps65910_irq_init(tps65910, init_data->irq, init_data);
-	tps65910_misc_init(tps65910, pmic_plat_data);
+	tps65910_ck32k_init(tps65910, pmic_plat_data);
 	tps65910_sleepinit(tps65910, pmic_plat_data);
 
 	return ret;
-- 
1.7.8.6


  reply	other threads:[~2012-07-11 13:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-28 10:20 [PATCH 0/2] mfd: tps65910: add support for enabling external 32-kHz oscillator Johan Hovold
2012-06-28 10:20 ` [PATCH 1/2] " Johan Hovold
2012-06-28 10:20 ` [PATCH 2/2] mfd: tps65910: add device-tree entry to enable " Johan Hovold
2012-07-05 15:23 ` [PATCH 0/2] mfd: tps65910: add support for enabling " Samuel Ortiz
2012-07-05 15:23   ` Samuel Ortiz
2012-07-11 13:44   ` Johan Hovold [this message]
2012-07-16 13:43     ` [PATCH] mfd: add tps65910 32-kHz-crystal-input init Samuel Ortiz
2012-07-16 13:43       ` Samuel Ortiz

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=1342014273-31665-1-git-send-email-jhovold@gmail.com \
    --to=jhovold@gmail.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rob.herring@calxeda.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 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.