X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=blobdiff_plain;f=drivers%2Fusb%2Fdwc_otg_310%2Fusbdev_rk3368.c;h=3272e4e99c5fcdd604c1c7f9be0d9e40f1cef616;hp=7af3c5488349270ec7143e4e56064becd0783215;hb=9a47b6de548a83d198e2a92b53fe735c62832515;hpb=44f48d3af93111f35d3ed95005448ab4afa45695

diff --git a/drivers/usb/dwc_otg_310/usbdev_rk3368.c b/drivers/usb/dwc_otg_310/usbdev_rk3368.c
index 7af3c5488349..3272e4e99c5f 100644
--- a/drivers/usb/dwc_otg_310/usbdev_rk3368.c
+++ b/drivers/usb/dwc_otg_310/usbdev_rk3368.c
@@ -99,15 +99,15 @@ static void usb20otg_clock_init(void *pdata)
 	struct dwc_otg_platform_data *usbpdata = pdata;
 	struct clk *ahbclk, *phyclk;
 
-	ahbclk = devm_clk_get(usbpdata->dev, "hclk_otg");
+	ahbclk = devm_clk_get(usbpdata->dev, "otg");
 	if (IS_ERR(ahbclk)) {
-		dev_err(usbpdata->dev, "Failed to get hclk_usb0\n");
+		dev_err(usbpdata->dev, "Failed to get otg clk\n");
 		return;
 	}
 
-	phyclk = devm_clk_get(usbpdata->dev, "clk_usbphy0");
+	phyclk = devm_clk_get(usbpdata->dev, "sclk_otgphy0");
 	if (IS_ERR(phyclk)) {
-		dev_err(usbpdata->dev, "Failed to get clk_usbphy0\n");
+		dev_err(usbpdata->dev, "Failed to get sclk_otgphy0\n");
 		return;
 	}
 
@@ -131,7 +131,7 @@ static void usb20otg_clock_enable(void *pdata, int enable)
 static int usb20otg_get_status(int id)
 {
 	int ret = -1;
-	u32 soc_status15 = uoc_read(0x4bc);
+	u32 soc_status15 = uoc_read(control_usb->grf_otg_st_offset);
 
 	switch (id) {
 	case USB_STATUS_BVABLID:
@@ -186,15 +186,18 @@ static void dwc_otg_uart_mode(void *pdata, int enter_usb_uart_mode)
 static void usb20otg_power_enable(int enable)
 {
 	if (0 == enable) {
-		rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
 		/* disable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 0);
+
+		rk_battery_charger_detect_cb(USB_OTG_POWER_OFF);
 	} else if (1 == enable) {
-		rk_battery_charger_detect_cb(USB_OTG_POWER_ON);
 		/* enable otg_drv power */
 		if (gpio_is_valid(control_usb->otg_gpios->gpio))
 			gpio_set_value(control_usb->otg_gpios->gpio, 1);
+
+		if (!usb20otg_get_status(USB_STATUS_BVABLID))
+			rk_battery_charger_detect_cb(USB_OTG_POWER_ON);
 	}
 }
 
@@ -402,6 +405,7 @@ static int dwc_otg_control_usb_probe(struct platform_device *pdev)
 	struct clk *hclk_usb_peri;
 	struct regmap *grf;
 	int gpio, ret = 0;
+	u32 offset;
 
 	control_usb = devm_kzalloc(dev, sizeof(*control_usb), GFP_KERNEL);
 	if (!control_usb) {
@@ -417,6 +421,14 @@ static int dwc_otg_control_usb_probe(struct platform_device *pdev)
 	}
 	control_usb->grf = grf;
 
+	/* get the reg offset of GRF_SOC_STATUS for USB2.0 OTG */
+	if (of_property_read_u32(np, "grf-offset", &offset)) {
+		dev_err(&pdev->dev, "missing reg property in node %s\n",
+			np->name);
+		return -EINVAL;
+	}
+	control_usb->grf_otg_st_offset = offset;
+
 	/* Init Vbus-drv GPIOs */
 	control_usb->host_gpios =
 	    devm_kzalloc(&pdev->dev, sizeof(struct gpio), GFP_KERNEL);
@@ -466,8 +478,8 @@ static int dwc_otg_control_usb_probe(struct platform_device *pdev)
 	/* Init hclk_usb_peri */
 	hclk_usb_peri = devm_clk_get(&pdev->dev, "hclk_usb_peri");
 	if (IS_ERR(hclk_usb_peri)) {
-		dev_err(&pdev->dev, "Failed to get hclk_usb_peri\n");
-		return PTR_ERR(hclk_usb_peri);
+		dev_info(&pdev->dev, "no hclk_usb_peri clk specified\n");
+		hclk_usb_peri = NULL;
 	}
 	control_usb->hclk_usb_peri = hclk_usb_peri;
 	clk_prepare_enable(hclk_usb_peri);