From patchwork Wed May 30 04:47:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9026 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 1A63223E58 for ; Wed, 30 May 2012 04:48:25 +0000 (UTC) Received: from mail-ob0-f180.google.com (mail-ob0-f180.google.com [209.85.214.180]) by fiordland.canonical.com (Postfix) with ESMTP id D3955A185A7 for ; Wed, 30 May 2012 04:48:24 +0000 (UTC) Received: by mail-ob0-f180.google.com with SMTP id un3so10000826obb.11 for ; Tue, 29 May 2012 21:48:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=fvKVWESr0CEAL0QRmQMJ9OKqW07lvgpjl3tRAnB/oNE=; b=OFJqwZfrY2MI3BHoFp2YqdygKnWVG9KmL5XhD/F6nGt6xi9+q027vMBZDv5xpGB2At 2f93o9ZGeE2lHQKfK62u2AN0Xdt4NJliu8IPvp1FbsjNy3Bu97qfEzF0vqAoNAEbZ811 neucCQOJ53dUF2JydI6so65RCNjo4idURbCPj12eTfuIP0ifmqQ6ByB17QxpnhKIvvpt IieAUyHGO7tOSRfJig8ZkghrHeZBuBwH/YqazmJMmJ+kqhqSgfS7p3dRDR0UTsxWkSt3 WTWLtxMgAFasjOwsfbTy3SgAtnpKuqS/8REONMjZgqtFODIvg84fLFfSPwwRPAkkh/lh fY2A== Received: by 10.50.87.227 with SMTP id bb3mr9338272igb.57.1338353304485; Tue, 29 May 2012 21:48:24 -0700 (PDT) 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.231.24.148 with SMTP id v20csp170250ibb; Tue, 29 May 2012 21:48:24 -0700 (PDT) Received: by 10.68.203.73 with SMTP id ko9mr45816693pbc.66.1338353303885; Tue, 29 May 2012 21:48:23 -0700 (PDT) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id ku9si15135999pbc.355.2012.05.29.21.48.23 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:23 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.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-pz0-f50.google.com with SMTP id h15so7270112dan.37 for ; Tue, 29 May 2012 21:48:23 -0700 (PDT) Received: by 10.68.222.9 with SMTP id qi9mr19244899pbc.164.1338353303635; Tue, 29 May 2012 21:48:23 -0700 (PDT) Received: from localhost.localdomain ([118.143.64.134]) by mx.google.com with ESMTPS id kd6sm25122557pbc.24.2012.05.29.21.48.20 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 May 2012 21:48:23 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linus.walleij@stericsson.com, grant.likely@secretlab.ca, cjb@laptop.org, broonie@opensource.wolfsonmicro.com, sameo@linux.intel.com Cc: Lee Jones , linux-kernel@vger.kernel.org Subject: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree Date: Wed, 30 May 2012 12:47:26 +0800 Message-Id: <1338353260-10097-9-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1338353260-10097-1-git-send-email-lee.jones@linaro.org> References: <1338353260-10097-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQm2444h3iqOI5dToQzsQXoYMK+YzwWVEHTIr/LaAJpuMZMv6gRzioU1AFS0jQ2ft2BosjFj The 'name' field in 'struct of_regulator_match' expects to match with its corresponding regulator device node in the Device Tree. This patch renames each of the regulators in the ab8500 regulator driver so this is true. Cc: linux-kernel@vger.kernel.org Signed-off-by: Lee Jones --- drivers/regulator/ab8500.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index e1b8c54..a739f5c 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -794,17 +794,17 @@ static __devinit int ab8500_regulator_register(struct platform_device *pdev, } static struct of_regulator_match ab8500_regulator_matches[] = { - { .name = "LDO-AUX1", .driver_data = (void *) AB8500_LDO_AUX1, }, - { .name = "LDO-AUX2", .driver_data = (void *) AB8500_LDO_AUX2, }, - { .name = "LDO-AUX3", .driver_data = (void *) AB8500_LDO_AUX3, }, - { .name = "LDO-INTCORE", .driver_data = (void *) AB8500_LDO_INTCORE, }, - { .name = "LDO-TVOUT", .driver_data = (void *) AB8500_LDO_TVOUT, }, - { .name = "LDO-USB", .driver_data = (void *) AB8500_LDO_USB, }, - { .name = "LDO-AUDIO", .driver_data = (void *) AB8500_LDO_AUDIO, }, - { .name = "LDO-ANAMIC1", .driver_data = (void *) AB8500_LDO_ANAMIC1, }, - { .name = "LDO-ANAMIC2", .driver_data = (void *) AB8500_LDO_ANAMIC2, }, - { .name = "LDO-DMIC", .driver_data = (void *) AB8500_LDO_DMIC, }, - { .name = "LDO-ANA", .driver_data = (void *) AB8500_LDO_ANA, }, + { .name = "ab8500_ldo_aux1", .driver_data = (void *) AB8500_LDO_AUX1, }, + { .name = "ab8500_ldo_aux2", .driver_data = (void *) AB8500_LDO_AUX2, }, + { .name = "ab8500_ldo_aux3", .driver_data = (void *) AB8500_LDO_AUX3, }, + { .name = "ab8500_ldo_intcore", .driver_data = (void *) AB8500_LDO_INTCORE, }, + { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, }, + { .name = "ab8500_ldo_usb", .driver_data = (void *) AB8500_LDO_USB, }, + { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, }, + { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, }, + { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, }, + { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8500_LDO_DMIC, }, + { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, }, }; static __devinit int