| Message ID | 1302587472-20435-2-git-send-email-Hong-Xing.Zhu@freescale.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 12-04-2011 9:51, Richard Zhu wrote: > Signed-off-by: Richard Zhu<Hong-Xing.Zhu@freescale.com> > --- > arch/arm/mach-mx5/board-mx53_loco.c | 76 +++++++++++++++++++++++++++++++++++ > 1 files changed, 76 insertions(+), 0 deletions(-) > diff --git a/arch/arm/mach-mx5/board-mx53_loco.c b/arch/arm/mach-mx5/board-mx53_loco.c > index 0a18f8d..644aaa2 100644 > --- a/arch/arm/mach-mx5/board-mx53_loco.c > +++ b/arch/arm/mach-mx5/board-mx53_loco.c [...] > @@ -203,6 +206,78 @@ static const struct imxi2c_platform_data mx53_loco_i2c_data __initconst = { > .bitrate = 100000, > }; > > +/* HW Initialization, if return 0, initialization is successful. */ > +static int mx53_loco_sata_init(struct device *dev, void __iomem *addr) > +{ > + u32 tmpdata; > + int ret = 0; > + struct clk *clk; > + > + sata_clk = clk_get(dev, NULL); > + if (IS_ERR(sata_clk)) { > + dev_err(dev, "no sata clock.\n"); > + return PTR_ERR(sata_clk); > + } > + ret = clk_enable(sata_clk); > + if (ret) { > + dev_err(dev, "can't enable sata clock.\n"); > + clk_put(sata_clk); Why duplicate clk_put() which you already have at the end of function? Just define another label there. > + return ret; > + } > + > + /* FSL IMX AHCI SATA uses the internal usb phy1 clk on loco */ > + sata_ref_clk = clk_get(NULL, "usb_phy1"); > + if (IS_ERR(sata_ref_clk)) { > + dev_err(dev, "no sata ref clock.\n"); > + ret = PTR_ERR(sata_ref_clk); > + goto release_sata_clk; > + } > + ret = clk_enable(sata_ref_clk); > + if (ret) { > + dev_err(dev, "can't enable sata ref clock.\n"); > + clk_put(sata_ref_clk); Same question. > + goto release_sata_clk; > + } > + > + /* Get the AHB clock rate, and configure the TIMER1MS reg later */ > + clk = clk_get(NULL, "ahb"); > + if (IS_ERR(clk)) { > + dev_err(dev, "no ahb clock.\n"); > + ret = PTR_ERR(clk); > + goto release_sata_ref_clk; > + } > + tmpdata = clk_get_rate(clk) / 1000; > + clk_put(clk); > + > + sata_init(addr, tmpdata); > + > + return ret; > + > +release_sata_ref_clk: > + clk_disable(sata_ref_clk); > + clk_put(sata_ref_clk); > + > +release_sata_clk: > + clk_disable(sata_clk); > + clk_put(sata_clk); > + > + return ret; > +} WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Sergei: Got that. Thanks for your kindly comments. Would change them later. Best Regards Richard Zhu > -----Original Message----- > From: Sergei Shtylyov [mailto:sshtylyov@mvista.com] > Sent: Tuesday, April 12, 2011 7:28 PM > To: Zhu Richard-R65037 > Cc: linux-arm-kernel@lists.infradead.org; jgarzik@pobox.com; > kernel@pengutronix.de; linux-ide@vger.kernel.org; > avorontsov@ru.mvista.com; eric@eukrea.com; eric.miao@linaro.org > Subject: Re: [PATCH V4 2/2] MX53 Enable the AHCI SATA on MX53 LOCO > > Hello. > > On 12-04-2011 9:51, Richard Zhu wrote: > > > Signed-off-by: Richard Zhu<Hong-Xing.Zhu@freescale.com> > > --- > > arch/arm/mach-mx5/board-mx53_loco.c | 76 > +++++++++++++++++++++++++++++++++++ > > 1 files changed, 76 insertions(+), 0 deletions(-) > > > diff --git a/arch/arm/mach-mx5/board-mx53_loco.c > > b/arch/arm/mach-mx5/board-mx53_loco.c > > index 0a18f8d..644aaa2 100644 > > --- a/arch/arm/mach-mx5/board-mx53_loco.c > > +++ b/arch/arm/mach-mx5/board-mx53_loco.c > [...] > > @@ -203,6 +206,78 @@ static const struct imxi2c_platform_data > mx53_loco_i2c_data __initconst = { > > .bitrate = 100000, > > }; > > > > +/* HW Initialization, if return 0, initialization is successful. */ > > +static int mx53_loco_sata_init(struct device *dev, void __iomem > > +*addr) { > > + u32 tmpdata; > > + int ret = 0; > > + struct clk *clk; > > + > > + sata_clk = clk_get(dev, NULL); > > + if (IS_ERR(sata_clk)) { > > + dev_err(dev, "no sata clock.\n"); > > + return PTR_ERR(sata_clk); > > + } > > + ret = clk_enable(sata_clk); > > + if (ret) { > > + dev_err(dev, "can't enable sata clock.\n"); > > + clk_put(sata_clk); > > Why duplicate clk_put() which you already have at the end of function? > Just define another label there. > > > + return ret; > > + } > > + > > + /* FSL IMX AHCI SATA uses the internal usb phy1 clk on loco */ > > + sata_ref_clk = clk_get(NULL, "usb_phy1"); > > + if (IS_ERR(sata_ref_clk)) { > > + dev_err(dev, "no sata ref clock.\n"); > > + ret = PTR_ERR(sata_ref_clk); > > + goto release_sata_clk; > > + } > > + ret = clk_enable(sata_ref_clk); > > + if (ret) { > > + dev_err(dev, "can't enable sata ref clock.\n"); > > + clk_put(sata_ref_clk); > > Same question. > > > + goto release_sata_clk; > > + } > > + > > + /* Get the AHB clock rate, and configure the TIMER1MS reg later */ > > + clk = clk_get(NULL, "ahb"); > > + if (IS_ERR(clk)) { > > + dev_err(dev, "no ahb clock.\n"); > > + ret = PTR_ERR(clk); > > + goto release_sata_ref_clk; > > + } > > + tmpdata = clk_get_rate(clk) / 1000; > > + clk_put(clk); > > + > > + sata_init(addr, tmpdata); > > + > > + return ret; > > + > > +release_sata_ref_clk: > > + clk_disable(sata_ref_clk); > > + clk_put(sata_ref_clk); > > + > > +release_sata_clk: > > + clk_disable(sata_clk); > > + clk_put(sata_clk); > > + > > + return ret; > > +} > > WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-mx5/board-mx53_loco.c b/arch/arm/mach-mx5/board-mx53_loco.c index 0a18f8d..644aaa2 100644 --- a/arch/arm/mach-mx5/board-mx53_loco.c +++ b/arch/arm/mach-mx5/board-mx53_loco.c @@ -28,6 +28,7 @@ #include <mach/hardware.h> #include <mach/imx-uart.h> #include <mach/iomux-mx53.h> +#include <mach/ahci_sata.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -38,6 +39,8 @@ #define LOCO_FEC_PHY_RST IMX_GPIO_NR(7, 6) +static struct clk *sata_clk, *sata_ref_clk; + static iomux_v3_cfg_t mx53_loco_pads[] = { /* FEC */ MX53_PAD_FEC_MDC__FEC_MDC, @@ -203,6 +206,78 @@ static const struct imxi2c_platform_data mx53_loco_i2c_data __initconst = { .bitrate = 100000, }; +/* HW Initialization, if return 0, initialization is successful. */ +static int mx53_loco_sata_init(struct device *dev, void __iomem *addr) +{ + u32 tmpdata; + int ret = 0; + struct clk *clk; + + sata_clk = clk_get(dev, NULL); + if (IS_ERR(sata_clk)) { + dev_err(dev, "no sata clock.\n"); + return PTR_ERR(sata_clk); + } + ret = clk_enable(sata_clk); + if (ret) { + dev_err(dev, "can't enable sata clock.\n"); + clk_put(sata_clk); + return ret; + } + + /* FSL IMX AHCI SATA uses the internal usb phy1 clk on loco */ + sata_ref_clk = clk_get(NULL, "usb_phy1"); + if (IS_ERR(sata_ref_clk)) { + dev_err(dev, "no sata ref clock.\n"); + ret = PTR_ERR(sata_ref_clk); + goto release_sata_clk; + } + ret = clk_enable(sata_ref_clk); + if (ret) { + dev_err(dev, "can't enable sata ref clock.\n"); + clk_put(sata_ref_clk); + goto release_sata_clk; + } + + /* Get the AHB clock rate, and configure the TIMER1MS reg later */ + clk = clk_get(NULL, "ahb"); + if (IS_ERR(clk)) { + dev_err(dev, "no ahb clock.\n"); + ret = PTR_ERR(clk); + goto release_sata_ref_clk; + } + tmpdata = clk_get_rate(clk) / 1000; + clk_put(clk); + + sata_init(addr, tmpdata); + + return ret; + +release_sata_ref_clk: + clk_disable(sata_ref_clk); + clk_put(sata_ref_clk); + +release_sata_clk: + clk_disable(sata_clk); + clk_put(sata_clk); + + return ret; +} + +static void mx53_loco_sata_exit(struct device *dev) +{ + clk_disable(sata_ref_clk); + clk_put(sata_ref_clk); + + clk_disable(sata_clk); + clk_put(sata_clk); +} + +static struct ahci_platform_data sata_data = { + .init = mx53_loco_sata_init, + .exit = mx53_loco_sata_exit, +}; + static void __init mx53_loco_board_init(void) { mxc_iomux_v3_setup_multiple_pads(mx53_loco_pads, @@ -215,6 +290,7 @@ static void __init mx53_loco_board_init(void) imx53_add_imx_i2c(1, &mx53_loco_i2c_data); imx53_add_sdhci_esdhc_imx(0, NULL); imx53_add_sdhci_esdhc_imx(2, NULL); + imx53_add_ahci(0, &sata_data); } static void __init mx53_loco_timer_init(void)
Signed-off-by: Richard Zhu <Hong-Xing.Zhu@freescale.com> --- arch/arm/mach-mx5/board-mx53_loco.c | 76 +++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-)