| Message ID | 1359380879-26306-2-git-send-email-prabhakar.lad@ti.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On 1/28/2013 7:17 PM, Prabhakar Lad wrote: > From: Lad, Prabhakar <prabhakar.lad@ti.com> > > This patch removes the clock alias for mdio device and adds a entry > in clock lookup table, this entry can now be used by both DT and NON > DT case. > > Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Cc: davinci-linux-open-source@linux.davincidsp.com > Cc: netdev@vger.kernel.org > Cc: devicetree-discuss@lists.ozlabs.org > Cc: Sekhar Nori <nsekhar@ti.com> > Cc: Heiko Schocher <hs@denx.de> > --- > arch/arm/mach-davinci/da850.c | 1 + > arch/arm/mach-davinci/devices-da8xx.c | 8 ++------ > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c > index 86056ca..f74bfb6 100644 > --- a/arch/arm/mach-davinci/da850.c > +++ b/arch/arm/mach-davinci/da850.c > @@ -402,6 +402,7 @@ static struct clk_lookup da850_clks[] = { > CLK(NULL, "arm", &arm_clk), > CLK(NULL, "rmii", &rmii_clk), > CLK("davinci_emac.1", NULL, &emac_clk), > + CLK("davinci_mdio.0", "fck", &emac_clk), > CLK("davinci-mcasp.0", NULL, &mcasp_clk), > CLK("da8xx_lcdc.0", "fck", &lcdc_clk), > CLK("davinci_mmc.0", NULL, &mmcsd0_clk), > diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c > index 2d5502d..52faa05 100644 > --- a/arch/arm/mach-davinci/devices-da8xx.c > +++ b/arch/arm/mach-davinci/devices-da8xx.c > @@ -444,12 +444,8 @@ int __init da8xx_register_emac(void) > ret = platform_device_register(&da8xx_mdio_device); > if (ret < 0) > return ret; > - ret = platform_device_register(&da8xx_emac_device); > - if (ret < 0) > - return ret; > - ret = clk_add_alias(NULL, dev_name(&da8xx_mdio_device.dev), > - NULL, &da8xx_emac_device.dev); > - return ret; > + > + return platform_device_register(&da8xx_emac_device); You added the look-up only for DA850 which means after this patch da830 network will be broken. Did you test on DA830? Thanks, Sekhar
Sekhar, On Sun, Feb 3, 2013 at 4:44 PM, Sekhar Nori <nsekhar@ti.com> wrote: > On 1/28/2013 7:17 PM, Prabhakar Lad wrote: >> From: Lad, Prabhakar <prabhakar.lad@ti.com> >> >> This patch removes the clock alias for mdio device and adds a entry >> in clock lookup table, this entry can now be used by both DT and NON >> DT case. >> >> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com> >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linux-kernel@vger.kernel.org >> Cc: davinci-linux-open-source@linux.davincidsp.com >> Cc: netdev@vger.kernel.org >> Cc: devicetree-discuss@lists.ozlabs.org >> Cc: Sekhar Nori <nsekhar@ti.com> >> Cc: Heiko Schocher <hs@denx.de> >> --- >> arch/arm/mach-davinci/da850.c | 1 + >> arch/arm/mach-davinci/devices-da8xx.c | 8 ++------ >> 2 files changed, 3 insertions(+), 6 deletions(-) >> >> diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c >> index 86056ca..f74bfb6 100644 >> --- a/arch/arm/mach-davinci/da850.c >> +++ b/arch/arm/mach-davinci/da850.c >> @@ -402,6 +402,7 @@ static struct clk_lookup da850_clks[] = { >> CLK(NULL, "arm", &arm_clk), >> CLK(NULL, "rmii", &rmii_clk), >> CLK("davinci_emac.1", NULL, &emac_clk), >> + CLK("davinci_mdio.0", "fck", &emac_clk), >> CLK("davinci-mcasp.0", NULL, &mcasp_clk), >> CLK("da8xx_lcdc.0", "fck", &lcdc_clk), >> CLK("davinci_mmc.0", NULL, &mmcsd0_clk), >> diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c >> index 2d5502d..52faa05 100644 >> --- a/arch/arm/mach-davinci/devices-da8xx.c >> +++ b/arch/arm/mach-davinci/devices-da8xx.c >> @@ -444,12 +444,8 @@ int __init da8xx_register_emac(void) >> ret = platform_device_register(&da8xx_mdio_device); >> if (ret < 0) >> return ret; >> - ret = platform_device_register(&da8xx_emac_device); >> - if (ret < 0) >> - return ret; >> - ret = clk_add_alias(NULL, dev_name(&da8xx_mdio_device.dev), >> - NULL, &da8xx_emac_device.dev); >> - return ret; >> + >> + return platform_device_register(&da8xx_emac_device); > > You added the look-up only for DA850 which means after this patch da830 > network will be broken. Did you test on DA830? Ah yes my bad this will break network on da830, I'll fix it and respin this patch alone only, if there aren't any comments for the rest of the series. Regards, --Prabhakar > Thanks, > Sekhar
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 86056ca..f74bfb6 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -402,6 +402,7 @@ static struct clk_lookup da850_clks[] = { CLK(NULL, "arm", &arm_clk), CLK(NULL, "rmii", &rmii_clk), CLK("davinci_emac.1", NULL, &emac_clk), + CLK("davinci_mdio.0", "fck", &emac_clk), CLK("davinci-mcasp.0", NULL, &mcasp_clk), CLK("da8xx_lcdc.0", "fck", &lcdc_clk), CLK("davinci_mmc.0", NULL, &mmcsd0_clk), diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 2d5502d..52faa05 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -444,12 +444,8 @@ int __init da8xx_register_emac(void) ret = platform_device_register(&da8xx_mdio_device); if (ret < 0) return ret; - ret = platform_device_register(&da8xx_emac_device); - if (ret < 0) - return ret; - ret = clk_add_alias(NULL, dev_name(&da8xx_mdio_device.dev), - NULL, &da8xx_emac_device.dev); - return ret; + + return platform_device_register(&da8xx_emac_device); } static struct resource da830_mcasp1_resources[] = {