| Message ID | 1444731726-5328-3-git-send-email-yoshihiro.shimoda.uh@renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi, On Tuesday 13 October 2015 03:52 PM, Yoshihiro Shimoda wrote: > To use the channel 0 of R-Car gen3 as periperal mode, This patch changes > the mode to OTG instead of HOST. Then, this driver needs to set some > registers to enable host mode and detects ID pin and VBUS pin at > phy_init() timing. > > For now, the channel 0 can be used as host mode only. > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > --- > drivers/phy/phy-rcar-gen3-usb2.c | 126 ++++++++++++++++++++++++++++++++++++++- > 1 file changed, 124 insertions(+), 2 deletions(-) > > diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c > index d90dfcf..03d7079 100644 > --- a/drivers/phy/phy-rcar-gen3-usb2.c > +++ b/drivers/phy/phy-rcar-gen3-usb2.c > @@ -25,6 +25,10 @@ > #define USB2_USBCTR 0x00c > #define USB2_SPD_RSM_TIMSET 0x10c > #define USB2_OC_TIMSET 0x110 > +#define USB2_COMMCTRL 0x600 > +#define USB2_VBCTRL 0x60c > +#define USB2_LINECTRL1 0x610 > +#define USB2_ADPCTRL 0x630 > > /* INT_ENABLE */ > #define USB2_INT_ENABLE_USBH_INTB_EN BIT(2) > @@ -42,6 +46,24 @@ > /* OC_TIMSET */ > #define USB2_OC_TIMSET_INIT 0x000209ab > > +/* COMMCTRL */ > +#define USB2_COMMCTRL_OTG_PERI BIT(31) /* 1 = Peripheral mode */ > + > +/* VBCTRL */ > +#define USB2_VBCTRL_DRVVBUSSEL BIT(8) > + > +/* LINECTRL1 */ > +#define USB2_LINECTRL1_DPRPD_EN BIT(19) > +#define USB2_LINECTRL1_DP_RPD BIT(18) > +#define USB2_LINECTRL1_DMRPD_EN BIT(17) > +#define USB2_LINECTRL1_DM_RPD BIT(16) > + > +/* ADPCTRL */ > +#define USB2_ADPCTRL_OTGSESSVLD BIT(20) > +#define USB2_ADPCTRL_IDDIG BIT(19) > +#define USB2_ADPCTRL_IDPULLUP BIT(5) /* 1 = ID sampling is enabled */ > +#define USB2_ADPCTRL_DRVVBUS BIT(4) > + > /******* HSUSB registers (original offset is +0x100) *******/ > #define HSUSB_LPSTS 0x02 > #define HSUSB_UGCTRL2 0x84 > @@ -68,6 +90,104 @@ struct rcar_gen3_chan { > spinlock_t lock; > }; > > +static void rcar_gen3_set_host_mode(struct rcar_gen3_chan *ch, int host) > +{ > + void __iomem *usb2_base = ch->usb2.base; > + u32 tmp = readl(usb2_base + USB2_COMMCTRL); It's your preference but I'd like to have something like val instead of tmp. > + > + dev_dbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, tmp, host); This shoulod be dev_vdbg. > + if (host) > + tmp &= ~USB2_COMMCTRL_OTG_PERI; > + else > + tmp |= USB2_COMMCTRL_OTG_PERI; > + writel(tmp, usb2_base + USB2_COMMCTRL); > +} > + > +static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm) > +{ > + void __iomem *usb2_base = ch->usb2.base; > + u32 tmp = readl(usb2_base + USB2_LINECTRL1); > + > + dev_dbg(&ch->phy->dev, "%s: %08x, %d, %d\n", __func__, tmp, dp, dm); same here. > + tmp &= ~(USB2_LINECTRL1_DP_RPD | USB2_LINECTRL1_DM_RPD); > + if (dp) > + tmp |= USB2_LINECTRL1_DP_RPD; > + if (dm) > + tmp |= USB2_LINECTRL1_DM_RPD; > + writel(tmp, usb2_base + USB2_LINECTRL1); > +} > + > +static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus) > +{ > + void __iomem *usb2_base = ch->usb2.base; > + u32 tmp = readl(usb2_base + USB2_ADPCTRL); > + > + dev_dbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, tmp, vbus); here too. > + if (vbus) > + tmp |= USB2_ADPCTRL_DRVVBUS; > + else > + tmp &= ~USB2_ADPCTRL_DRVVBUS; > + writel(tmp, usb2_base + USB2_ADPCTRL); > +} > + > +static void rcar_gen3_init_for_host(struct rcar_gen3_chan *ch) > +{ > + rcar_gen3_set_linectrl(ch, 1, 1); > + rcar_gen3_set_host_mode(ch, 1); > + rcar_gen3_enable_vbus_ctrl(ch, 1); > +} > + > +static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch) > +{ > + rcar_gen3_set_linectrl(ch, 0, 1); > + rcar_gen3_set_host_mode(ch, 0); > + rcar_gen3_enable_vbus_ctrl(ch, 0); > +} > + > +static bool rcar_gen3_check_vbus(struct rcar_gen3_chan *ch) > +{ > + return !!(readl(ch->usb2.base + USB2_ADPCTRL) & > + USB2_ADPCTRL_OTGSESSVLD); > +} > + > +static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch) > +{ > + return !!(readl(ch->usb2.base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG); > +} > + > +static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch) > +{ > + bool is_host = true; > + > + if (rcar_gen3_check_id(ch)) { > + /* B-device? */ > + if (rcar_gen3_check_vbus(ch)) This can be rcar_gen3_check_id(ch) && rcar_gen3_check_vbus(ch) no? Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, > Sent: Saturday, October 17, 2015 10:48 AM > > Hi, > > On Tuesday 13 October 2015 03:52 PM, Yoshihiro Shimoda wrote: > > To use the channel 0 of R-Car gen3 as periperal mode, This patch changes > > the mode to OTG instead of HOST. Then, this driver needs to set some > > registers to enable host mode and detects ID pin and VBUS pin at > > phy_init() timing. > > > > For now, the channel 0 can be used as host mode only. > > > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > > --- > > drivers/phy/phy-rcar-gen3-usb2.c | 126 ++++++++++++++++++++++++++++++++++++++- > > 1 file changed, 124 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c > > index d90dfcf..03d7079 100644 > > --- a/drivers/phy/phy-rcar-gen3-usb2.c > > +++ b/drivers/phy/phy-rcar-gen3-usb2.c > > @@ -25,6 +25,10 @@ > > #define USB2_USBCTR 0x00c > > #define USB2_SPD_RSM_TIMSET 0x10c > > #define USB2_OC_TIMSET 0x110 > > +#define USB2_COMMCTRL 0x600 > > +#define USB2_VBCTRL 0x60c > > +#define USB2_LINECTRL1 0x610 > > +#define USB2_ADPCTRL 0x630 > > > > /* INT_ENABLE */ > > #define USB2_INT_ENABLE_USBH_INTB_EN BIT(2) > > @@ -42,6 +46,24 @@ > > /* OC_TIMSET */ > > #define USB2_OC_TIMSET_INIT 0x000209ab > > > > +/* COMMCTRL */ > > +#define USB2_COMMCTRL_OTG_PERI BIT(31) /* 1 = Peripheral mode */ > > + > > +/* VBCTRL */ > > +#define USB2_VBCTRL_DRVVBUSSEL BIT(8) > > + > > +/* LINECTRL1 */ > > +#define USB2_LINECTRL1_DPRPD_EN BIT(19) > > +#define USB2_LINECTRL1_DP_RPD BIT(18) > > +#define USB2_LINECTRL1_DMRPD_EN BIT(17) > > +#define USB2_LINECTRL1_DM_RPD BIT(16) > > + > > +/* ADPCTRL */ > > +#define USB2_ADPCTRL_OTGSESSVLD BIT(20) > > +#define USB2_ADPCTRL_IDDIG BIT(19) > > +#define USB2_ADPCTRL_IDPULLUP BIT(5) /* 1 = ID sampling is enabled */ > > +#define USB2_ADPCTRL_DRVVBUS BIT(4) > > + > > /******* HSUSB registers (original offset is +0x100) *******/ > > #define HSUSB_LPSTS 0x02 > > #define HSUSB_UGCTRL2 0x84 > > @@ -68,6 +90,104 @@ struct rcar_gen3_chan { > > spinlock_t lock; > > }; > > > > +static void rcar_gen3_set_host_mode(struct rcar_gen3_chan *ch, int host) > > +{ > > + void __iomem *usb2_base = ch->usb2.base; > > + u32 tmp = readl(usb2_base + USB2_COMMCTRL); > > It's your preference but I'd like to have something like val instead of tmp. I got it. I will change the name. > > + > > + dev_dbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, tmp, host); > > This shoulod be dev_vdbg. I got it. I will fix it. > > + if (host) > > + tmp &= ~USB2_COMMCTRL_OTG_PERI; > > + else > > + tmp |= USB2_COMMCTRL_OTG_PERI; > > + writel(tmp, usb2_base + USB2_COMMCTRL); > > +} > > + > > +static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm) > > +{ > > + void __iomem *usb2_base = ch->usb2.base; > > + u32 tmp = readl(usb2_base + USB2_LINECTRL1); > > + > > + dev_dbg(&ch->phy->dev, "%s: %08x, %d, %d\n", __func__, tmp, dp, dm); > > same here. I got it. > > + tmp &= ~(USB2_LINECTRL1_DP_RPD | USB2_LINECTRL1_DM_RPD); > > + if (dp) > > + tmp |= USB2_LINECTRL1_DP_RPD; > > + if (dm) > > + tmp |= USB2_LINECTRL1_DM_RPD; > > + writel(tmp, usb2_base + USB2_LINECTRL1); > > +} > > + > > +static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus) > > +{ > > + void __iomem *usb2_base = ch->usb2.base; > > + u32 tmp = readl(usb2_base + USB2_ADPCTRL); > > + > > + dev_dbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, tmp, vbus); > > here too. I will fix it. > > + if (vbus) > > + tmp |= USB2_ADPCTRL_DRVVBUS; > > + else > > + tmp &= ~USB2_ADPCTRL_DRVVBUS; > > + writel(tmp, usb2_base + USB2_ADPCTRL); > > +} > > + > > +static void rcar_gen3_init_for_host(struct rcar_gen3_chan *ch) > > +{ > > + rcar_gen3_set_linectrl(ch, 1, 1); > > + rcar_gen3_set_host_mode(ch, 1); > > + rcar_gen3_enable_vbus_ctrl(ch, 1); > > +} > > + > > +static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch) > > +{ > > + rcar_gen3_set_linectrl(ch, 0, 1); > > + rcar_gen3_set_host_mode(ch, 0); > > + rcar_gen3_enable_vbus_ctrl(ch, 0); > > +} > > + > > +static bool rcar_gen3_check_vbus(struct rcar_gen3_chan *ch) > > +{ > > + return !!(readl(ch->usb2.base + USB2_ADPCTRL) & > > + USB2_ADPCTRL_OTGSESSVLD); > > +} > > + > > +static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch) > > +{ > > + return !!(readl(ch->usb2.base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG); > > +} > > + > > +static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch) > > +{ > > + bool is_host = true; > > + > > + if (rcar_gen3_check_id(ch)) { > > + /* B-device? */ > > + if (rcar_gen3_check_vbus(ch)) > > This can be rcar_gen3_check_id(ch) && rcar_gen3_check_vbus(ch) no? Thank you for the point. I will change such a condition. Best regards, Yoshihiro Shimoda > Thanks > Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Kishon, On 10/17/2015 8:48 AM, Kishon Vijay Abraham I wrote: > Hi, > > On Tuesday 13 October 2015 03:52 PM, Yoshihiro Shimoda wrote: >> To use the channel 0 of R-Car gen3 as periperal mode, This patch changes >> the mode to OTG instead of HOST. Then, this driver needs to set some >> registers to enable host mode and detects ID pin and VBUS pin at >> phy_init() timing. >> >> For now, the channel 0 can be used as host mode only. >> >> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> >> --- >> drivers/phy/phy-rcar-gen3-usb2.c | 126 ++++++++++++++++++++++++++++++++++++++- >> 1 file changed, 124 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c >> index d90dfcf..03d7079 100644 >> --- a/drivers/phy/phy-rcar-gen3-usb2.c >> +++ b/drivers/phy/phy-rcar-gen3-usb2.c [ .... ] snip >> + >> + dev_dbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, tmp, host); > > This shoulod be dev_vdbg. I guess using dev_dbg() is equivalent. I searched in same directory (drivers/phy) and the number of drivers using dev_vdbg() are just few drivers. (in my search, only 3 drivers). Other drivers use dev_dbg(). The last driver using dev_dbg was from Jan 2015. I also recognized that dev_vdbug was used mostly in USB drivers... Is it your favorite way or is there any good point of using dev_vdbg() ? >> + if (host) >> + tmp &= ~USB2_COMMCTRL_OTG_PERI; >> + else >> + tmp |= USB2_COMMCTRL_OTG_PERI; >> + writel(tmp, usb2_base + USB2_COMMCTRL); >> +} >> + >> +static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm) >> +{ >> + void __iomem *usb2_base = ch->usb2.base; >> + u32 tmp = readl(usb2_base + USB2_LINECTRL1); >> + >> + dev_dbg(&ch->phy->dev, "%s: %08x, %d, %d\n", __func__, tmp, dp, dm); > > same here. [.....] snip > > Thanks > Kishon > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" 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/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c index d90dfcf..03d7079 100644 --- a/drivers/phy/phy-rcar-gen3-usb2.c +++ b/drivers/phy/phy-rcar-gen3-usb2.c @@ -25,6 +25,10 @@ #define USB2_USBCTR 0x00c #define USB2_SPD_RSM_TIMSET 0x10c #define USB2_OC_TIMSET 0x110 +#define USB2_COMMCTRL 0x600 +#define USB2_VBCTRL 0x60c +#define USB2_LINECTRL1 0x610 +#define USB2_ADPCTRL 0x630 /* INT_ENABLE */ #define USB2_INT_ENABLE_USBH_INTB_EN BIT(2) @@ -42,6 +46,24 @@ /* OC_TIMSET */ #define USB2_OC_TIMSET_INIT 0x000209ab +/* COMMCTRL */ +#define USB2_COMMCTRL_OTG_PERI BIT(31) /* 1 = Peripheral mode */ + +/* VBCTRL */ +#define USB2_VBCTRL_DRVVBUSSEL BIT(8) + +/* LINECTRL1 */ +#define USB2_LINECTRL1_DPRPD_EN BIT(19) +#define USB2_LINECTRL1_DP_RPD BIT(18) +#define USB2_LINECTRL1_DMRPD_EN BIT(17) +#define USB2_LINECTRL1_DM_RPD BIT(16) + +/* ADPCTRL */ +#define USB2_ADPCTRL_OTGSESSVLD BIT(20) +#define USB2_ADPCTRL_IDDIG BIT(19) +#define USB2_ADPCTRL_IDPULLUP BIT(5) /* 1 = ID sampling is enabled */ +#define USB2_ADPCTRL_DRVVBUS BIT(4) + /******* HSUSB registers (original offset is +0x100) *******/ #define HSUSB_LPSTS 0x02 #define HSUSB_UGCTRL2 0x84 @@ -68,6 +90,104 @@ struct rcar_gen3_chan { spinlock_t lock; }; +static void rcar_gen3_set_host_mode(struct rcar_gen3_chan *ch, int host) +{ + void __iomem *usb2_base = ch->usb2.base; + u32 tmp = readl(usb2_base + USB2_COMMCTRL); + + dev_dbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, tmp, host); + if (host) + tmp &= ~USB2_COMMCTRL_OTG_PERI; + else + tmp |= USB2_COMMCTRL_OTG_PERI; + writel(tmp, usb2_base + USB2_COMMCTRL); +} + +static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm) +{ + void __iomem *usb2_base = ch->usb2.base; + u32 tmp = readl(usb2_base + USB2_LINECTRL1); + + dev_dbg(&ch->phy->dev, "%s: %08x, %d, %d\n", __func__, tmp, dp, dm); + tmp &= ~(USB2_LINECTRL1_DP_RPD | USB2_LINECTRL1_DM_RPD); + if (dp) + tmp |= USB2_LINECTRL1_DP_RPD; + if (dm) + tmp |= USB2_LINECTRL1_DM_RPD; + writel(tmp, usb2_base + USB2_LINECTRL1); +} + +static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus) +{ + void __iomem *usb2_base = ch->usb2.base; + u32 tmp = readl(usb2_base + USB2_ADPCTRL); + + dev_dbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, tmp, vbus); + if (vbus) + tmp |= USB2_ADPCTRL_DRVVBUS; + else + tmp &= ~USB2_ADPCTRL_DRVVBUS; + writel(tmp, usb2_base + USB2_ADPCTRL); +} + +static void rcar_gen3_init_for_host(struct rcar_gen3_chan *ch) +{ + rcar_gen3_set_linectrl(ch, 1, 1); + rcar_gen3_set_host_mode(ch, 1); + rcar_gen3_enable_vbus_ctrl(ch, 1); +} + +static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch) +{ + rcar_gen3_set_linectrl(ch, 0, 1); + rcar_gen3_set_host_mode(ch, 0); + rcar_gen3_enable_vbus_ctrl(ch, 0); +} + +static bool rcar_gen3_check_vbus(struct rcar_gen3_chan *ch) +{ + return !!(readl(ch->usb2.base + USB2_ADPCTRL) & + USB2_ADPCTRL_OTGSESSVLD); +} + +static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch) +{ + return !!(readl(ch->usb2.base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG); +} + +static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch) +{ + bool is_host = true; + + if (rcar_gen3_check_id(ch)) { + /* B-device? */ + if (rcar_gen3_check_vbus(ch)) + is_host = false; + } + + if (is_host) + rcar_gen3_init_for_host(ch); + else + rcar_gen3_init_for_peri(ch); +} + +static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch) +{ + void __iomem *usb2_base = ch->usb2.base; + u32 tmp; + + tmp = readl(usb2_base + USB2_VBCTRL); + writel(tmp | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL); + tmp = readl(usb2_base + USB2_ADPCTRL); + writel(tmp | USB2_ADPCTRL_IDPULLUP, usb2_base + USB2_ADPCTRL); + tmp = readl(usb2_base + USB2_LINECTRL1); + rcar_gen3_set_linectrl(ch, 0, 0); + writel(tmp | USB2_LINECTRL1_DPRPD_EN | USB2_LINECTRL1_DMRPD_EN, + usb2_base + USB2_LINECTRL1); + + rcar_gen3_device_recognition(ch); +} + static int rcar_gen3_phy_usb2_init(struct phy *p) { struct rcar_gen3_chan *channel = phy_get_drvdata(p); @@ -85,11 +205,13 @@ static int rcar_gen3_phy_usb2_init(struct phy *p) /* Initialize HSUSB part */ if (hsusb_base) { - /* TODO: support "OTG" mode */ tmp = readl(hsusb_base + HSUSB_UGCTRL2); tmp = (tmp & ~HSUSB_UGCTRL2_USB0SEL) | - HSUSB_UGCTRL2_USB0SEL_HOST; + HSUSB_UGCTRL2_USB0SEL_OTG; writel(tmp & HSUSB_UGCTRL2_MASK, hsusb_base + HSUSB_UGCTRL2); + + /* Initialize otg part */ + rcar_gen3_init_otg(channel); } spin_unlock_irqrestore(&channel->lock, flags);
To use the channel 0 of R-Car gen3 as periperal mode, This patch changes the mode to OTG instead of HOST. Then, this driver needs to set some registers to enable host mode and detects ID pin and VBUS pin at phy_init() timing. For now, the channel 0 can be used as host mode only. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> --- drivers/phy/phy-rcar-gen3-usb2.c | 126 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-)