diff options
Diffstat (limited to 'drivers/phy/phy-rcar-gen3-usb2.c')
-rw-r--r-- | drivers/phy/phy-rcar-gen3-usb2.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c index 76bb88f0700a..4be3f5dbbc9f 100644 --- a/drivers/phy/phy-rcar-gen3-usb2.c +++ b/drivers/phy/phy-rcar-gen3-usb2.c | |||
@@ -144,12 +144,6 @@ static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch) | |||
144 | extcon_set_cable_state_(ch->extcon, EXTCON_USB, true); | 144 | extcon_set_cable_state_(ch->extcon, EXTCON_USB, true); |
145 | } | 145 | } |
146 | 146 | ||
147 | static bool rcar_gen3_check_vbus(struct rcar_gen3_chan *ch) | ||
148 | { | ||
149 | return !!(readl(ch->base + USB2_ADPCTRL) & | ||
150 | USB2_ADPCTRL_OTGSESSVLD); | ||
151 | } | ||
152 | |||
153 | static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch) | 147 | static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch) |
154 | { | 148 | { |
155 | return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG); | 149 | return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG); |
@@ -157,13 +151,7 @@ static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch) | |||
157 | 151 | ||
158 | static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch) | 152 | static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch) |
159 | { | 153 | { |
160 | bool is_host = true; | 154 | if (!rcar_gen3_check_id(ch)) |
161 | |||
162 | /* B-device? */ | ||
163 | if (rcar_gen3_check_id(ch) && rcar_gen3_check_vbus(ch)) | ||
164 | is_host = false; | ||
165 | |||
166 | if (is_host) | ||
167 | rcar_gen3_init_for_host(ch); | 155 | rcar_gen3_init_for_host(ch); |
168 | else | 156 | else |
169 | rcar_gen3_init_for_peri(ch); | 157 | rcar_gen3_init_for_peri(ch); |