Hi Christopher,
On Tue, 2013-11-12 at 13:27 -0500, Christopher Covington wrote:
> Hi Ivan,
>
> On 11/12/2013 09:51 AM, Ivan T. Ivanov wrote:
> > From: "Ivan T. Ivanov" <iivanov@xxxxxxxxxx>
> >
> > This patch fix compilation error when driver is compiled
> > in multi-platform builds.
> >
> > drivers/built-in.o: In function `msm_otg_link_clk_reset':
> > ./drivers/usb/phy/phy-msm-usb.c:314: undefined reference to `clk_reset'
> > ./drivers/usb/phy/phy-msm-usb.c:318: undefined reference to `clk_reset'
> >
> > Use platform data supplied reset handlers and adjust error
> > messages reported when reset sequence fail.
> >
> > This is an intermediate step before adding support for reset
> > framework and newer targets.
> >
> > Signed-off-by: Ivan T. Ivanov <iivanov@xxxxxxxxxx>
> > Acked-by: David Brown <davidb@xxxxxxxxxxxxxx>
> > Cc: Daniel Walker <dwalker@xxxxxxxxxx>
> > Cc: Felipe Balbi <balbi@xxxxxx>
> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> > ---
> > arch/arm/mach-msm/board-msm7x30.c | 35 +++++++++++++++++++++++++++++++++++
> > arch/arm/mach-msm/board-qsd8x50.c | 35 +++++++++++++++++++++++++++++++++++
> > drivers/usb/phy/phy-msm-usb.c | 35 +++++++++++++++--------------------
> > include/linux/usb/msm_hsusb.h | 3 +++
> > 4 files changed, 88 insertions(+), 20 deletions(-)
> >
> > diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
> > index f9af5a4..46de789 100644
> > --- a/arch/arm/mach-msm/board-msm7x30.c
> > +++ b/arch/arm/mach-msm/board-msm7x30.c
> > @@ -30,6 +30,7 @@
> > #include <asm/memory.h>
> > #include <asm/setup.h>
> >
> > +#include <mach/clk.h>
> > #include <mach/msm_iomap.h>
> > #include <mach/dma.h>
> >
> > @@ -60,10 +61,44 @@ static int hsusb_phy_init_seq[] = {
> > -1
> > };
> >
> > +static int hsusb_link_clk_reset(struct clk *link_clk, bool assert)
> > +{
> > + int ret;
> > +
> > + if (assert) {
> > + ret = clk_reset(link_clk, CLK_RESET_ASSERT);
> > + if (ret)
> > + pr_err("usb hs_clk assert failed\n");
> > + } else {
> > + ret = clk_reset(link_clk, CLK_RESET_DEASSERT);
> > + if (ret)
> > + pr_err("usb hs_clk deassert failed\n");
> > + }
> > + return ret;
> > +}
> > +
> > +static int hsusb_phy_clk_reset(struct clk *phy_clk)
> > +{
> > + int ret;
> > +
> > + ret = clk_reset(phy_clk, CLK_RESET_ASSERT);
> > + if (ret) {
> > + pr_err("usb phy clk assert failed\n");
> > + return ret;
> > + }
> > + usleep_range(10000, 12000);
> > + ret = clk_reset(phy_clk, CLK_RESET_DEASSERT);
> > + if (ret)
> > + pr_err("usb phy clk deassert failed\n");
> > + return ret;
> > +}
> > +
> > static struct msm_otg_platform_data msm_otg_pdata = {
> > .phy_init_seq = hsusb_phy_init_seq,
> > .mode = USB_PERIPHERAL,
> > .otg_control = OTG_PHY_CONTROL,
> > + .link_clk_reset = hsusb_link_clk_reset,
> > + .phy_clk_reset = hsusb_phy_clk_reset,
> > };
> >
> > struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = {
> > diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
> > index 5f933bc..9169ec3 100644
> > --- a/arch/arm/mach-msm/board-qsd8x50.c
> > +++ b/arch/arm/mach-msm/board-qsd8x50.c
> > @@ -31,6 +31,7 @@
> > #include <mach/irqs.h>
> > #include <mach/sirc.h>
> > #include <mach/vreg.h>
> > +#include <mach/clk.h>
> > #include <linux/platform_data/mmc-msm_sdcc.h>
> >
> > #include "devices.h"
> > @@ -81,10 +82,44 @@ static int hsusb_phy_init_seq[] = {
> > -1
> > };
> >
> > +static int hsusb_link_clk_reset(struct clk *link_clk, bool assert)
> > +{
> > + int ret;
> > +
> > + if (assert) {
> > + ret = clk_reset(link_clk, CLK_RESET_ASSERT);
> > + if (ret)
> > + pr_err("usb hs_clk assert failed\n");
> > + } else {
> > + ret = clk_reset(link_clk, CLK_RESET_DEASSERT);
> > + if (ret)
> > + pr_err("usb hs_clk deassert failed\n");
> > + }
> > + return ret;
> > +}
> > +
> > +static int hsusb_phy_clk_reset(struct clk *phy_clk)
> > +{
> > + int ret;
> > +
> > + ret = clk_reset(phy_clk, CLK_RESET_ASSERT);
> > + if (ret) {
> > + pr_err("usb phy clk assert failed\n");
> > + return ret;
> > + }
> > + usleep_range(10000, 12000);
> > + ret = clk_reset(phy_clk, CLK_RESET_DEASSERT);
> > + if (ret)
> > + pr_err("usb phy clk deassert failed\n");
> > + return ret;
> > +}
>
> Why are there identical, static definitions of hsusb_link_clk_reset and
> hsusb_phy_clk_reset across the two board files? Why not share a single
> non-static set of definitions?
One file which is used by both boards and is compiled unconditionally
is clock.c, but I don't think that it will be appropriate to put USB
specific functions there. Creating new file for just these functions
also do not sound good to me.
Regards,
Ivan
>
> Thanks,
> Christopher
>
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
