Am 21.12.2011 00:27, schrieb Ilya Yanok: > Rename EMAC clocks to match driver expectations: both davinci_emac and > davinci_mdio drivers call clk_get(dev, NULL) so we have to provide > ("davinci_emac", NULL) and ("davinci_mdio.0", NULL) clocks instead of > ("davinci_emac", "emac_clk") and ("davinci_emac", "phy_clk") resp. > > CC: Paul Walmsley <paul@xxxxxxxxx> > Signed-off-by: Ilya Yanok <yanok@xxxxxxxxxxx> > --- > arch/arm/mach-omap2/clock3xxx_data.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c > index d75e5f6..1a60661 100644 > --- a/arch/arm/mach-omap2/clock3xxx_data.c > +++ b/arch/arm/mach-omap2/clock3xxx_data.c > @@ -3465,8 +3465,8 @@ static struct omap_clk omap3xxx_clks[] = { > CLK(NULL, "ipss_ick", &ipss_ick, CK_AM35XX), > CLK(NULL, "rmii_ck", &rmii_ck, CK_AM35XX), > CLK(NULL, "pclk_ck", &pclk_ck, CK_AM35XX), > - CLK("davinci_emac", "emac_clk", &emac_ick, CK_AM35XX), > - CLK("davinci_emac", "phy_clk", &emac_fck, CK_AM35XX), > + CLK("davinci_emac", NULL, &emac_ick, CK_AM35XX), > + CLK("davinci_mdio.0", NULL, &emac_fck, CK_AM35XX), > CLK("vpfe-capture", "master", &vpfe_ick, CK_AM35XX), > CLK("vpfe-capture", "slave", &vpfe_fck, CK_AM35XX), > CLK("musb-am35x", "ick", &hsotgusb_ick_am35xx, CK_AM35XX), Tested-by: Yegor Yefremov <yegorslists@xxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html