Merge pull request #4 in CBX3/ext-kernel-renesas-bsp from CBX3IST-79-usb2-inic to v4.9/rcar-ctc

* commit '876c004bb19689c4e34677ed9f8e12fbf2520d23':
  Completely disable OTG on channel 0 of EHCI controller
  Enable channel 0 of USB 2.0 host controller

(cherry picked from commit e93a6c16869cc4c97dc4460b711a0039a88f63af)
(cherry picked from commit 619c80382a2aba43db2000a44457c5ec2676de72)

Author: tobias-modschiedler

arch/arm64/boot/dts/renesas/r8a7796-cetibox-m3ulcb.dts

@@ -271,6 +271,11 @@
 		function = "audio_clk";
 	};
 
+	usb0_pins: usb0 {
+		groups = "usb0";
+		function = "usb0";
+	};
+
 	usb1_pins: usb1 {
 		groups = "usb1";
 		function = "usb1";
@@ -584,13 +589,28 @@
 	status = "okay";
 };
 
+&usb2_phy0 {
+	pinctrl-0 = <&usb0_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
 &usb2_phy1 {
 	pinctrl-0 = <&usb1_pins>;
 	pinctrl-names = "default";
 
 	status = "okay";
 };
 
+&ehci0 {
+	status = "okay";
+};
+
+&ohci0 {
+	status = "okay";
+};
+
 &ehci1 {
 	status = "okay";
 };

drivers/phy/renesas/phy-rcar-gen3-usb2.c

@@ -77,6 +77,7 @@
 #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_OTGDISABLE		BIT(3)	/* 1 = VBUS valid comparator disabled */
 #define USB2_ADPCTRL_DRVVBUS		BIT(4)
 
 struct rcar_gen3_chan {
@@ -283,13 +284,12 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
 	val = readl(usb2_base + USB2_OBINTEN);
 	writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
 	val = readl(usb2_base + USB2_ADPCTRL);
-	writel(val | USB2_ADPCTRL_IDPULLUP, usb2_base + USB2_ADPCTRL);
+	writel((val & ~USB2_ADPCTRL_IDPULLUP) | USB2_ADPCTRL_OTGDISABLE, usb2_base + USB2_ADPCTRL);
 	val = readl(usb2_base + USB2_LINECTRL1);
 	rcar_gen3_set_linectrl(ch, 0, 0);
 	writel(val | USB2_LINECTRL1_DPRPD_EN | USB2_LINECTRL1_DMRPD_EN,
 	       usb2_base + USB2_LINECTRL1);
-
-	rcar_gen3_device_recognition(ch);
+	rcar_gen3_init_for_host(ch);
 }
 
 static int rcar_gen3_phy_usb2_init(struct phy *p)