From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [PATCH 1/6] OMAP2: hwmod: Fix MMC hwmod structs for 2430 Date: Tue, 23 Feb 2010 10:42:03 -0800 Message-ID: <87aauzztdw.fsf@deeprootsystems.com> References: <1266582437-22398-1-git-send-email-rnayak@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-fx0-f219.google.com ([209.85.220.219]:55743 "EHLO mail-fx0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753480Ab0BWSmX (ORCPT ); Tue, 23 Feb 2010 13:42:23 -0500 Received: by fxm19 with SMTP id 19so4141439fxm.21 for ; Tue, 23 Feb 2010 10:42:21 -0800 (PST) In-Reply-To: <1266582437-22398-1-git-send-email-rnayak@ti.com> (Rajendra Nayak's message of "Fri\, 19 Feb 2010 17\:57\:12 +0530") Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Rajendra Nayak Cc: linux-omap@vger.kernel.org Rajendra Nayak writes: > The existing MMC hwmod structs for 2430 are fixed based > on the changes in hwmod framework structurs. > > Signed-off-by: Rajendra Nayak Thanks, I'll fold this into the MMC hwmods in the pm-wip/hwmods branch. Kevin > --- > arch/arm/mach-omap2/omap_hwmod_2430.h | 26 +++++++++++++++----------- > 1 files changed, 15 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_2430.h b/arch/arm/mach-omap2/omap_hwmod_2430.h > index 0b6ca6f..2898749 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_2430.h > +++ b/arch/arm/mach-omap2/omap_hwmod_2430.h > @@ -21,7 +21,7 @@ > #include > #include > > -#include > +#include > > #include "cm-regbits-24xx.h" > #include "prm-regbits-24xx.h" > @@ -87,7 +87,8 @@ static struct omap_hwmod_addr_space omap2430_mmc1_addr_space[] = { > static struct omap_hwmod_ocp_if omap2430_l4_core__mmc1 = { > .master = &omap2430_l4_core_hwmod, > .slave = &omap2430_mmc1_hwmod, > - .interface_clk = { .name = "mmchs1_ick" }, > + .clkdev_dev_id = "mmci-omap-hs.0", > + .clkdev_con_id = "ick", > .addr = omap2430_mmc1_addr_space, > .addr_cnt = ARRAY_SIZE(omap2430_mmc1_addr_space), > .user = OCP_USER_MPU | OCP_USER_SDMA, > @@ -105,7 +106,8 @@ static struct omap_hwmod_addr_space omap2430_mmc2_addr_space[] = { > static struct omap_hwmod_ocp_if omap2430_l4_core__mmc2 = { > .master = &omap2430_l4_core_hwmod, > .slave = &omap2430_mmc2_hwmod, > - .interface_clk = { .name = "mmchs2_ick" }, > + .clkdev_dev_id = "mmci-omap-hs.1", > + .clkdev_con_id = "ick", > .addr = omap2430_mmc2_addr_space, > .addr_cnt = ARRAY_SIZE(omap2430_mmc2_addr_space), > .user = OCP_USER_MPU | OCP_USER_SDMA, > @@ -185,8 +187,8 @@ static struct mmc_dev_attr mmc1_dev_attr = { > .flags = MMC_INTERNAL_XCVR, > }; > > -static u8 mmc1_mpu_irqs[] = { > - INT_24XX_MMC_IRQ, > +static struct omap_hwmod_irq_info mmc1_mpu_irqs[] = { > + { .irq = INT_24XX_MMC_IRQ, }, > }; > > static struct omap_hwmod_dma_info mmc1_sdma_chs[] = { > @@ -195,7 +197,7 @@ static struct omap_hwmod_dma_info mmc1_sdma_chs[] = { > }; > > static struct omap_hwmod_opt_clk mmc1_opt_clks[] = { > - { .role = "dbck", .clk = { .name = "mmchsdb1_fck" } }, > + { .clkdev_dev_id = "mmci-omap-hs.0", .clkdev_con_id = "mmchsdb_fck" }, > }; > > static struct omap_hwmod_ocp_if *omap2430_mmc1_slaves[] = { > @@ -210,7 +212,8 @@ static struct omap_hwmod omap2430_mmc1_hwmod = { > .sdma_chs_cnt = ARRAY_SIZE(mmc1_sdma_chs), > .opt_clks = mmc1_opt_clks, > .opt_clks_cnt = ARRAY_SIZE(mmc1_opt_clks), > - .main_clk = { .name = "mmchs1_fck" }, > + .clkdev_dev_id = "mmci-omap-hs.0", > + .clkdev_con_id = "fck", > .prcm = { > .omap2 = { > .prcm_reg_id = 2, > @@ -230,8 +233,8 @@ static struct mmc_dev_attr mmc2_dev_attr = { > .flags = MMC_SUPPORTS_EXTERNAL_XCVR, > }; > > -static u8 mmc2_mpu_irqs[] = { > - INT_24XX_MMC2_IRQ, > +static struct omap_hwmod_irq_info mmc2_mpu_irqs[] = { > + { .irq = INT_24XX_MMC2_IRQ, }, > }; > > static struct omap_hwmod_dma_info mmc2_sdma_chs[] = { > @@ -240,7 +243,7 @@ static struct omap_hwmod_dma_info mmc2_sdma_chs[] = { > }; > > static struct omap_hwmod_opt_clk mmc2_opt_clks[] = { > - { .role = "dbck", .clk = { .name = "mmchsdb2_fck" } }, > + { .clkdev_dev_id = "mmci-omap-hs.1", .clkdev_con_id = "mmchsdb_fck" }, > }; > > static struct omap_hwmod_ocp_if *omap2430_mmc2_slaves[] = { > @@ -255,7 +258,8 @@ static struct omap_hwmod omap2430_mmc2_hwmod = { > .sdma_chs_cnt = ARRAY_SIZE(mmc2_sdma_chs), > .opt_clks = mmc2_opt_clks, > .opt_clks_cnt = ARRAY_SIZE(mmc2_opt_clks), > - .main_clk = { .name = "mmchs2_fck" }, > + .clkdev_dev_id = "mmci-omap-hs.1", > + .clkdev_con_id = "fck", > .prcm = { > .omap2 = { > .prcm_reg_id = 2, > -- > 1.5.4.7 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html