Revert "usb: usb5303: add support for reference clock specified in device tree"
authorMarek Szyprowski <m.szyprowski@samsung.com>
Fri, 11 Jul 2014 11:21:22 +0000 (13:21 +0200)
committerChanho Park <chanho61.park@samsung.com>
Tue, 18 Nov 2014 03:00:02 +0000 (12:00 +0900)
This reverts commit 36de3d9a1a856a88f3c7f98d4a3a2ec0fd2cd407.

This patch will be replaced with the version merged to mainline kernel.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I70bab95f5c3cebd730b3dfe122c9567502717c3a

drivers/usb/misc/usb3503.c

index 52cb754..a31641e 100644 (file)
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <linux/clk.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/delay.h>
@@ -58,12 +57,10 @@ struct usb3503 {
        enum usb3503_mode       mode;
        struct regmap           *regmap;
        struct device           *dev;
-       struct clk              *clk;
        u8      port_off_mask;
        int     gpio_intn;
        int     gpio_reset;
        int     gpio_connect;
-       bool    secondary_ref_clk;
 };
 
 static int usb3503_reset(struct usb3503 *hub, int state)
@@ -189,25 +186,6 @@ static int usb3503_probe(struct usb3503 *hub)
        } else if (np) {
                hub->port_off_mask = 0;
 
-               hub->clk = devm_clk_get(dev, "refclk");
-               if (!IS_ERR(hub->clk)) {
-                       unsigned long rate;
-
-                       clk_prepare_enable(hub->clk);
-                       rate = clk_get_rate(hub->clk);
-
-                       if (rate == 38400000 || rate == 26000000 ||
-                           rate == 19200000 || rate == 12000000)
-                               hub->secondary_ref_clk = 0;
-                       else if (rate == 24000000 || rate == 27000000 ||
-                           rate == 25000000 || rate == 50000000)
-                               hub->secondary_ref_clk = 1;
-                       else
-                               dev_err(dev,
-                                       "unsupported reference clock rate (%d)\n",
-                                       rate);
-               }
-
                property = of_get_property(np, "disabled-ports", &len);
                if (property && (len / sizeof(u32)) > 0) {
                        int i;
@@ -235,10 +213,8 @@ static int usb3503_probe(struct usb3503 *hub)
                dev_err(dev, "Ports disabled with no control interface\n");
 
        if (gpio_is_valid(hub->gpio_intn)) {
-               int val = hub->secondary_ref_clk ? GPIOF_OUT_INIT_LOW :
-                                                  GPIOF_OUT_INIT_HIGH;
-               err = devm_gpio_request_one(dev, hub->gpio_intn, val,
-                                           "usb3503 intn");
+               err = devm_gpio_request_one(dev, hub->gpio_intn,
+                               GPIOF_OUT_INIT_HIGH, "usb3503 intn");
                if (err) {
                        dev_err(dev,
                                "unable to request GPIO %d as connect pin (%d)\n",