From patchwork Fri Aug 20 20:10:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kishore kadiyala X-Patchwork-Id: 120711 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7KKAMYF027692 for ; Fri, 20 Aug 2010 20:10:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752819Ab0HTUKm (ORCPT ); Fri, 20 Aug 2010 16:10:42 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:46738 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751442Ab0HTUKm (ORCPT ); Fri, 20 Aug 2010 16:10:42 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o7KKAeeK014657 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 20 Aug 2010 15:10:40 -0500 Received: from dbdmail.itg.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o7KKAaQu015404; Fri, 20 Aug 2010 15:10:37 -0500 (CDT) Received: from 10.24.255.18 (SquirrelMail authenticated user x0099945); by dbdmail.itg.ti.com with HTTP; Sat, 21 Aug 2010 01:40:38 +0530 (IST) Message-ID: <16095.10.24.255.18.1282335038.squirrel@dbdmail.itg.ti.com> Date: Sat, 21 Aug 2010 01:40:38 +0530 (IST) Subject: [PATCH 03/10] [PM-WIP-MMC] OMAP2/OMAP3: Updating hwmod name for MMC controller From: "kishore kadiyala" To: linux-omap@vger.kernel.org Cc: khilman@deeprootsystems.com, tony@atomide.com, b-cousson@ti.com User-Agent: SquirrelMail/1.4.3a X-Mailer: SquirrelMail/1.4.3a MIME-Version: 1.0 X-Priority: 3 (Normal) Importance: Normal Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 20 Aug 2010 20:10:43 +0000 (UTC) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 6df1e52..5b0e171 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -756,7 +756,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, int idx = i - 1; l = snprintf(oh_name, MAX_OMAP_MMC_HWMOD_NAME_LEN, - "mmc%d_hwmod", i); + "mmc%d", i); WARN(l >= MAX_OMAP_MMC_HWMOD_NAME_LEN, "String buffer overflow in MMC%d device setup\n", i); oh = omap_hwmod_lookup(oh_name); diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index d342f58..2eb6868 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c @@ -440,7 +440,7 @@ static struct omap_hwmod_ocp_if *omap2430_mmc1_slaves[] = { }; static struct omap_hwmod omap2430_mmc1_hwmod = { - .name = "mmc1_hwmod", + .name = "mmc1", .mpu_irqs = mmc1_mpu_irqs, .mpu_irqs_cnt = ARRAY_SIZE(mmc1_mpu_irqs), .sdma_reqs = mmc1_sdma_reqs, @@ -488,7 +488,7 @@ static struct omap_hwmod_ocp_if *omap2430_mmc2_slaves[] = { }; static struct omap_hwmod omap2430_mmc2_hwmod = { - .name = "mmc2_hwmod", + .name = "mmc2", .mpu_irqs = mmc2_mpu_irqs, .mpu_irqs_cnt = ARRAY_SIZE(mmc2_mpu_irqs), .sdma_reqs = mmc2_sdma_reqs, diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 6412cc4..990638e 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -567,7 +567,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_mmc1_slaves[] = { }; static struct omap_hwmod omap3xxx_mmc1_hwmod = { - .name = "mmc1_hwmod", + .name = "mmc1", .mpu_irqs = mmc1_mpu_irqs, .mpu_irqs_cnt = ARRAY_SIZE(mmc1_mpu_irqs), .sdma_reqs = mmc1_sdma_reqs, @@ -615,7 +615,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_mmc2_slaves[] = { }; static struct omap_hwmod omap3xxx_mmc2_hwmod = { - .name = "mmc2_hwmod", + .name = "mmc2", .mpu_irqs = mmc2_mpu_irqs, .mpu_irqs_cnt = ARRAY_SIZE(mmc2_mpu_irqs), .sdma_reqs = mmc2_sdma_reqs, @@ -661,7 +661,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_mmc3_slaves[] = { }; static struct omap_hwmod omap3xxx_mmc3_hwmod = { - .name = "mmc3_hwmod", + .name = "mmc3", .mpu_irqs = mmc3_mpu_irqs, .mpu_irqs_cnt = ARRAY_SIZE(mmc3_mpu_irqs), .sdma_reqs = mmc3_sdma_reqs,