Message ID | 1312266042-28787-1-git-send-email-hs@denx.de |
---|---|
State | Accepted |
Commit | 1fa892c67baffd4b51170cfe9ca6d57ddf0eba60 |
Headers | show |
Hi, 2011/8/2 Heiko Schocher <hs@denx.de>: > Define CONFIG_DV_USBPHY_CTL for setting the USB PHY control > register. > Signed-off-by: Heiko Schocher <hs@denx.de> > cc: Sandeep Paulraj <s-paulraj@ti.com> > cc: Remy Bohmer <linux@bohmer.net> > --- > drivers/usb/musb/davinci.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c > index f56f2df..98c2c62 100644 > --- a/drivers/usb/musb/davinci.c > +++ b/drivers/usb/musb/davinci.c > @@ -26,6 +26,10 @@ > #include "davinci.h" > #include <asm/arch/hardware.h> > > +#if !defined(CONFIG_DV_USBPHY_CTL) > +#define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN) > +#endif > + > /* MUSB platform configuration */ > struct musb_config musb_cfg = { > .regs = (struct musb_regs *)MENTOR_USB0_BASE, > @@ -50,7 +54,7 @@ static u8 phy_on(void) > writel(USBPHY_PHY24MHZ | USBPHY_SESNDEN | > USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); > #else > - writel(USBPHY_SESNDEN | USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); > + writel(CONFIG_DV_USBPHY_CTL, USBPHY_CTL_PADDR); > #endif > timeout = musb_cfg.timeout; What does it fix, why do you want this? Kind regards, Remy
Hello Remy, Remy Bohmer wrote: > Hi, > > 2011/8/2 Heiko Schocher <hs@denx.de>: >> Define CONFIG_DV_USBPHY_CTL for setting the USB PHY control >> register. >> Signed-off-by: Heiko Schocher <hs@denx.de> >> cc: Sandeep Paulraj <s-paulraj@ti.com> >> cc: Remy Bohmer <linux@bohmer.net> >> --- >> drivers/usb/musb/davinci.c | 6 +++++- >> 1 files changed, 5 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c >> index f56f2df..98c2c62 100644 >> --- a/drivers/usb/musb/davinci.c >> +++ b/drivers/usb/musb/davinci.c >> @@ -26,6 +26,10 @@ >> #include "davinci.h" >> #include <asm/arch/hardware.h> >> >> +#if !defined(CONFIG_DV_USBPHY_CTL) >> +#define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN) >> +#endif >> + >> /* MUSB platform configuration */ >> struct musb_config musb_cfg = { >> .regs = (struct musb_regs *)MENTOR_USB0_BASE, >> @@ -50,7 +54,7 @@ static u8 phy_on(void) >> writel(USBPHY_PHY24MHZ | USBPHY_SESNDEN | >> USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); >> #else >> - writel(USBPHY_SESNDEN | USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); >> + writel(CONFIG_DV_USBPHY_CTL, USBPHY_CTL_PADDR); >> #endif >> timeout = musb_cfg.timeout; > > What does it fix, why do you want this? I posted the cam_enc_4xx board support. Now adding USB support, and I have to configure this register as: #define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN | \ USBPHY_PHY24MHZ) so I need a possibility to configure this register ... and I could not use DAVINCI_DM365EVM! (BTW: This define (so it seems to me) hides board specific code, which should be cleaned up ... Sandeep?) bye, Heiko
Hi all, Le 09/08/2011 07:05, Heiko Schocher a écrit : > Hello Remy, > > Remy Bohmer wrote: >> Hi, >> >> 2011/8/2 Heiko Schocher<hs@denx.de>: >>> Define CONFIG_DV_USBPHY_CTL for setting the USB PHY control >>> register. >>> Signed-off-by: Heiko Schocher<hs@denx.de> >>> cc: Sandeep Paulraj<s-paulraj@ti.com> >>> cc: Remy Bohmer<linux@bohmer.net> >>> --- >>> drivers/usb/musb/davinci.c | 6 +++++- >>> 1 files changed, 5 insertions(+), 1 deletions(-) >>> >>> diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c >>> index f56f2df..98c2c62 100644 >>> --- a/drivers/usb/musb/davinci.c >>> +++ b/drivers/usb/musb/davinci.c >>> @@ -26,6 +26,10 @@ >>> #include "davinci.h" >>> #include<asm/arch/hardware.h> >>> >>> +#if !defined(CONFIG_DV_USBPHY_CTL) >>> +#define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN) >>> +#endif >>> + >>> /* MUSB platform configuration */ >>> struct musb_config musb_cfg = { >>> .regs = (struct musb_regs *)MENTOR_USB0_BASE, >>> @@ -50,7 +54,7 @@ static u8 phy_on(void) >>> writel(USBPHY_PHY24MHZ | USBPHY_SESNDEN | >>> USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); >>> #else >>> - writel(USBPHY_SESNDEN | USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); >>> + writel(CONFIG_DV_USBPHY_CTL, USBPHY_CTL_PADDR); >>> #endif >>> timeout = musb_cfg.timeout; >> >> What does it fix, why do you want this? > > I posted the cam_enc_4xx board support. Now adding USB support, and I > have to configure this register as: > > #define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN | \ > USBPHY_PHY24MHZ) > > so I need a possibility to configure this register ... and I could not > use DAVINCI_DM365EVM! (BTW: This define (so it seems to me) hides > board specific code, which should be cleaned up ... Sandeep?) > > bye, > Heiko No new reply on this since early august... Personally, I'd rather this patch came in a patchset where some other patch uses it. Amicalement,
Hello Albert, Albert ARIBAUD wrote: > Hi all, > > Le 09/08/2011 07:05, Heiko Schocher a écrit : >> Hello Remy, >> >> Remy Bohmer wrote: >>> Hi, >>> >>> 2011/8/2 Heiko Schocher<hs@denx.de>: >>>> Define CONFIG_DV_USBPHY_CTL for setting the USB PHY control >>>> register. >>>> Signed-off-by: Heiko Schocher<hs@denx.de> >>>> cc: Sandeep Paulraj<s-paulraj@ti.com> >>>> cc: Remy Bohmer<linux@bohmer.net> >>>> --- >>>> drivers/usb/musb/davinci.c | 6 +++++- >>>> 1 files changed, 5 insertions(+), 1 deletions(-) >>>> >>>> diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c >>>> index f56f2df..98c2c62 100644 >>>> --- a/drivers/usb/musb/davinci.c >>>> +++ b/drivers/usb/musb/davinci.c >>>> @@ -26,6 +26,10 @@ >>>> #include "davinci.h" >>>> #include<asm/arch/hardware.h> >>>> >>>> +#if !defined(CONFIG_DV_USBPHY_CTL) >>>> +#define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN) >>>> +#endif >>>> + >>>> /* MUSB platform configuration */ >>>> struct musb_config musb_cfg = { >>>> .regs = (struct musb_regs *)MENTOR_USB0_BASE, >>>> @@ -50,7 +54,7 @@ static u8 phy_on(void) >>>> writel(USBPHY_PHY24MHZ | USBPHY_SESNDEN | >>>> USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); >>>> #else >>>> - writel(USBPHY_SESNDEN | USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); >>>> + writel(CONFIG_DV_USBPHY_CTL, USBPHY_CTL_PADDR); >>>> #endif >>>> timeout = musb_cfg.timeout; >>> >>> What does it fix, why do you want this? >> >> I posted the cam_enc_4xx board support. Now adding USB support, and I >> have to configure this register as: >> >> #define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN | \ >> USBPHY_PHY24MHZ) >> >> so I need a possibility to configure this register ... and I could not >> use DAVINCI_DM365EVM! (BTW: This define (so it seems to me) hides >> board specific code, which should be cleaned up ... Sandeep?) >> >> bye, >> Heiko > > No new reply on this since early august... Personally, I'd rather this > patch came in a patchset where some other patch uses it. Hmm.. Anyway I have to resend the cam_enc_4xx board port, as now the new SPL Framework is in mainline, and my post used the old one. Also I added in the meantime USB support for it, for which I needed this patch. But actually I am wating for a new HW, so I can't test it ... and then I post this patchset again with this patch in it! Can I add then your "Acked-by" for this patch? Thanks Heiko
Hi, > Hmm.. Anyway I have to resend the cam_enc_4xx board port, as now the new > SPL Framework is in mainline, and my post used the old one. Also > I added in the meantime USB support for it, for which I needed this patch. > But actually I am wating for a new HW, so I can't test it ... and then > I post this patchset again with this patch in it! Can I add then your > "Acked-by" for this patch? Acked-by: Remy Bohmer <linux@bohmer.net> Kind regards, Remy
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index f56f2df..98c2c62 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -26,6 +26,10 @@ #include "davinci.h" #include <asm/arch/hardware.h> +#if !defined(CONFIG_DV_USBPHY_CTL) +#define CONFIG_DV_USBPHY_CTL (USBPHY_SESNDEN | USBPHY_VBDTCTEN) +#endif + /* MUSB platform configuration */ struct musb_config musb_cfg = { .regs = (struct musb_regs *)MENTOR_USB0_BASE, @@ -50,7 +54,7 @@ static u8 phy_on(void) writel(USBPHY_PHY24MHZ | USBPHY_SESNDEN | USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); #else - writel(USBPHY_SESNDEN | USBPHY_VBDTCTEN, USBPHY_CTL_PADDR); + writel(CONFIG_DV_USBPHY_CTL, USBPHY_CTL_PADDR); #endif timeout = musb_cfg.timeout;
Define CONFIG_DV_USBPHY_CTL for setting the USB PHY control register. Signed-off-by: Heiko Schocher <hs@denx.de> cc: Sandeep Paulraj <s-paulraj@ti.com> cc: Remy Bohmer <linux@bohmer.net> --- drivers/usb/musb/davinci.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)