From patchwork Fri Jun 7 16:11: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: 17682 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f197.google.com (mail-we0-f197.google.com [74.125.82.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 85F432395F for ; Fri, 7 Jun 2013 16:11:54 +0000 (UTC) Received: by mail-we0-f197.google.com with SMTP id w56sf4081038wes.0 for ; Fri, 07 Jun 2013 09:11:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=T1ZEknx/CvzIYiOoLgaClGzHA5bkWnfsKOz0yoRV+sc=; b=Syh2cRVgz8rQUMsi9fhBKSLb1RAygx9ofCIfSN2qC6bAk9h4fyq+alMCtj0MdM0pOR FDEnifYhnlcDLEb2X6o5oB/1N+PuM7wylOxk2Ap8ReCxXoKcrd5OhjDBE9cHqQYyrK3X R3x6otOAErWqFXO1wbIynvUjR81yKWzxaQKBJPOHABbfSGD353SZt6cFDBHyoclJkGLq UAGHQPLxTm43K3fEwbH16vFw73U/JtaBC20F30Br1UKyh4udd/E58HPK0168ovdtlFcG NvUG7qT3SHFosS1MYvRVjoKkaIHfW21nBz6YvWf2dXjanOMAEqJldLI/oNjlVtO1MVQ6 hj8A== X-Received: by 10.180.11.232 with SMTP id t8mr1624925wib.3.1370621513318; Fri, 07 Jun 2013 09:11:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.183.237 with SMTP id ep13ls271693wic.2.gmail; Fri, 07 Jun 2013 09:11:53 -0700 (PDT) X-Received: by 10.194.110.73 with SMTP id hy9mr4680018wjb.95.1370621513135; Fri, 07 Jun 2013 09:11:53 -0700 (PDT) Received: from mail-ve0-x233.google.com (mail-ve0-x233.google.com [2607:f8b0:400c:c01::233]) by mx.google.com with ESMTPS id dd1si4568713wjc.150.2013.06.07.09.11.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Jun 2013 09:11:53 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::233 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::233; Received: by mail-ve0-f179.google.com with SMTP id d10so3131404vea.24 for ; Fri, 07 Jun 2013 09:11:52 -0700 (PDT) X-Received: by 10.58.144.231 with SMTP id sp7mr2710646veb.34.1370621512049; Fri, 07 Jun 2013 09:11:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.10.206 with SMTP id pb14csp120717vcb; Fri, 7 Jun 2013 09:11:51 -0700 (PDT) X-Received: by 10.15.24.13 with SMTP id i13mr1684464eeu.23.1370621510901; Fri, 07 Jun 2013 09:11:50 -0700 (PDT) Received: from mail-ee0-x236.google.com (mail-ee0-x236.google.com [2a00:1450:4013:c00::236]) by mx.google.com with ESMTPS id o41si4256672eep.19.2013.06.07.09.11.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Jun 2013 09:11:50 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:4013:c00::236 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:4013:c00::236; Received: by mail-ee0-f54.google.com with SMTP id t10so1562009eei.13 for ; Fri, 07 Jun 2013 09:11:50 -0700 (PDT) X-Received: by 10.14.22.6 with SMTP id s6mr6428704ees.10.1370621510408; Fri, 07 Jun 2013 09:11:50 -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 ESMTPSA id c5sm97260340eeu.8.2013.06.07.09.11.48 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Jun 2013 09:11:49 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, srinidhi.kasagar@stericsson.com, broonie@linaro.org, Lee Jones Subject: [PATCH 04/10] ARM: ux500: Provide the supply regulator through consumers Date: Fri, 7 Jun 2013 17:11:22 +0100 Message-Id: <1370621488-18130-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1370621488-18130-1-git-send-email-lee.jones@linaro.org> References: <1370621488-18130-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkhxaoWIlwXh9m4bUjElFGRKB+oNkDu4YzcqboBvYRhtgedHKgwiIVVil/hDPb/J7ax2I5S X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::233 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The supply name is now provided through the regulator descriptor, so instead of applying a supply_regulator name for each subordinate regulator requiring it, we can just register a link between the chip and supply name to achieve the same thing. This reduces platform data code and standardises the semantics between ATAG and DT boots. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-regulators.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 0dc44c6..70111d5 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -374,7 +374,6 @@ static struct ab8500_regulator_reg_init ab8500_reg_init[] = { static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { /* supplies to the display/camera */ [AB8500_LDO_AUX1] = { - .supply_regulator = "ab8500-ext-supply3", .constraints = { .name = "V-DISPLAY", .min_uV = 2800000, @@ -388,7 +387,6 @@ static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { }, /* supplies to the on-board eMMC */ [AB8500_LDO_AUX2] = { - .supply_regulator = "ab8500-ext-supply3", .constraints = { .name = "V-eMMC1", .min_uV = 1100000, @@ -404,7 +402,6 @@ static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { }, /* supply for VAUX3, supplies to SDcard slots */ [AB8500_LDO_AUX3] = { - .supply_regulator = "ab8500-ext-supply3", .constraints = { .name = "V-MMC-SD", .min_uV = 1100000, @@ -495,6 +492,7 @@ static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { static struct regulator_consumer_supply ab8500_ext_supply3_consumers[] = { /* SIM supply for 3 V SIM cards */ REGULATOR_SUPPLY("vinvsim", "sim-detect.0"), + REGULATOR_SUPPLY("vin", "ab8500-regulator.0"), }; /* extended configuration for VextSupply2, only used for HREFP_V20 boards */