| Message ID | 1459799985-10665-1-git-send-email-srae@broadcom.com |
|---|---|
| State | Accepted |
| Commit | cf1254738537b24308699a4ea0081e52723933b0 |
| Delegated to: | Marek Vasut |
| Headers | show |
On 04/04/2016 09:59 PM, Steve Rae wrote: > Turn on the USB OTG clocks. > > Signed-off-by: Steve Rae <srae@broadcom.com> > --- > > drivers/usb/gadget/bcm_udc_otg_phy.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c > index 10b2e13..877f162 100644 > --- a/drivers/usb/gadget/bcm_udc_otg_phy.c > +++ b/drivers/usb/gadget/bcm_udc_otg_phy.c > @@ -8,12 +8,16 @@ > #include <common.h> > #include <asm/io.h> > #include <asm/arch/sysmap.h> > +#include <asm/kona-common/clk.h> > > #include "dwc2_udc_otg_priv.h" > #include "bcm_udc_otg.h" > > void otg_phy_init(struct dwc2_udc *dev) > { > + /* turn on the USB OTG clocks */ > + clk_usb_otg_enable((void *)HSOTG_BASE_ADDR); I _think_ this driver is used on RPi too, did you compile test it there? > /* set Phy to driving mode */ > wfld_clear(HSOTG_CTRL_BASE_ADDR + HSOTG_CTRL_PHY_P1CTL_OFFSET, > HSOTG_CTRL_PHY_P1CTL_NON_DRIVING_MASK); >
Hi Marek, On Mon, Apr 4, 2016 at 1:02 PM, Marek Vasut <marex@denx.de> wrote: > > On 04/04/2016 09:59 PM, Steve Rae wrote: > > Turn on the USB OTG clocks. > > > > Signed-off-by: Steve Rae <srae@broadcom.com> > > --- > > > > drivers/usb/gadget/bcm_udc_otg_phy.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c > > index 10b2e13..877f162 100644 > > --- a/drivers/usb/gadget/bcm_udc_otg_phy.c > > +++ b/drivers/usb/gadget/bcm_udc_otg_phy.c > > @@ -8,12 +8,16 @@ > > #include <common.h> > > #include <asm/io.h> > > #include <asm/arch/sysmap.h> > > +#include <asm/kona-common/clk.h> > > > > #include "dwc2_udc_otg_priv.h" > > #include "bcm_udc_otg.h" > > > > void otg_phy_init(struct dwc2_udc *dev) > > { > > + /* turn on the USB OTG clocks */ > > + clk_usb_otg_enable((void *)HSOTG_BASE_ADDR); > > I _think_ this driver is used on RPi too, did you compile test it there? no, it is not - the only place this is used is: drivers/usb/gadget/Makefile:obj-$(CONFIG_USB_GADGET_BCM_UDC_OTG_PHY) += bcm_udc_otg_phy.o include/configs/bcm28155_ap.h:#define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY Thanks, Steve PS. "rpi" and "rpi_2" both build successfully.... > > > > /* set Phy to driving mode */ > > wfld_clear(HSOTG_CTRL_BASE_ADDR + HSOTG_CTRL_PHY_P1CTL_OFFSET, > > HSOTG_CTRL_PHY_P1CTL_NON_DRIVING_MASK); > > > > > -- > Best regards, > Marek Vasut
On 04/04/2016 10:30 PM, Steve Rae wrote: > Hi Marek, > > On Mon, Apr 4, 2016 at 1:02 PM, Marek Vasut <marex@denx.de> wrote: >> >> On 04/04/2016 09:59 PM, Steve Rae wrote: >>> Turn on the USB OTG clocks. >>> >>> Signed-off-by: Steve Rae <srae@broadcom.com> >>> --- >>> >>> drivers/usb/gadget/bcm_udc_otg_phy.c | 4 ++++ >>> 1 file changed, 4 insertions(+) >>> >>> diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c >>> index 10b2e13..877f162 100644 >>> --- a/drivers/usb/gadget/bcm_udc_otg_phy.c >>> +++ b/drivers/usb/gadget/bcm_udc_otg_phy.c >>> @@ -8,12 +8,16 @@ >>> #include <common.h> >>> #include <asm/io.h> >>> #include <asm/arch/sysmap.h> >>> +#include <asm/kona-common/clk.h> >>> >>> #include "dwc2_udc_otg_priv.h" >>> #include "bcm_udc_otg.h" >>> >>> void otg_phy_init(struct dwc2_udc *dev) >>> { >>> + /* turn on the USB OTG clocks */ >>> + clk_usb_otg_enable((void *)HSOTG_BASE_ADDR); >> >> I _think_ this driver is used on RPi too, did you compile test it there? > > no, it is not - the only place this is used is: > drivers/usb/gadget/Makefile:obj-$(CONFIG_USB_GADGET_BCM_UDC_OTG_PHY) > += bcm_udc_otg_phy.o > include/configs/bcm28155_ap.h:#define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY Got it, thanks for checking. Do you want me to pick this up via u-boot-usb or shall this go via some other tree as a series ? > Thanks, Steve > PS. > "rpi" and "rpi_2" both build successfully.... > >> >> >>> /* set Phy to driving mode */ >>> wfld_clear(HSOTG_CTRL_BASE_ADDR + HSOTG_CTRL_PHY_P1CTL_OFFSET, >>> HSOTG_CTRL_PHY_P1CTL_NON_DRIVING_MASK); >>> >> >> >> -- >> Best regards, >> Marek Vasut
On Apr 5, 2016 3:08 PM, "Marek Vasut" <marex@denx.de> wrote: > > On 04/04/2016 10:30 PM, Steve Rae wrote: > > Hi Marek, > > > > On Mon, Apr 4, 2016 at 1:02 PM, Marek Vasut <marex@denx.de> wrote: > >> > >> On 04/04/2016 09:59 PM, Steve Rae wrote: > >>> Turn on the USB OTG clocks. > >>> > >>> Signed-off-by: Steve Rae <srae@broadcom.com> > >>> --- > >>> > >>> drivers/usb/gadget/bcm_udc_otg_phy.c | 4 ++++ > >>> 1 file changed, 4 insertions(+) > >>> > >>> diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c > >>> index 10b2e13..877f162 100644 > >>> --- a/drivers/usb/gadget/bcm_udc_otg_phy.c > >>> +++ b/drivers/usb/gadget/bcm_udc_otg_phy.c > >>> @@ -8,12 +8,16 @@ > >>> #include <common.h> > >>> #include <asm/io.h> > >>> #include <asm/arch/sysmap.h> > >>> +#include <asm/kona-common/clk.h> > >>> > >>> #include "dwc2_udc_otg_priv.h" > >>> #include "bcm_udc_otg.h" > >>> > >>> void otg_phy_init(struct dwc2_udc *dev) > >>> { > >>> + /* turn on the USB OTG clocks */ > >>> + clk_usb_otg_enable((void *)HSOTG_BASE_ADDR); > >> > >> I _think_ this driver is used on RPi too, did you compile test it there? > > > > no, it is not - the only place this is used is: > > drivers/usb/gadget/Makefile:obj-$(CONFIG_USB_GADGET_BCM_UDC_OTG_PHY) > > += bcm_udc_otg_phy.o > > include/configs/bcm28155_ap.h:#define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY > > Got it, thanks for checking. > > Do you want me to pick this up via u-boot-usb or shall this go via some > other tree as a series ? > I don't have any preference - what is the best way to get my outstanding patches applied? Thanks, Steve > > Thanks, Steve > > PS. > > "rpi" and "rpi_2" both build successfully.... > > > >> > >> > >>> /* set Phy to driving mode */ > >>> wfld_clear(HSOTG_CTRL_BASE_ADDR + HSOTG_CTRL_PHY_P1CTL_OFFSET, > >>> HSOTG_CTRL_PHY_P1CTL_NON_DRIVING_MASK); > >>> > >> > >> > >> -- > >> Best regards, > >> Marek Vasut > > > -- > Best regards, > Marek Vasut
On 04/06/2016 07:20 AM, Steve Rae wrote: > > On Apr 5, 2016 3:08 PM, "Marek Vasut" <marex@denx.de > <mailto:marex@denx.de>> wrote: >> >> On 04/04/2016 10:30 PM, Steve Rae wrote: >> > Hi Marek, >> > >> > On Mon, Apr 4, 2016 at 1:02 PM, Marek Vasut <marex@denx.de > <mailto:marex@denx.de>> wrote: >> >> >> >> On 04/04/2016 09:59 PM, Steve Rae wrote: >> >>> Turn on the USB OTG clocks. >> >>> >> >>> Signed-off-by: Steve Rae <srae@broadcom.com > <mailto:srae@broadcom.com>> >> >>> --- >> >>> >> >>> drivers/usb/gadget/bcm_udc_otg_phy.c | 4 ++++ >> >>> 1 file changed, 4 insertions(+) >> >>> >> >>> diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c > b/drivers/usb/gadget/bcm_udc_otg_phy.c >> >>> index 10b2e13..877f162 100644 >> >>> --- a/drivers/usb/gadget/bcm_udc_otg_phy.c >> >>> +++ b/drivers/usb/gadget/bcm_udc_otg_phy.c >> >>> @@ -8,12 +8,16 @@ >> >>> #include <common.h> >> >>> #include <asm/io.h> >> >>> #include <asm/arch/sysmap.h> >> >>> +#include <asm/kona-common/clk.h> >> >>> >> >>> #include "dwc2_udc_otg_priv.h" >> >>> #include "bcm_udc_otg.h" >> >>> >> >>> void otg_phy_init(struct dwc2_udc *dev) >> >>> { >> >>> + /* turn on the USB OTG clocks */ >> >>> + clk_usb_otg_enable((void *)HSOTG_BASE_ADDR); >> >> >> >> I _think_ this driver is used on RPi too, did you compile test it > there? >> > >> > no, it is not - the only place this is used is: >> > drivers/usb/gadget/Makefile:obj-$(CONFIG_USB_GADGET_BCM_UDC_OTG_PHY) >> > += bcm_udc_otg_phy.o >> > include/configs/bcm28155_ap.h:#define > CONFIG_USB_GADGET_BCM_UDC_OTG_PHY >> >> Got it, thanks for checking. >> >> Do you want me to pick this up via u-boot-usb or shall this go via some >> other tree as a series ? >> > I don't have any preference - what is the best way to get my outstanding > patches applied? Since the other two patches are quite unrelated, I will just pick this one and let the bcm maintainer pick the rest. Best regards, Marek Vasut
diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c index 10b2e13..877f162 100644 --- a/drivers/usb/gadget/bcm_udc_otg_phy.c +++ b/drivers/usb/gadget/bcm_udc_otg_phy.c @@ -8,12 +8,16 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/sysmap.h> +#include <asm/kona-common/clk.h> #include "dwc2_udc_otg_priv.h" #include "bcm_udc_otg.h" void otg_phy_init(struct dwc2_udc *dev) { + /* turn on the USB OTG clocks */ + clk_usb_otg_enable((void *)HSOTG_BASE_ADDR); + /* set Phy to driving mode */ wfld_clear(HSOTG_CTRL_BASE_ADDR + HSOTG_CTRL_PHY_P1CTL_OFFSET, HSOTG_CTRL_PHY_P1CTL_NON_DRIVING_MASK);
Turn on the USB OTG clocks. Signed-off-by: Steve Rae <srae@broadcom.com> --- drivers/usb/gadget/bcm_udc_otg_phy.c | 4 ++++ 1 file changed, 4 insertions(+)