diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-12-19 17:03:48 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2013-01-11 10:51:32 +0000 |
| commit | 298590bf5b2b6d4f8e4fdb5e2c9c6bc27bf11dae (patch) | |
| tree | 229d00ce5f0fa4cbc7a8ee322fa3d00abf4def61 | |
| parent | 2d8df729a9d3d5ecbb701671dfa5902850d087c7 (diff) | |
net/smsc911x: Provide common clock functionalitytracking-ste-tb-ethernet-llct-20130508.0tracking-ste-tb-ethernet-llct-20130506.0tracking-ste-tb-ethernet-llct-20130502.0tracking-ste-tb-ethernet-llct-20130417.0tracking-ste-tb-ethernet-llct-20130415.0tracking-ste-tb-ethernet-llct-20130411.0tracking-ste-tb-ethernet-llct-20130408.0tracking-ste-tb-ethernet-llct-20130404.0tracking-ste-tb-ethernet-llct-20130402.0tracking-ste-tb-ethernet-llct-20130324.0tracking-ste-tb-ethernet-llct-20130321.0tracking-ste-tb-ethernet-llct-20130318.0tracking-ste-tb-ethernet-llct-20130315.0tracking-ste-tb-ethernet-llct-20130314.1tracking-ste-tb-ethernet-llct-20130314.0tracking-ste-tb-ethernet-llct-20130312.0tracking-ste-tb-ethernet-llct-20130311.0tracking-ste-tb-ethernet-llct-20130308.0tracking-ste-tb-ethernet-llct-20130220.0tracking-ste-tb-ethernet-llct-20130219.0tracking-ste-tb-ethernet-llct-20130217.0tracking-ste-tb-ethernet-llct-20130211.0tracking-ste-tb-ethernet-llct-20130210.0tracking-ste-tb-ethernet-llct-20130208.0tracking-ste-tb-ethernet-llct-20130206.0tracking-ste-tb-ethernet-llct-20130204.0tracking-ste-tb-ethernet-ll-20130201.0tracking-ste-tb-ethernet-ll-20130125.0tracking-ste-tb-ethernet-ll-20130124.0tracking-ste-tb-ethernet-ll-20130123.0tracking-ste-tb-ethernet-ll-20130122.1tracking-ste-tb-ethernet-ll-20130122.0tracking-ste-tb-ethernet-ll-20130118.0tracking-ste-tb-ethernet-ll-20130116.0tracking-ste-tb-ethernet-ll-20130115.0tracking-ste-tb-ethernet-ll-20130114.0
Some platforms provide clocks which require enabling before the
SMSC911x chip will power on. This patch uses the new common clk
framework to do just that. If no clock is provided, it will just
be ignored and the driver will continue to assume that no clock
is required for the chip to run successfully.
Cc: Steve Glendinning <steve.glendinning@shawell.net>
Cc: netdev@vger.kernel.org
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index e112877d15d3..f9b6bb7c9ed7 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -33,6 +33,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/crc32.h> +#include <linux/clk.h> #include <linux/delay.h> #include <linux/errno.h> #include <linux/etherdevice.h> @@ -144,6 +145,9 @@ struct smsc911x_data { /* regulators */ struct regulator_bulk_data supplies[SMSC911X_NUM_SUPPLIES]; + + /* clock */ + struct clk *clk; }; /* Easy access to information */ @@ -369,7 +373,7 @@ out: } /* - * enable resources, currently just regulators. + * enable regulator and clock resources. */ static int smsc911x_enable_resources(struct platform_device *pdev) { @@ -382,6 +386,13 @@ static int smsc911x_enable_resources(struct platform_device *pdev) if (ret) netdev_err(ndev, "failed to enable regulators %d\n", ret); + + if (!IS_ERR(pdata->clk)) { + ret = clk_prepare_enable(pdata->clk); + if (ret < 0) + netdev_err(ndev, "failed to enable clock %d\n", ret); + } + return ret; } @@ -396,6 +407,10 @@ static int smsc911x_disable_resources(struct platform_device *pdev) ret = regulator_bulk_disable(ARRAY_SIZE(pdata->supplies), pdata->supplies); + + if (!IS_ERR(pdata->clk)) + clk_disable_unprepare(pdata->clk); + return ret; } @@ -421,6 +436,12 @@ static int smsc911x_request_resources(struct platform_device *pdev) if (ret) netdev_err(ndev, "couldn't get regulators %d\n", ret); + + /* Request clock */ + pdata->clk = clk_get(&pdev->dev, NULL); + if (IS_ERR(pdata->clk)) + netdev_warn(ndev, "couldn't get clock %li\n", PTR_ERR(pdata->clk)); + return ret; } @@ -436,6 +457,12 @@ static void smsc911x_free_resources(struct platform_device *pdev) /* Free regulators */ regulator_bulk_free(ARRAY_SIZE(pdata->supplies), pdata->supplies); + + /* Free clock */ + if (!IS_ERR(pdata->clk)) { + clk_put(pdata->clk); + pdata->clk = NULL; + } } /* waits for MAC not busy, with timeout. Only called by smsc911x_mac_read |