diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-07-11 13:21:22 +0200 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:00:02 +0900 |
| commit | d0a044f63187023dc394190b4001a59696fe95d9 (patch) | |
| tree | 358122d5616660436bbd20a3e64e91c38c12c2f0 /drivers/usb | |
| parent | af481776e75add40a05c44cc91a05c0b9bb9ef73 (diff) | |
| download | linux-3.10-d0a044f63187023dc394190b4001a59696fe95d9.tar.gz linux-3.10-d0a044f63187023dc394190b4001a59696fe95d9.tar.bz2 linux-3.10-d0a044f63187023dc394190b4001a59696fe95d9.zip | |
Revert "usb: usb5303: add support for reference clock specified in device tree"
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
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/misc/usb3503.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c index 52cb7549b77..a31641e18d1 100644 --- a/drivers/usb/misc/usb3503.c +++ b/drivers/usb/misc/usb3503.c @@ -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", |