From patchwork Mon Feb 4 11:54:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14516 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 7348E23F96 for ; Mon, 4 Feb 2013 11:58:05 +0000 (UTC) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by fiordland.canonical.com (Postfix) with ESMTP id 0BD22A19239 for ; Mon, 4 Feb 2013 11:58:04 +0000 (UTC) Received: by mail-vb0-f46.google.com with SMTP id b13so3828140vby.33 for ; Mon, 04 Feb 2013 03:58:04 -0800 (PST) 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=M9o89rZ6pU3LpIZLOlIV5pgbg+gZpLFSKtIG+TsoXss=; b=CLCCWA6ggkURwvRm0AUzT48r+0bedmQnoZ2AoDlO7SWbxEt1rKcnFj5eePjui4DzR8 gs9tnaeEFSmbBWxY6wWpReN4UuAQY6t+ZWWG/p9ObtjyaTscMrJTapbzNJGtP3YHeaeM 6T1jUuF1SrFihMvkGcwJ+fAGs6o/pAEGutwV0DvjwJOQ2jvj3gA9+w/PNNZ5gOuvrip8 LevIXoXuNMp/7Buprq1+qpJvFNdU33l0csm8jHWcFO8SMRaixJlaqHgiaOnRzNByQ3Dj oFvTOkmWg9sv9d7Qi2RswwUBjk6WpNM6D/+4/rHSVGI0YaVt3EGxMgQA2tXkOhOOBGWX EwFQ== X-Received: by 10.220.153.143 with SMTP id k15mr21552395vcw.33.1359979084461; Mon, 04 Feb 2013 03:58:04 -0800 (PST) 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.252.8 with SMTP id zo8csp83139vec; Mon, 4 Feb 2013 03:58:03 -0800 (PST) X-Received: by 10.180.104.196 with SMTP id gg4mr9968776wib.16.1359979083575; Mon, 04 Feb 2013 03:58:03 -0800 (PST) Received: from mail-we0-x232.google.com ([2a00:1450:400c:c03::232]) by mx.google.com with ESMTPS id q8si5715166wja.170.2013.02.04.03.58.03 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:58:03 -0800 (PST) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::232 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::232; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::232 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-we0-f178.google.com with SMTP id x48so4599268wey.23 for ; Mon, 04 Feb 2013 03:58:03 -0800 (PST) X-Received: by 10.180.82.9 with SMTP id e9mr10144570wiy.1.1359979083124; Mon, 04 Feb 2013 03:58:03 -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 j9sm12937128wia.5.2013.02.04.03.58.01 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:58:02 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Lee Jones , Gabriel Fernandez Subject: [PATCH 67/73] regulator: ab8500: Use a struct to select the good regulator configuration Date: Mon, 4 Feb 2013 11:54:22 +0000 Message-Id: <1359978868-28736-68-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> References: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQn4PgygjY9TLp2F2aEh1/3QGPT8pe0/L1D3h8K6XbOrttpKFwlgpBvDeigtH+nEYnWosGLo At the probe use a structure to select the good regulator array from from ab9540, ab8505, ab8540 or ab8500 configuration. Signed-off-by: Gabriel Fernandez Signed-off-by: Lee Jones Reviewed-by: Philippe LANGLAIS --- drivers/regulator/ab8500.c | 113 +++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 65 deletions(-) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index fa0979a..b6e8f4d 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -2845,10 +2845,17 @@ 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; +} 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); @@ -2878,7 +2885,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); @@ -2887,7 +2893,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; @@ -2913,7 +2919,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; @@ -2949,19 +2955,41 @@ static struct of_regulator_match ab9540_regulator_match[] = { { .name = "ab9540_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; + } 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; + } 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; + } 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; + } +} + 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; } @@ -2973,41 +3001,14 @@ 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; + /* cache values needed repeatedly inside for-loops */ - 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_matches; - match_size = ARRAY_SIZE(ab9540_regulator_matches) - } 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_matches; - match_size = ARRAY_SIZE(ab8500_regulator_matches) - } + abx500_get_regulator_info(ab8500); if (np) { err = of_regulator_match(&pdev->dev, np, match, match_size); @@ -3017,8 +3018,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev) return err; } - err = ab8500_regulator_of_probe(pdev, regulator_info, - regulator_info_size, match, np); + err = ab8500_regulator_of_probe(pdev, match, np); return err; } @@ -3040,7 +3040,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; } @@ -3059,9 +3059,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; } @@ -3074,9 +3074,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; } @@ -3088,27 +3088,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);