From patchwork Mon Feb 17 09:05:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 3661591 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BFA2BBF13A for ; Mon, 17 Feb 2014 09:39:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A86C620155 for ; Mon, 17 Feb 2014 09:39:38 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45E6C20131 for ; Mon, 17 Feb 2014 09:39:37 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFKDA-0007Q0-UX; Mon, 17 Feb 2014 09:10:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFKCX-0005Qp-4R; Mon, 17 Feb 2014 09:09:21 +0000 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFKAz-00053w-De for linux-arm-kernel@lists.infradead.org; Mon, 17 Feb 2014 09:07:57 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N1400K8YUM5BN60@mailout2.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 17 Feb 2014 09:06:05 +0000 (GMT) X-AuditID: cbfec7f4-b7f796d000005a13-75-5301d1014143 Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 0F.8D.23059.101D1035; Mon, 17 Feb 2014 09:06:09 +0000 (GMT) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N1400JDQUM1F680@eusync4.samsung.com>; Mon, 17 Feb 2014 09:06:09 +0000 (GMT) From: Krzysztof Kozlowski To: MyungJoo Ham , Chanwoo Choi , Samuel Ortiz , Lee Jones , Mark Brown , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 04/15] mfd: max14577: Add "muic" suffix to regmap and irq_chip Date: Mon, 17 Feb 2014 10:05:39 +0100 Message-id: <1392627950-26927-5-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1392627950-26927-1-git-send-email-k.kozlowski@samsung.com> References: <1392627950-26927-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLLMWRmVeSWpSXmKPExsVy+t/xa7qMFxmDDb7skrc4uFXTYuOM9awW Ux8+YbO4/uU5q8WkJ++ZLSaunMxs8fqFocXZpjfsFve/HmW02PT4GqvF5V1z2CzWHrnLbnG7 cQWbxeluVov1M16zOPB7TOj/xOixc9Zddo/NK7Q8Nq3qZPO4c20Pm8e8k4Eem5fUe/RtWcXo 8XmTXABnFJdNSmpOZllqkb5dAlfG4Sv9TAUrPCumvjvL2sD42raLkZNDQsBE4sq6hSwQtpjE hXvr2boYuTiEBJYySvzetY4VwuljkjjwtpUJpIpNwFhi8/IlYFUiAi1MEu/X72cEcZgFXjBJ 9OzvZwWpEhYIlmhYvgysg0VAVeL7qqPMIDavgLvElnN7gGo4gPYpSMyZZAMS5hTwkLi59BY7 iC0EVPLk0Q6WCYy8CxgZVjGKppYmFxQnpeca6hUn5haX5qXrJefnbmKEBPGXHYyLj1kdYhTg YFTi4TWoZgwWYk0sK67MPcQowcGsJMJruw4oxJuSWFmVWpQfX1Sak1p8iJGJg1OqgdF38smo +TUhm63FXYuCU9RF9xxPVJq8rt46KWLZzFcHPrM9UfMq0I+/VPXl4vIfS1/wzlt97+x+fomD 3DIF/Itz9n5V85z5WHOqp6Mkz0zfI5Nm9RxTcLl04IbNUYOMeQylZ2IC/y/LC4l5LxsY2xN8 9JGj7LxDOXt2WO07Oslo/cYzB0LZe/YosRRnJBpqMRcVJwIA3XnTFkACAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140217_040745_650590_57B9C5AB X-CRM114-Status: GOOD ( 17.76 ) X-Spam-Score: -4.6 (----) Cc: Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Dmitry Eremin-Solenikov , Tomasz Figa , Anton Vorontsov , Kyungmin Park , David Woodhouse , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch continues the preparation for adding support for max77836 device to existing max14577 driver. Add "muic" suffix to regmap and irq_data fields in maxim_core state container to prepare for max77836 support. This is only a rename-like patch, new code is not added. Signed-off-by: Krzysztof Kozlowski Cc: Kyungmin Park Cc: Marek Szyprowski Cc: Anton Vorontsov Cc: Dmitry Eremin-Solenikov Cc: David Woodhouse Acked-by: Lee Jones Acked-by: Chanwoo Choi Tested-by: Chanwoo Choi --- drivers/extcon/extcon-max14577.c | 17 +++++++++-------- drivers/mfd/max14577.c | 22 +++++++++++----------- drivers/power/max14577_charger.c | 8 ++++---- drivers/regulator/max14577.c | 2 +- include/linux/mfd/max14577-private.h | 4 ++-- 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c index 2879cc5844dc..fd48b4909470 100644 --- a/drivers/extcon/extcon-max14577.c +++ b/drivers/extcon/extcon-max14577.c @@ -176,7 +176,7 @@ static int max14577_muic_set_debounce_time(struct max14577_muic_info *info, case ADC_DEBOUNCE_TIME_10MS: case ADC_DEBOUNCE_TIME_25MS: case ADC_DEBOUNCE_TIME_38_62MS: - ret = max14577_update_reg(info->maxim_core->regmap, + ret = max14577_update_reg(info->maxim_core->regmap_muic, MAXIM_MUIC_REG_CONTROL3, MAXIM_CONTROL3_ADCDBSET_MASK, time << MAXIM_CONTROL3_ADCDBSET_SHIFT); @@ -210,7 +210,7 @@ static int max14577_muic_set_path(struct max14577_muic_info *info, u8 ctrl1, ctrl2 = 0; /* Set open state to path before changing hw path */ - ret = max14577_update_reg(info->maxim_core->regmap, + ret = max14577_update_reg(info->maxim_core->regmap_muic, MAXIM_MUIC_REG_CONTROL1, MAXIM_CONTROL1_CLEAR_IDBEN_MICEN_MASK, MAXIM_CONTROL1_SW_OPEN); @@ -224,7 +224,7 @@ static int max14577_muic_set_path(struct max14577_muic_info *info, else ctrl1 = MAXIM_CONTROL1_SW_OPEN; - ret = max14577_update_reg(info->maxim_core->regmap, + ret = max14577_update_reg(info->maxim_core->regmap_muic, MAXIM_MUIC_REG_CONTROL1, MAXIM_CONTROL1_CLEAR_IDBEN_MICEN_MASK, ctrl1); if (ret < 0) { @@ -237,7 +237,7 @@ static int max14577_muic_set_path(struct max14577_muic_info *info, else ctrl2 |= MAXIM_CONTROL2_LOWPWR_MASK; /* LowPwr=1, CPEn=0 */ - ret = max14577_update_reg(info->maxim_core->regmap, + ret = max14577_update_reg(info->maxim_core->regmap_muic, MAXIM_MUIC_REG_CONTROL2, MAXIM_CONTROL2_LOWPWR_MASK | MAXIM_CONTROL2_CPEN_MASK, ctrl2); @@ -505,7 +505,7 @@ static void max14577_muic_irq_work(struct work_struct *work) mutex_lock(&info->mutex); - ret = max14577_bulk_read(info->maxim_core->regmap, + ret = max14577_bulk_read(info->maxim_core->regmap_muic, MAXIM_MUIC_REG_STATUS1, info->status, 2); if (ret) { dev_err(info->dev, "failed to read MUIC register\n"); @@ -581,7 +581,7 @@ static int max14577_muic_detect_accessory(struct max14577_muic_info *info) mutex_lock(&info->mutex); /* Read STATUSx register to detect accessory */ - ret = max14577_bulk_read(info->maxim_core->regmap, + ret = max14577_bulk_read(info->maxim_core->regmap_muic, MAXIM_MUIC_REG_STATUS1, info->status, 2); if (ret) { dev_err(info->dev, "failed to read MUIC register\n"); @@ -651,7 +651,8 @@ static int max14577_muic_probe(struct platform_device *pdev) struct max14577_muic_irq *muic_irq = &muic_irqs[i]; unsigned int virq = 0; - virq = regmap_irq_get_virq(maxim_core->irq_data, muic_irq->irq); + virq = regmap_irq_get_virq(maxim_core->irq_data_muic, + muic_irq->irq); if (!virq) return -EINVAL; muic_irq->virq = virq; @@ -693,7 +694,7 @@ static int max14577_muic_probe(struct platform_device *pdev) max14577_muic_set_path(info, info->path_uart, true); /* Check revision number of MUIC device*/ - ret = max14577_read_reg(info->maxim_core->regmap, + ret = max14577_read_reg(info->maxim_core->regmap_muic, MAXIM_MUIC_REG_DEVICEID, &id); if (ret < 0) { dev_err(&pdev->dev, "failed to read revision number\n"); diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c index 4567728f3fd4..449e025bd80d 100644 --- a/drivers/mfd/max14577.c +++ b/drivers/mfd/max14577.c @@ -112,17 +112,17 @@ static int max14577_i2c_probe(struct i2c_client *i2c, maxim_core->i2c = i2c; maxim_core->irq = i2c->irq; - maxim_core->regmap = devm_regmap_init_i2c(i2c, - &max14577_muic_regmap_config); - if (IS_ERR(maxim_core->regmap)) { - ret = PTR_ERR(maxim_core->regmap); + maxim_core->regmap_muic = devm_regmap_init_i2c(i2c, + &max14577_muic_regmap_config); + if (IS_ERR(maxim_core->regmap_muic)) { + ret = PTR_ERR(maxim_core->regmap_muic); dev_err(maxim_core->dev, "Failed to allocate register map: %d\n", ret); return ret; } - ret = max14577_read_reg(maxim_core->regmap, MAXIM_MUIC_REG_DEVICEID, - ®_data); + ret = max14577_read_reg(maxim_core->regmap_muic, + MAXIM_MUIC_REG_DEVICEID, ®_data); if (ret) { dev_err(maxim_core->dev, "Device not found on this channel: %d\n", ret); @@ -135,10 +135,10 @@ static int max14577_i2c_probe(struct i2c_client *i2c, dev_info(maxim_core->dev, "Device ID: 0x%x, vendor: 0x%x\n", maxim_core->device_id, maxim_core->vendor_id); - ret = regmap_add_irq_chip(maxim_core->regmap, maxim_core->irq, + ret = regmap_add_irq_chip(maxim_core->regmap_muic, maxim_core->irq, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, 0, &max14577_irq_chip, - &maxim_core->irq_data); + &maxim_core->irq_data_muic); if (ret != 0) { dev_err(&i2c->dev, "Failed to request IRQ %d: %d\n", maxim_core->irq, ret); @@ -147,7 +147,7 @@ static int max14577_i2c_probe(struct i2c_client *i2c, ret = mfd_add_devices(maxim_core->dev, -1, max14577_devs, ARRAY_SIZE(max14577_devs), NULL, 0, - regmap_irq_get_domain(maxim_core->irq_data)); + regmap_irq_get_domain(maxim_core->irq_data_muic)); if (ret < 0) goto err_mfd; @@ -156,7 +156,7 @@ static int max14577_i2c_probe(struct i2c_client *i2c, return 0; err_mfd: - regmap_del_irq_chip(maxim_core->irq, maxim_core->irq_data); + regmap_del_irq_chip(maxim_core->irq, maxim_core->irq_data_muic); return ret; } @@ -166,7 +166,7 @@ static int max14577_i2c_remove(struct i2c_client *i2c) struct maxim_core *maxim_core = i2c_get_clientdata(i2c); mfd_remove_devices(maxim_core->dev); - regmap_del_irq_chip(maxim_core->irq, maxim_core->irq_data); + regmap_del_irq_chip(maxim_core->irq, maxim_core->irq_data_muic); return 0; } diff --git a/drivers/power/max14577_charger.c b/drivers/power/max14577_charger.c index 335c42a13136..58cddc3b15d6 100644 --- a/drivers/power/max14577_charger.c +++ b/drivers/power/max14577_charger.c @@ -31,7 +31,7 @@ struct max14577_charger { static int max14577_get_charger_state(struct max14577_charger *chg) { - struct regmap *rmap = chg->maxim_core->regmap; + struct regmap *rmap = chg->maxim_core->regmap_muic; int state = POWER_SUPPLY_STATUS_DISCHARGING; u8 reg_data; @@ -87,7 +87,7 @@ static int max14577_get_charge_type(struct max14577_charger *chg) static int max14577_get_online(struct max14577_charger *chg) { - struct regmap *rmap = chg->maxim_core->regmap; + struct regmap *rmap = chg->maxim_core->regmap_muic; u8 reg_data; max14577_read_reg(rmap, MAXIM_MUIC_REG_STATUS2, ®_data); @@ -116,7 +116,7 @@ static int max14577_get_online(struct max14577_charger *chg) */ static int max14577_get_battery_health(struct max14577_charger *chg) { - struct regmap *rmap = chg->maxim_core->regmap; + struct regmap *rmap = chg->maxim_core->regmap_muic; int state = POWER_SUPPLY_HEALTH_GOOD; u8 reg_data; @@ -156,7 +156,7 @@ static int max14577_get_present(struct max14577_charger *chg) */ static void max14577_charger_reg_init(struct max14577_charger *chg) { - struct regmap *rmap = chg->maxim_core->regmap; + struct regmap *rmap = chg->maxim_core->regmap_muic; u8 reg_data; /* diff --git a/drivers/regulator/max14577.c b/drivers/regulator/max14577.c index 3d75ca7aa87e..d7e8fa630d63 100644 --- a/drivers/regulator/max14577.c +++ b/drivers/regulator/max14577.c @@ -207,7 +207,7 @@ static int max14577_regulator_probe(struct platform_device *pdev) return ret; config.dev = &pdev->dev; - config.regmap = maxim_core->regmap; + config.regmap = maxim_core->regmap_muic; for (i = 0; i < ARRAY_SIZE(supported_regulators); i++) { struct regulator_dev *regulator; diff --git a/include/linux/mfd/max14577-private.h b/include/linux/mfd/max14577-private.h index a0a24556741d..d69c56f02eac 100644 --- a/include/linux/mfd/max14577-private.h +++ b/include/linux/mfd/max14577-private.h @@ -251,9 +251,9 @@ struct maxim_core { struct device *dev; struct i2c_client *i2c; /* Slave addr = 0x4A */ - struct regmap *regmap; + struct regmap *regmap_muic; - struct regmap_irq_chip_data *irq_data; + struct regmap_irq_chip_data *irq_data_muic; int irq; /* Device ID */