Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

usb: renesas_usbhs: set the mode by using extcon state for non-otg channel

Browse Source 
The usbhs_rcar3_power_and_pll_ctrl() will be used by non-otg channel
(e.g. R-Car D3) and the previous code has hardcoded as peripheral mode.
So, this patch sets the mode by using extcon state.
If the channel doesn't get any extcon devices, this driver's behavior
is the same as before.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Yoshihiro Shimoda 2017-12-13 15:46:59 +09:00 committed by Felipe Balbi
parent f16323fdbd
commit cd14247d5c
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/usb/renesas_usbhs/rcar3.c
View File

@ -27,6 +27,7 @@
* Remarks: bit[31:11] and bit[9:6] should be 0 * Remarks: bit[31:11] and bit[9:6] should be 0
*/ */
#define UGCTRL2_RESERVED_3 0x00000001 /* bit[3:0] should be B'0001 */ #define UGCTRL2_RESERVED_3 0x00000001 /* bit[3:0] should be B'0001 */
#define UGCTRL2_USB0SEL_EHCI 0x00000010
#define UGCTRL2_USB0SEL_HSUSB 0x00000020 #define UGCTRL2_USB0SEL_HSUSB 0x00000020
#define UGCTRL2_USB0SEL_OTG 0x00000030 #define UGCTRL2_USB0SEL_OTG 0x00000030
#define UGCTRL2_VBUSSEL 0x00000400 #define UGCTRL2_VBUSSEL 0x00000400
@ -49,6 +50,14 @@ static void usbhs_rcar3_set_ugctrl2(struct usbhs_priv *priv, u32 val)
usbhs_write32(priv, UGCTRL2, val | UGCTRL2_RESERVED_3); usbhs_write32(priv, UGCTRL2, val | UGCTRL2_RESERVED_3);
} }
static void usbhs_rcar3_set_usbsel(struct usbhs_priv *priv, bool ehci)
{
if (ehci)
usbhs_rcar3_set_ugctrl2(priv, UGCTRL2_USB0SEL_EHCI);
else
usbhs_rcar3_set_ugctrl2(priv, UGCTRL2_USB0SEL_HSUSB);
}
static int usbhs_rcar3_power_ctrl(struct platform_device *pdev, static int usbhs_rcar3_power_ctrl(struct platform_device *pdev,
void __iomem *base, int enable) void __iomem *base, int enable)
{ {
@ -74,10 +83,14 @@ static int usbhs_rcar3_power_and_pll_ctrl(struct platform_device *pdev,
struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
u32 val; u32 val;
int timeout = 1000; int timeout = 1000;
bool is_host = false;
if (enable) { if (enable) {
usbhs_write32(priv, UGCTRL, 0); /* release PLLRESET */ usbhs_write32(priv, UGCTRL, 0); /* release PLLRESET */
usbhs_rcar3_set_ugctrl2(priv, UGCTRL2_USB0SEL_HSUSB); if (priv->edev)
is_host = extcon_get_state(priv->edev, EXTCON_USB_HOST);
usbhs_rcar3_set_usbsel(priv, is_host);
usbhs_bset(priv, LPSTS, LPSTS_SUSPM, LPSTS_SUSPM); usbhs_bset(priv, LPSTS, LPSTS_SUSPM, LPSTS_SUSPM);
do { do {