diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2014-03-06 00:09:30 +0000 |
---|---|---|
committer | Zoltan Herpai <wigyori@uid0.hu> | 2014-03-06 00:09:30 +0000 |
commit | ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7 (patch) | |
tree | ef1ef8907c63a75c4ac441f8c95325a6d5abb9ec /target/linux/sunxi/patches-3.13/190-stmmac-enable-main-clock-when-probing.patch | |
parent | 2c771cc71f3b6aceda5fe81f44a79b724e0941d0 (diff) | |
download | master-31e0f0ae-ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7.tar.gz master-31e0f0ae-ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7.tar.bz2 master-31e0f0ae-ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7.zip |
sunxi: driver refresh for 3.13 - update gmac / mmc / usb / ahci drivers to follow mainline dev trees - add driver for spi - update clock support - update a31 support - move to new DT compats where appropriate - re-order patchqueue where needed - verified working a20 smp - move most DTSes off files/ - update defconfig
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 39782
Diffstat (limited to 'target/linux/sunxi/patches-3.13/190-stmmac-enable-main-clock-when-probing.patch')
-rw-r--r-- | target/linux/sunxi/patches-3.13/190-stmmac-enable-main-clock-when-probing.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/target/linux/sunxi/patches-3.13/190-stmmac-enable-main-clock-when-probing.patch b/target/linux/sunxi/patches-3.13/190-stmmac-enable-main-clock-when-probing.patch deleted file mode 100644 index 3035a49ff9..0000000000 --- a/target/linux/sunxi/patches-3.13/190-stmmac-enable-main-clock-when-probing.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 133a9b75e2b0c48cd1d8f93b0ee61089821c32d9 Mon Sep 17 00:00:00 2001 -From: Chen-Yu Tsai <wens@csie.org> -Date: Sat, 7 Dec 2013 01:29:34 +0800 -Subject: [PATCH] net: stmmac: Enable stmmac main clock when probing hardware - -Signed-off-by: Chen-Yu Tsai <wens@csie.org> ---- - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 24 +++++++++++++---------- - 1 file changed, 14 insertions(+), 10 deletions(-) - ---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -2680,10 +2680,17 @@ struct stmmac_priv *stmmac_dvr_probe(str - if ((phyaddr >= 0) && (phyaddr <= 31)) - priv->plat->phy_addr = phyaddr; - -+ priv->stmmac_clk = clk_get(priv->device, STMMAC_RESOURCE_NAME); -+ if (IS_ERR(priv->stmmac_clk)) { -+ pr_warn("%s: warning: cannot get CSR clock\n", __func__); -+ goto error_clk_get; -+ } -+ clk_prepare_enable(priv->stmmac_clk); -+ - /* Init MAC and get the capabilities */ - ret = stmmac_hw_init(priv); - if (ret) -- goto error_free_netdev; -+ goto error_hw_init; - - ndev->netdev_ops = &stmmac_netdev_ops; - -@@ -2721,12 +2728,6 @@ struct stmmac_priv *stmmac_dvr_probe(str - goto error_netdev_register; - } - -- priv->stmmac_clk = clk_get(priv->device, STMMAC_RESOURCE_NAME); -- if (IS_ERR(priv->stmmac_clk)) { -- pr_warn("%s: warning: cannot get CSR clock\n", __func__); -- goto error_clk_get; -- } -- - /* If a specific clk_csr value is passed from the platform - * this means that the CSR Clock Range selection cannot be - * changed at run-time and it is fixed. Viceversa the driver'll try to -@@ -2751,15 +2752,18 @@ struct stmmac_priv *stmmac_dvr_probe(str - } - } - -+ clk_disable_unprepare(priv->stmmac_clk); -+ - return priv; - - error_mdio_register: -- clk_put(priv->stmmac_clk); --error_clk_get: - unregister_netdev(ndev); - error_netdev_register: - netif_napi_del(&priv->napi); --error_free_netdev: -+error_hw_init: -+ clk_disable_unprepare(priv->stmmac_clk); -+ clk_put(priv->stmmac_clk); -+error_clk_get: - free_netdev(ndev); - - return NULL; |