From patchwork Mon Jan 21 12:03:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2011581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 959B63FD1A for ; Mon, 21 Jan 2013 12:09:26 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxG9S-0006xT-3A; Mon, 21 Jan 2013 12:06:58 +0000 Received: from mail-wi0-f181.google.com ([209.85.212.181]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TxG8H-0006ZI-5S for linux-arm-kernel@lists.infradead.org; Mon, 21 Jan 2013 12:05:47 +0000 Received: by mail-wi0-f181.google.com with SMTP id hq4so4851189wib.8 for ; Mon, 21 Jan 2013 04:04:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=na1gqhKrbeYYxuG8iU/TAc6/4cvyOZ4VeG4TetWjFYs=; b=LfYAbapa+VtVxpwLuDmYNj3itV8fYHvxCp0E0+Yie51bnhKgi5y+Xx/Kh6R1TQF4qe XILWMuTWZqBSWReIt+qNXWeObmQp7nllAdu705HjQJmINKHjpYKZufkfl6rlV/7nDDEX T6LaagqE4nMBJ/ziktEGfA5plx158m/bHfuMfAvr8l44CiSkkcxyHjEp/GiITFcCctTX XadFhqM7VOKJ3R0Dhq88DL/9jQ8aL3MCC+B43+Q6Gq70XY6KXg5suaxM1M0z0WG30JWE /W8JviTwDzi3P5dg2DHYVLm+ok2dVfXW0hBYcZGkNF0dWm50LPWyJQM1rgMSwa1/9ROi hx6w== X-Received: by 10.194.238.33 with SMTP id vh1mr25960394wjc.15.1358769874092; Mon, 21 Jan 2013 04:04:34 -0800 (PST) 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 i2sm16575305wiw.3.2013.01.21.04.04.32 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jan 2013 04:04:33 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/24] pm2301: Remove volt_now & curr_now properties Date: Mon, 21 Jan 2013 12:03:45 +0000 Message-Id: <1358769840-4763-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358769840-4763-1-git-send-email-lee.jones@linaro.org> References: <1358769840-4763-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkVaEnwPuk0LNBLkNJ0RktpGtNYlf87xonHfTev/S2oV1Z6ICGUM164ZcyVPWISgr2MP60i X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130121_070545_381972_0EDB2805 X-CRM114-Status: GOOD ( 13.70 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.181 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linus.walleij@stericsson.com, arnd@arndb.de, cbou@mail.ru, Loic Pallardy , anton.vorontsov@linaro.org, Rajkumar Kasirajan , Lee Jones X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Loic Pallardy There is no support to measure the main charger voltage and current using AB9540 gpadc. Therefore this has been removed from the driver. Signed-off-by: Lee Jones Signed-off-by: Rajkumar Kasirajan Reviewed-by: Michel JAOUEN Reviewed-by: Rabin VINCENT Tested-by: Michel JAOUEN --- drivers/power/pm2301_charger.c | 35 ----------------------------------- drivers/power/pm2301_charger.h | 1 - 2 files changed, 36 deletions(-) diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c index 316d5f0..16d8cfe 100644 --- a/drivers/power/pm2301_charger.c +++ b/drivers/power/pm2301_charger.c @@ -47,9 +47,7 @@ static enum power_supply_property pm2xxx_charger_ac_props[] = { POWER_SUPPLY_PROP_HEALTH, POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_ONLINE, - POWER_SUPPLY_PROP_VOLTAGE_NOW, POWER_SUPPLY_PROP_VOLTAGE_AVG, - POWER_SUPPLY_PROP_CURRENT_NOW, }; static int pm2xxx_charger_voltage_map[] = { @@ -438,19 +436,6 @@ static irqreturn_t pm2xxx_irq_int(int irq, void *data) return IRQ_HANDLED; } -static int pm2xxx_charger_get_ac_voltage(struct pm2xxx_charger *pm2) -{ - int vch = 0; - - if (pm2->ac.charger_connected) { - vch = ab8500_gpadc_convert(pm2->gpadc, MAIN_CHARGER_V); - if (vch < 0) - dev_err(pm2->dev, "%s gpadc conv failed,\n", __func__); - } - - return vch; -} - static int pm2xxx_charger_get_ac_cv(struct pm2xxx_charger *pm2) { int ret = 0; @@ -473,19 +458,6 @@ out: return ret; } -static int pm2xxx_charger_get_ac_current(struct pm2xxx_charger *pm2) -{ - int ich = 0; - - if (pm2->ac.charger_online) { - ich = ab8500_gpadc_convert(pm2->gpadc, MAIN_CHARGER_C); - if (ich < 0) - dev_err(pm2->dev, "%s gpadc conv failed\n", __func__); - } - - return ich; -} - static int pm2xxx_current_to_regval(int curr) { int i; @@ -585,17 +557,10 @@ static int pm2xxx_charger_ac_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_PRESENT: val->intval = pm2->ac.charger_connected; break; - case POWER_SUPPLY_PROP_VOLTAGE_NOW: - pm2->ac.charger_voltage = pm2xxx_charger_get_ac_voltage(pm2); - val->intval = pm2->ac.charger_voltage * 1000; - break; case POWER_SUPPLY_PROP_VOLTAGE_AVG: pm2->ac.cv_active = pm2xxx_charger_get_ac_cv(pm2); val->intval = pm2->ac.cv_active; break; - case POWER_SUPPLY_PROP_CURRENT_NOW: - val->intval = pm2xxx_charger_get_ac_current(pm2) * 1000; - break; default: return -EINVAL; } diff --git a/drivers/power/pm2301_charger.h b/drivers/power/pm2301_charger.h index cc401d7..4bace67 100644 --- a/drivers/power/pm2301_charger.h +++ b/drivers/power/pm2301_charger.h @@ -456,7 +456,6 @@ enum pm2xxx_source_reg_int6 { struct pm2xxx_charger_info { int charger_connected; int charger_online; - int charger_voltage; int cv_active; bool wd_expired; };