Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757274AbZDWNIq (ORCPT ); Thu, 23 Apr 2009 09:08:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757673AbZDWNI3 (ORCPT ); Thu, 23 Apr 2009 09:08:29 -0400 Received: from smtp.nokia.com ([192.100.122.233]:63695 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757876AbZDWNI2 (ORCPT ); Thu, 23 Apr 2009 09:08:28 -0400 From: "Peter 'p2' De Schrijver" To: linux-kernel@vger.kernel.org Cc: "Peter 'p2' De Schrijver" Subject: [PATCH] TWL4030: add function to send PB messages Date: Thu, 23 Apr 2009 16:08:08 +0300 Message-Id: <1240492089-14410-1-git-send-email-peter.de-schrijver@nokia.com> X-Mailer: git-send-email 1.5.6.3 X-OriginalArrivalTime: 23 Apr 2009 13:08:11.0324 (UTC) FILETIME=[8DBE9FC0:01C9C414] X-Nokia-AV: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3074 Lines: 115 And now with fix to make it compile. This patch moves sending of powerbus messages to a separate function. It also makes sure I2C access to the powerbus is enabled. Signed-off-by: Peter 'p2' De Schrijver --- drivers/regulator/twl4030-regulator.c | 72 +++++++++++++++++++++++++++++--- 1 files changed, 65 insertions(+), 7 deletions(-) diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c index 472c35a..df9a94b 100644 --- a/drivers/regulator/twl4030-regulator.c +++ b/drivers/regulator/twl4030-regulator.c @@ -16,6 +16,7 @@ #include #include #include +#include /* @@ -81,6 +82,69 @@ twl4030reg_write(struct twlreg_info *info, unsigned offset, u8 value) value, info->base + offset); } +static int twl4030_wait_pb_ready(void) +{ + + u8 pb_status; + int status, timeout = 10; + + do { + status = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, + &pb_status, 0x14); + if (status < 0) + return status; + + if (!(pb_status & 1)) + return 0; + + mdelay(1); + timeout--; + + } while (timeout); + + return -ETIMEDOUT; +} + +static int twl4030_send_pb_msg(unsigned msg) +{ + + u8 pb_state; + int status; + + /* save powerbus configuration */ + status = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, + &pb_state, 0x14); + if (status < 0) + return status; + + /* Enable I2C access to powerbus */ + status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, + pb_state | (1<<1), 0x14); + if (status < 0) + return status; + + status = twl4030_wait_pb_ready(); + if (status < 0) + return status; + + status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, msg >> 8, + 0x15 /* PB_WORD_MSB */); + if (status < 0) + return status; + + status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, msg & 0xff, + 0x16 /* PB_WORD_LSB */); + if (status < 0) + return status; + + status = twl4030_wait_pb_ready(); + if (status < 0) + return status; + + /* Restore powerbus configuration */ + return twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, pb_state, 0x14); +} + /*----------------------------------------------------------------------*/ /* generic power resource operations, which work on all regulators */ @@ -177,13 +241,7 @@ static int twl4030reg_set_mode(struct regulator_dev *rdev, unsigned mode) if (!(status & (P3_GRP | P2_GRP | P1_GRP))) return -EACCES; - status = twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, - message >> 8, 0x15 /* PB_WORD_MSB */ ); - if (status >= 0) - return status; - - return twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, - message, 0x16 /* PB_WORD_LSB */ ); + return twl4030_send_pb_msg(message); } /*----------------------------------------------------------------------*/ -- 1.5.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/