From patchwork Thu Mar 21 15:59:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2315101 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 912B7400E6 for ; Thu, 21 Mar 2013 16:34:46 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIiOj-0001uh-VL; Thu, 21 Mar 2013 16:31:26 +0000 Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIhvd-0001St-B1 for linux-arm-kernel@lists.infradead.org; Thu, 21 Mar 2013 16:01:28 +0000 Received: by mail-we0-f174.google.com with SMTP id r6so2479373wey.5 for ; Thu, 21 Mar 2013 09:01:18 -0700 (PDT) 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=lYoHES+2l4OCZ9KOCT6v6r2GSa1eY+/W/TCBy1AZxz8=; b=BJ8GoVK/gG5IFPbe5YQie/eNQP/eT+0byaLWLXnGARpHw9jJZ8ehQFtzWjGr/Xg3HU N9BGobg/QLJrKVjXINc2lWJueEe5RU3VOikLboT8yMNNkX3byp3ZD1IwfzTf6l7QhUor BzgTuHv06o/BlPZt8tzPPRfPELeJWnAzTAxCdHLuhLp96hnap1bB498dsnTLbfWQO+Eg onnXCK3sVeiCg+fbwABFq9JonWjtxrokZPWKNtcifHM+5hracATmNJi0s4UTPEfv3yhl FFTrv/j/IAbqdPdhofzh0bI3icAVIwPxyIVoco7j9dEkVBuLmXqaRyiBKhapIdygd7GJ jtxA== X-Received: by 10.180.79.227 with SMTP id m3mr5722606wix.12.1363881678536; Thu, 21 Mar 2013 09:01:18 -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.16 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 09:01:17 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Subject: [PATCH 38/46] regulator: ab8500: Use a struct to select the good regulator configuration Date: Thu, 21 Mar 2013 15:59:35 +0000 Message-Id: <1363881583-15234-39-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: ALoCoQkh+1dcsIilO/zmhS+9FjA9gA8wg11zhh+rL4m9M2WLqH7VbDFB+dSnA12O/9dTXDsmGu66 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130321_120122_062334_F273D2DA X-CRM114-Status: GOOD ( 16.60 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de 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 At the probe use a structure to select the good regulator array from from ab9540, ab8505, ab8540 or ab8500 configuration. Signed-off-by: Lee Jones --- drivers/regulator/ab8500.c | 135 +++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 71 deletions(-) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 200005e..31aa43d 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -2852,10 +2852,19 @@ static struct ab8500_reg_init ab8540_reg_init[] = { REG_INIT(AB8540_REGUCTRLDISCH4, 0x04, 0x49, 0x07), }; +static struct { + struct ab8500_regulator_info *info; + int info_size; + struct ab8500_reg_init *init; + int init_size; + struct of_regulator_match *match; + int match_size; +} abx500_regulator; + static int ab8500_regulator_init_registers(struct platform_device *pdev, - struct ab8500_reg_init *reg_init, int id, int mask, int value) { + struct ab8500_reg_init *reg_init = abx500_regulator.init; int err; BUG_ON(value & ~mask); @@ -2885,7 +2894,6 @@ static int ab8500_regulator_init_registers(struct platform_device *pdev, static int ab8500_regulator_register(struct platform_device *pdev, struct regulator_init_data *init_data, - struct ab8500_regulator_info *regulator_info, int id, struct device_node *np) { struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent); @@ -2894,7 +2902,7 @@ static int ab8500_regulator_register(struct platform_device *pdev, int err; /* assign per-regulator data */ - info = ®ulator_info[id]; + info = &abx500_regulator.info[id]; info->dev = &pdev->dev; config.dev = &pdev->dev; @@ -2920,7 +2928,7 @@ static int ab8500_regulator_register(struct platform_device *pdev, info->desc.name); /* when we fail, un-register all earlier regulators */ while (--id >= 0) { - info = ®ulator_info[id]; + info = &abx500_regulator.info[id]; regulator_unregister(info->regulator); } return err; @@ -2987,19 +2995,49 @@ static struct of_regulator_match ab9540_regulator_match[] = { { .name = "ab8500_ldo_ana", .driver_data = (void *) AB9540_LDO_ANA, }, }; +static void abx500_get_regulator_info(struct ab8500 *ab8500) +{ + if (is_ab9540(ab8500)) { + abx500_regulator.info = ab9540_regulator_info; + abx500_regulator.info_size = ARRAY_SIZE(ab9540_regulator_info); + abx500_regulator.init = ab9540_reg_init; + abx500_regulator.init_size = AB9540_NUM_REGULATOR_REGISTERS; + abx500_regulator.match = ab9540_regulator_match; + abx500_regulator.match_size = ARRAY_SIZE(ab9540_regulator_match); + } else if (is_ab8505(ab8500)) { + abx500_regulator.info = ab8505_regulator_info; + abx500_regulator.info_size = ARRAY_SIZE(ab8505_regulator_info); + abx500_regulator.init = ab8505_reg_init; + abx500_regulator.init_size = AB8505_NUM_REGULATOR_REGISTERS; + abx500_regulator.match = ab8505_regulator_match; + abx500_regulator.match_size = ARRAY_SIZE(ab8505_regulator_match); + } else if (is_ab8540(ab8500)) { + abx500_regulator.info = ab8540_regulator_info; + abx500_regulator.info_size = ARRAY_SIZE(ab8540_regulator_info); + abx500_regulator.init = ab8540_reg_init; + abx500_regulator.init_size = AB8540_NUM_REGULATOR_REGISTERS; + abx500_regulator.match = ab8540_regulator_match; + abx500_regulator.match_size = ARRAY_SIZE(ab8540_regulator_match); + } else { + abx500_regulator.info = ab8500_regulator_info; + abx500_regulator.info_size = ARRAY_SIZE(ab8500_regulator_info); + abx500_regulator.init = ab8500_reg_init; + abx500_regulator.init_size = AB8500_NUM_REGULATOR_REGISTERS; + abx500_regulator.match = ab8500_regulator_match; + abx500_regulator.match_size = ARRAY_SIZE(ab8500_regulator_match); + } +} + static int ab8500_regulator_of_probe(struct platform_device *pdev, - struct ab8500_regulator_info *regulator_info, - int regulator_info_size, - struct of_regulator_match *match, struct device_node *np) { + struct of_regulator_match *match = abx500_regulator.match; int err, i; - for (i = 0; i < regulator_info_size; i++) { + for (i = 0; i < abx500_regulator.info_size; i++) { err = ab8500_regulator_register( - pdev, match[i].init_data, regulator_info, - i, match[i].of_node); + pdev, match[i].init_data, i, match[i].of_node); if (err) return err; } @@ -3011,59 +3049,31 @@ static int ab8500_regulator_probe(struct platform_device *pdev) { struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent); struct device_node *np = pdev->dev.of_node; - struct of_regulator_match *match; struct ab8500_platform_data *ppdata; struct ab8500_regulator_platform_data *pdata; int i, err; - struct ab8500_regulator_info *regulator_info; - int regulator_info_size; - struct ab8500_reg_init *reg_init; - int reg_init_size; - if (is_ab9540(ab8500)) { - regulator_info = ab9540_regulator_info; - regulator_info_size = ARRAY_SIZE(ab9540_regulator_info); - reg_init = ab9540_reg_init; - reg_init_size = AB9540_NUM_REGULATOR_REGISTERS; - match = ab9540_regulator_match; - match_size = ARRAY_SIZE(ab9540_regulator_match) - } else if (is_ab8505(ab8500)) { - regulator_info = ab8505_regulator_info; - regulator_info_size = ARRAY_SIZE(ab8505_regulator_info); - reg_init = ab8505_reg_init; - reg_init_size = AB8505_NUM_REGULATOR_REGISTERS; - } else if (is_ab8540(ab8500)) { - regulator_info = ab8540_regulator_info; - regulator_info_size = ARRAY_SIZE(ab8540_regulator_info); - reg_init = ab8540_reg_init; - reg_init_size = AB8540_NUM_REGULATOR_REGISTERS; - } else { - regulator_info = ab8500_regulator_info; - regulator_info_size = ARRAY_SIZE(ab8500_regulator_info); - reg_init = ab8500_reg_init; - reg_init_size = AB8500_NUM_REGULATOR_REGISTERS; - match = ab8500_regulator_match; - match_size = ARRAY_SIZE(ab8500_regulator_match) + if (!ab8500) { + dev_err(&pdev->dev, "null mfd parent\n"); + return -EINVAL; } + abx500_get_regulator_info(ab8500); + if (np) { - err = of_regulator_match(&pdev->dev, np, match, match_size); + err = of_regulator_match(&pdev->dev, np, + abx500_regulator.match, + abx500_regulator.match_size); if (err < 0) { dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", err); return err; } - err = ab8500_regulator_of_probe(pdev, regulator_info, - regulator_info_size, match, np); + err = ab8500_regulator_of_probe(pdev, np); return err; } - if (!ab8500) { - dev_err(&pdev->dev, "null mfd parent\n"); - return -EINVAL; - } - ppdata = dev_get_platdata(ab8500->dev); if (!ppdata) { dev_err(&pdev->dev, "null parent pdata\n"); @@ -3077,7 +3087,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev) } /* make sure the platform data has the correct size */ - if (pdata->num_regulator != regulator_info_size) { + if (pdata->num_regulator != abx500_regulator.info_size) { dev_err(&pdev->dev, "Configuration error: size mismatch.\n"); return -EINVAL; } @@ -3096,9 +3106,9 @@ static int ab8500_regulator_probe(struct platform_device *pdev) value = pdata->reg_init[i].value; /* check for configuration errors */ - BUG_ON(id >= AB8500_NUM_REGULATOR_REGISTERS); + BUG_ON(id >= abx500_regulator.init_size); - err = ab8500_regulator_init_registers(pdev, reg_init, id, mask, value); + err = ab8500_regulator_init_registers(pdev, id, mask, value); if (err < 0) return err; } @@ -3111,9 +3121,9 @@ static int ab8500_regulator_probe(struct platform_device *pdev) } /* register all regulators */ - for (i = 0; i < regulator_info_size; i++) { + for (i = 0; i < abx500_regulator.info_size; i++) { err = ab8500_regulator_register(pdev, &pdata->regulator[i], - regulator_info, i, NULL); + i, NULL); if (err < 0) return err; } @@ -3125,27 +3135,10 @@ static int ab8500_regulator_remove(struct platform_device *pdev) { int i, err; struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent); - struct ab8500_regulator_info *regulator_info; - int regulator_info_size; - - - if (is_ab9540(ab8500)) { - regulator_info = ab9540_regulator_info; - regulator_info_size = ARRAY_SIZE(ab9540_regulator_info); - } else if (is_ab8505(ab8500)) { - regulator_info = ab8505_regulator_info; - regulator_info_size = ARRAY_SIZE(ab8505_regulator_info); - } else if (is_ab8540(ab8500)) { - regulator_info = ab8540_regulator_info; - regulator_info_size = ARRAY_SIZE(ab8540_regulator_info); - } else { - regulator_info = ab8500_regulator_info; - regulator_info_size = ARRAY_SIZE(ab8500_regulator_info); - } - for (i = 0; i < regulator_info_size; i++) { + for (i = 0; i < abx500_regulator.info_size; i++) { struct ab8500_regulator_info *info = NULL; - info = ®ulator_info[i]; + info = &abx500_regulator.info[i]; dev_vdbg(rdev_get_dev(info->regulator), "%s-remove\n", info->desc.name);