On Wed, 19 Dec 2012, Lee Jones wrote:
> 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.glendinn...@shawell.net>
> Cc: net...@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jo...@linaro.org>
> ---
> drivers/net/ethernet/smsc/smsc911x.c | 31 ++++++++++++++++++++++++++++++-
> 1 file changed, 30 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/smsc/smsc911x.c
> b/drivers/net/ethernet/smsc/smsc911x.c
> index 4616bf2..f6196cd 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 (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 (pdata->clk)
> + clk_disable_unprepare(pdata->clk);
> +
> return ret;
> }
>
> @@ -421,6 +436,14 @@ 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 %d\n",
> PTR_ERR(pdata->clk));
> + pdata->clk = NULL;
> + }
> +
> return ret;
> }
>
> @@ -436,6 +459,12 @@ static void smsc911x_free_resources(struct
> platform_device *pdev)
> /* Free regulators */
> regulator_bulk_free(ARRAY_SIZE(pdata->supplies),
> pdata->supplies);
> +
> + /* Free clock */
> + if (pdata->clk) {
> + clk_put(pdata->clk);
> + pdata->clk = NULL;
> + }
> }
>
> /* waits for MAC not busy, with timeout. Only called by smsc911x_mac_read
> --
> 1.7.9.5
>
I still need a maintiner Ack for this before I can push it.
Mike?
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
