From patchwork Thu Mar 21 15:59:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15515 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 663FE23E14 for ; Thu, 21 Mar 2013 16:01:28 +0000 (UTC) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by fiordland.canonical.com (Postfix) with ESMTP id EBA33A19E61 for ; Thu, 21 Mar 2013 16:01:27 +0000 (UTC) Received: by mail-vc0-f181.google.com with SMTP id hv10so2381783vcb.26 for ; Thu, 21 Mar 2013 09:01:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=hpqwLYsy+DxT3J7f3GsJF54raiEAl8USC0JxfVAAFNo=; b=LP8vfZeNVGpTshIrCbUhLXc3Vj8bXyiWYZ4r4A49uX1+ecF5fkvkeQywI88Xo59XMD IDqor7cXRsix2tJvXwQH4JnBQNKOqWW0uuUv4bxIXvFWmO7hZyW+0pszBPC9OQOJYHxu HTRTmxvgeuSXfYrQA5G/xplxUbT4RL6Zly2ihg6KmpoLGwKxyVg6P+jDdfnYfjtuLWfD 4UNcVUEHn6ouKAmrP0HII8T5rYC97QE0CzjuTBD/9Sm5F4eFSLDocWjHxvB0OxKP8UZF fsFi1Dq8qwO+suoUoeAlYTpkOo2UGEVca8ZFOuupsPo4Mwpl/b2jMtkUvC5PtadQpCjx mk7Q== X-Received: by 10.52.233.225 with SMTP id tz1mr12449044vdc.54.1363881686681; Thu, 21 Mar 2013 09:01:26 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.233.198 with SMTP id ty6csp66835vec; Thu, 21 Mar 2013 09:01:26 -0700 (PDT) X-Received: by 10.180.189.17 with SMTP id ge17mr5933643wic.17.1363881684743; Thu, 21 Mar 2013 09:01:24 -0700 (PDT) Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by mx.google.com with ESMTPS id ay9si1430386wib.127.2013.03.21.09.01.24 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:01:24 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.52 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.52; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.52 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f52.google.com with SMTP id 15so2329552wgd.31 for ; Thu, 21 Mar 2013 09:01:24 -0700 (PDT) X-Received: by 10.194.120.195 with SMTP id le3mr3916890wjb.46.1363881684313; Thu, 21 Mar 2013 09:01:24 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id h10sm6110847wic.8.2013.03.21.09.01.22 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:01:23 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 41/46] regulator: ab8500: Remove the need for a 'delay' property Date: Thu, 21 Mar 2013 15:59:38 +0000 Message-Id: <1363881583-15234-42-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363881583-15234-1-git-send-email-lee.jones@linaro.org> References: <1363881583-15234-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlaUnzoQmGWgh2Evhla29e6OJmH60LiCzb/qdAy3YJf5opfSwxIT4xrixakM0gu4NJHiyHT The regulator framework now has provisions to read a regulator's start-up time via the 'enable_time' attribute. So let's remove all 'enable_time'/'delay' duplication and just stick with 'enable_time' from now on. Signed-off-by: Lee Jones --- drivers/regulator/ab8500.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 324444e..13948c8 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -63,7 +63,6 @@ struct ab8500_shared_mode { * @voltage_reg: register to control regulator voltage * @voltage_mask: mask to control regulator voltage * @voltage_shift: shift to control regulator voltage - * @delay: startup/set voltage delay in us */ struct ab8500_regulator_info { struct device *dev; @@ -87,7 +86,6 @@ struct ab8500_regulator_info { u8 voltage_reg; u8 voltage_mask; u8 voltage_shift; - unsigned int delay; struct { u8 voltage_limit; u8 voltage_bank; @@ -652,7 +650,7 @@ static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev, { struct ab8500_regulator_info *info = rdev_get_drvdata(rdev); - return info->delay; + return info->desc.enable_time; } static struct regulator_ops ab8500_regulator_volt_mode_ops = { @@ -829,7 +827,6 @@ static struct ab8500_regulator_info .volt_table = fixed_2000000_voltage, .enable_time = 500, }, - .delay = 500, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80, @@ -1100,7 +1097,6 @@ static struct ab8500_regulator_info .volt_table = fixed_2000000_voltage, .enable_time = 10000, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80, @@ -1366,7 +1362,6 @@ static struct ab8500_regulator_info .volt_table = fixed_2000000_voltage, .enable_time = 10000, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80, @@ -1664,7 +1659,6 @@ static struct ab8500_regulator_info .n_voltages = 1, .enable_time = 10000, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,