From patchwork Wed Feb 6 10:54:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14626 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 5D25B2423C for ; Wed, 6 Feb 2013 10:56:16 +0000 (UTC) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by fiordland.canonical.com (Postfix) with ESMTP id 19CB6A187B7 for ; Wed, 6 Feb 2013 10:56:16 +0000 (UTC) Received: by mail-ve0-f181.google.com with SMTP id d10so1026657vea.12 for ; Wed, 06 Feb 2013 02:56:15 -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=e6VQ8/BTKOEE6yhbg1RTVw8sFVBx2w3f4Bx13B6dViM=; b=TvQUZyAswGRTkAcRoW7iYPI9jK9lzKovKq/VVfGO4gXpQ/ss0WQVO5qTN1iIWldfdo 0V8PCvTBbu8Us8aLqCq+JY2WTLlFPFWhXd5/IUzf0FQLPOoeJmxIi/z+hkYJ2mgxo2ik ggI3skqXuA3sxkj62r1CYW3bMSbSPTjLdFyhp2D3jWyTiOoG5c1Hiu4F/bnxaKIiYeNO w8TPQwDHzoLmjZUX4mUEPdC47Ag0Pfm7jCUuVxfmRqoQRC/PQC3ObzMT1kSQB90k4osj BvlXyPASzt/CX+1SIEWrOCjT0Gt6C6hPGBJpNLgHwzkpuI58ruP9Qmjqblpthlt2c3J1 X7AQ== X-Received: by 10.59.7.65 with SMTP id da1mr28035501ved.4.1360148175618; Wed, 06 Feb 2013 02:56:15 -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 zo8csp13026vec; Wed, 6 Feb 2013 02:56:15 -0800 (PST) X-Received: by 10.180.84.165 with SMTP id a5mr4187847wiz.6.1360148125674; Wed, 06 Feb 2013 02:55:25 -0800 (PST) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id ay3si504526wib.91.2013.02.06.02.55.25 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:55:25 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 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-f50.google.com with SMTP id es5so955320wgb.17 for ; Wed, 06 Feb 2013 02:55:25 -0800 (PST) X-Received: by 10.194.89.167 with SMTP id bp7mr48599512wjb.0.1360148125196; Wed, 06 Feb 2013 02:55:25 -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 be1sm2406649wib.10.2013.02.06.02.55.24 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:55:24 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: broonie@opensource.wolfsonmicro.com, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 49/49] ARM: ux500: Pass regulator platform data using the new format Date: Wed, 6 Feb 2013 10:54:11 +0000 Message-Id: <1360148051-7560-50-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> References: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmfKcAXT4rdX1JY5r1ySVk8E8/ejTTooq/scxNQg8okY33bJWnyf1aqiIVDpPRv2k+YptQx Regulator platform data is now passed though a single structure as opposed to the old way where four separate struct elements were required. This patch makes use of the new format. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 5 +---- include/linux/mfd/abx500/ab8500.h | 11 ++--------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index d453522..b47192d 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -217,10 +217,7 @@ static struct platform_device snowball_sbnet_dev = { static struct ab8500_platform_data ab8500_platdata = { .irq_base = MOP500_AB8500_IRQ_BASE, - .regulator_reg_init = ab8500_regulator_reg_init, - .num_regulator_reg_init = ARRAY_SIZE(ab8500_regulator_reg_init), - .regulator = ab8500_regulators, - .num_regulator = ARRAY_SIZE(ab8500_regulators), + .regulator = &ab8500_regulator_plat_data, .gpio = &ab8500_gpio_pdata, .codec = &ab8500_codec_pdata, }; diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h index 1cb5698..c7e33c8 100644 --- a/include/linux/mfd/abx500/ab8500.h +++ b/include/linux/mfd/abx500/ab8500.h @@ -266,8 +266,7 @@ struct ab8500 { const int *irq_reg_offset; }; -struct regulator_reg_init; -struct regulator_init_data; +struct ab8500_regulator_platform_data; struct ab8500_gpio_platform_data; struct ab8500_codec_platform_data; @@ -275,18 +274,12 @@ struct ab8500_codec_platform_data; * struct ab8500_platform_data - AB8500 platform data * @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used * @init: board-specific initialization after detection of ab8500 - * @num_regulator_reg_init: number of regulator init registers - * @regulator_reg_init: regulator init registers - * @num_regulator: number of regulators * @regulator: machine-specific constraints for regulators */ struct ab8500_platform_data { int irq_base; void (*init) (struct ab8500 *); - int num_regulator_reg_init; - struct ab8500_regulator_reg_init *regulator_reg_init; - int num_regulator; - struct regulator_init_data *regulator; + struct ab8500_regulator_platform_data *regulator; struct ab8500_gpio_platform_data *gpio; struct ab8500_codec_platform_data *codec; };