From patchwork Thu Nov 5 16:39:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aggarwal, Anuj" X-Patchwork-Id: 57910 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA5GdvCr009758 for ; Thu, 5 Nov 2009 16:39:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757577AbZKEQjw (ORCPT ); Thu, 5 Nov 2009 11:39:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757463AbZKEQjw (ORCPT ); Thu, 5 Nov 2009 11:39:52 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:47097 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757461AbZKEQjv (ORCPT ); Thu, 5 Nov 2009 11:39:51 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id nA5GdoBi002023 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 5 Nov 2009 10:39:52 -0600 Received: from psplinux050.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id nA5GdnJq013661; Thu, 5 Nov 2009 22:09:49 +0530 (IST) Received: from psplinux050.india.ti.com (localhost [127.0.0.1]) by psplinux050.india.ti.com (8.13.1/8.13.1) with ESMTP id nA5Gdnmk029704; Thu, 5 Nov 2009 22:09:49 +0530 Received: (from a0393534@localhost) by psplinux050.india.ti.com (8.13.1/8.13.1/Submit) id nA5Gdn1E029701; Thu, 5 Nov 2009 22:09:49 +0530 From: Anuj Aggarwal To: linux-omap@vger.kernel.org Cc: broonie@opensource.wolfsonmicro.com, lrg@slimlogic.co.uk, Anuj Aggarwal Subject: [PATCH 5/5] Regulator: Renaming the supplies used in MMC driver Date: Thu, 5 Nov 2009 22:09:49 +0530 Message-Id: <1257439189-29594-1-git-send-email-anuj.aggarwal@ti.com> X-Mailer: git-send-email 1.6.2.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index 3403914..af3b1be 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -109,9 +109,9 @@ static int twl_mmc_late_init(struct device *dev) hsmmc[i].mmc = mmc; - reg = regulator_get(dev, "vmmc"); + reg = regulator_get(dev, "mmc"); if (IS_ERR(reg)) { - dev_dbg(dev, "vmmc regulator missing\n"); + dev_dbg(dev, "mmc regulator missing\n"); /* HACK: until fixed.c regulator is usable, * we don't require a main regulator * for MMC2 or MMC3 @@ -126,7 +126,7 @@ static int twl_mmc_late_init(struct device *dev) mmc->slots[0].ocr_mask = mmc_regulator_get_ocrmask(reg); /* allow an aux regulator */ - reg = regulator_get(dev, "vmmc_aux"); + reg = regulator_get(dev, "mmc_aux"); hsmmc[i].vcc_aux = IS_ERR(reg) ? NULL : reg; /* UGLY HACK: workaround regulator framework bugs.