1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From 47f3896e8938401a641d5c48c8b1dc9389fcb7b1 Mon Sep 17 00:00:00 2001
From: Andrey Gusakov <andrey.gusakov@cogentembedded.com>
Date: Wed, 28 Aug 2019 17:16:35 +0300
Subject: [PATCH 6/6] phy: rcar-gen3-usb2: power-on port in host mode to
Signed-off-by: Andrey Gusakov <andrey.gusakov@cogentembedded.com>
---
drivers/phy/renesas/phy-rcar-gen3-usb2.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
index 0d03c5d..c35f1a1 100644
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@ -156,7 +156,8 @@ static void rcar_gen3_init_for_host(struct rcar_gen3_chan *ch)
rcar_gen3_enable_vbus_ctrl(ch, 1);
ch->extcon_host = true;
- schedule_work(&ch->work);
+ if (ch->extcon)
+ schedule_work(&ch->work);
}
static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch)
@@ -166,7 +167,8 @@ static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch)
rcar_gen3_enable_vbus_ctrl(ch, 0);
ch->extcon_host = false;
- schedule_work(&ch->work);
+ if (ch->extcon)
+ schedule_work(&ch->work);
}
static void rcar_gen3_init_for_b_host(struct rcar_gen3_chan *ch)
@@ -290,8 +292,6 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
void __iomem *usb2_base = ch->base;
u32 val;
- val = readl(usb2_base + USB2_VBCTRL);
- writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL);
writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA);
val = readl(usb2_base + USB2_OBINTEN);
writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
@@ -321,11 +321,15 @@ static int rcar_gen3_phy_usb2_init(struct phy *p)
writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
val = readl(usb2_base + USB2_VBCTRL);
val &= ~USB2_VBCTRL_OCCLREN;
+ /* setup Vbus control pin */
+ val |= USB2_VBCTRL_DRVVBUSSEL;
writel(val, usb2_base + USB2_VBCTRL);
/* Initialize otg part */
if (channel->has_otg_pins)
rcar_gen3_init_otg(channel);
+ else
+ rcar_gen3_init_for_host(channel);
return 0;
}
--
2.7.4
|
