From 135e4dae04c8e95ffc82e80674856aece1480c9f Mon Sep 17 00:00:00 2001
From: Yue Wang <yue.wang@amlogic.com>
Date: Fri, 17 Nov 2017 15:40:15 +0800
Subject: [PATCH] usb: meson-txlx: add usb host & device driver

PD#154260: usb: meson-txlx: add usb host & device driver

Change-Id: Ie7a1deba06bf97eb6e7f1ddc7876206d8b0a336d
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
---
 drivers/amlogic/usb/phy/usbphy.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/amlogic/usb/phy/usbphy.c b/drivers/amlogic/usb/phy/usbphy.c
index b1b5c6aec3cc..1e31c5a47379 100644
--- a/drivers/amlogic/usb/phy/usbphy.c
+++ b/drivers/amlogic/usb/phy/usbphy.c
@@ -25,8 +25,6 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/dma-mapping.h>
-/*#include <asm/mach-types.h>
-#include <asm/mach/arch.h>*/
 #include <linux/delay.h>
 #include <linux/amlogic/gpio-amlogic.h>
 #include <linux/amlogic/usbtype.h>
@@ -398,9 +396,6 @@ int clk_enable_usb_gxl(struct platform_device *pdev,
 	usb_reset = devm_clk_get(&pdev->dev, "usb_general");
 	clk_prepare_enable(usb_reset);
 	p_clk_reset[pdev->id].usb_reset_usb_general = usb_reset;
-	usb_reset = devm_clk_get(&pdev->dev, "usb1");
-	clk_prepare_enable(usb_reset);
-	p_clk_reset[pdev->id].usb_reset_usb = usb_reset;
 	usb_reset = devm_clk_get(&pdev->dev, "usb1_to_ddr");
 	clk_prepare_enable(usb_reset);
 	p_clk_reset[pdev->id].usb_reset_usb_to_ddr = usb_reset;
@@ -432,8 +427,6 @@ void clk_disable_usb_gxl(struct platform_device *pdev,
 
 	usb_reset = p_clk_reset[pdev->id].usb_reset_usb_general;
 	clk_disable_unprepare(usb_reset);
-	usb_reset = p_clk_reset[pdev->id].usb_reset_usb;
-	clk_disable_unprepare(usb_reset);
 	usb_reset = p_clk_reset[pdev->id].usb_reset_usb_to_ddr;
 	clk_disable_unprepare(usb_reset);
 	return;
@@ -478,15 +471,11 @@ int clk_resume_usb_gxl(struct platform_device *pdev,
 	if (0 == pdev->id) {
 		usb_reset = p_clk_reset[pdev->id].usb_reset_usb_general;
 		clk_prepare_enable(usb_reset);
-		usb_reset = p_clk_reset[pdev->id].usb_reset_usb;
-		clk_prepare_enable(usb_reset);
 		usb_reset = p_clk_reset[pdev->id].usb_reset_usb_to_ddr;
 		clk_prepare_enable(usb_reset);
 	} else if (1 == pdev->id) {
 		usb_reset = p_clk_reset[pdev->id].usb_reset_usb_general;
 		clk_prepare_enable(usb_reset);
-		usb_reset = p_clk_reset[pdev->id].usb_reset_usb;
-		clk_prepare_enable(usb_reset);
 		usb_reset = p_clk_reset[pdev->id].usb_reset_usb_to_ddr;
 		clk_prepare_enable(usb_reset);
 	} else {