From patchwork Wed Oct 6 11:14:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Senthilvadivu Guruswamy X-Patchwork-Id: 235701 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o96BFms8017482 for ; Wed, 6 Oct 2010 11:15:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758884Ab0JFLPW (ORCPT ); Wed, 6 Oct 2010 07:15:22 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:60260 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758876Ab0JFLPP (ORCPT ); Wed, 6 Oct 2010 07:15:15 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o96BF6Yj009660 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 6 Oct 2010 06:15:08 -0500 Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o96BF4ip029517; Wed, 6 Oct 2010 16:45:04 +0530 (IST) Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by linfarm476.india.ti.com (8.12.11/8.12.11) with ESMTP id o96BF3OF010346; Wed, 6 Oct 2010 16:45:03 +0530 Received: (from a0876342@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id o96BF34n010344; Wed, 6 Oct 2010 16:45:03 +0530 From: Guruswamy Senthilvadivu To: khilman@deeprootsystems.com, tomi.valkeinen@nokia.com, paul@pwsan.com, hvaibhav@ti.com, linux-omap@vger.kernel.org Cc: Senthilvadivu Guruswamy Subject: [PATCH v1 04/16] OMAP3: hwmod data: change dss_hwmod to dss_dss_hwmod Date: Wed, 6 Oct 2010 16:44:47 +0530 Message-Id: <1286363699-9614-5-git-send-email-svadivu@ti.com> X-Mailer: git-send-email 1.5.6.6 In-Reply-To: <1286363699-9614-4-git-send-email-svadivu@ti.com> References: <1286363699-9614-1-git-send-email-svadivu@ti.com> <1286363699-9614-2-git-send-email-svadivu@ti.com> <1286363699-9614-3-git-send-email-svadivu@ti.com> <1286363699-9614-4-git-send-email-svadivu@ti.com> 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 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Oct 2010 11:15:49 +0000 (UTC) diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 7df341f..21fb9eb 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -32,7 +32,7 @@ * elsewhere. */ -static struct omap_hwmod omap3xxx_dss_hwmod; +static struct omap_hwmod omap3xxx_dss_dss_hwmod; static struct omap_hwmod omap3xxx_dss_dispc_hwmod; static struct omap_hwmod omap3xxx_dss_dsi1_hwmod; static struct omap_hwmod omap3xxx_dss_rfbi_hwmod; @@ -66,7 +66,7 @@ static struct omap_hwmod_ocp_if omap3xxx_mpu__l3_main = { /* DSS -> l3 */ static struct omap_hwmod_ocp_if omap3xxx_dss__l3 = { - .master = &omap3xxx_dss_hwmod, + .master = &omap3xxx_dss_dss_hwmod, .slave = &omap3xxx_l3_main_hwmod, .user = OCP_USER_MPU | OCP_USER_SDMA, }; @@ -255,7 +255,7 @@ static struct omap_hwmod_addr_space omap3xxx_dss_addrs[] = { /* l4_core -> dss */ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss = { .master = &omap3xxx_l4_core_hwmod, - .slave = &omap3xxx_dss_hwmod, + .slave = &omap3xxx_dss_dss_hwmod, .clk = "dss_ick", .addr = omap3xxx_dss_addrs, .addr_cnt = ARRAY_SIZE(omap3xxx_dss_addrs), @@ -273,8 +273,8 @@ static struct omap_hwmod_opt_clk dss_opt_clks[] = { { .role = "sys_clk", .clk = "dss2_alwon_fck" }, }; -static struct omap_hwmod omap3xxx_dss_hwmod = { - .name = "dss", +static struct omap_hwmod omap3xxx_dss_dss_hwmod = { + .name = "dss_dss", .class = &omap3xxx_dss_hwmod_class, .main_clk = "dss1_alwon_fck", /* instead of dss_fck */ .mpu_irqs = omap3xxx_dss_irqs, @@ -532,7 +532,7 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { &omap3xxx_l4_wkup_hwmod, &omap3xxx_mpu_hwmod, &omap3xxx_iva_hwmod, - &omap3xxx_dss_hwmod, + &omap3xxx_dss_dss_hwmod, &omap3xxx_dss_dispc_hwmod, &omap3xxx_dss_dsi1_hwmod, &omap3xxx_dss_rfbi_hwmod,