diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-02-27 17:39:49 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-02-27 17:39:49 +0000 |
| commit | eea227c60d593c2fe5692365936703bbebdbd1ad (patch) | |
| tree | 75ffdc0a1a19758e3c30b241e7aef13f7ab25ecd /target/linux/brcm63xx/patches-3.18/423-bcm63xx_enet_add_b53_support.patch | |
| parent | 1efb7398e1ae9e967a9b0b1a73edb034b10ee5fc (diff) | |
| download | upstream-eea227c60d593c2fe5692365936703bbebdbd1ad.tar.gz upstream-eea227c60d593c2fe5692365936703bbebdbd1ad.tar.bz2 upstream-eea227c60d593c2fe5692365936703bbebdbd1ad.zip | |
brcm63xx: probe gpio controllers through DT
Add a generic mmio gpio controller based driver and probe it
through device tree.
Use aliases for base calculation until we converted all users to
device tree or named gpios.
Convert bcm63xx_enet's ephy-reset gpio to use a named gpio.
While at it, remove the duplicate reset gpio defintion for livebox.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 44565
Diffstat (limited to 'target/linux/brcm63xx/patches-3.18/423-bcm63xx_enet_add_b53_support.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.18/423-bcm63xx_enet_add_b53_support.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/brcm63xx/patches-3.18/423-bcm63xx_enet_add_b53_support.patch b/target/linux/brcm63xx/patches-3.18/423-bcm63xx_enet_add_b53_support.patch index 469a365b91..f7697e1faa 100644 --- a/target/linux/brcm63xx/patches-3.18/423-bcm63xx_enet_add_b53_support.patch +++ b/target/linux/brcm63xx/patches-3.18/423-bcm63xx_enet_add_b53_support.patch @@ -12,15 +12,15 @@ spinlock_t enetsw_mdio_lock; --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -30,6 +30,7 @@ - #include <linux/dma-mapping.h> +@@ -31,6 +31,7 @@ #include <linux/platform_device.h> #include <linux/if_vlan.h> + #include <linux/gpio/consumer.h> +#include <linux/platform_data/b53.h> #include <bcm63xx_dev_enet.h> #include "bcm63xx_enet.h" -@@ -1974,7 +1975,8 @@ static int bcm_enet_remove(struct platfo +@@ -1975,7 +1976,8 @@ static int bcm_enet_remove(struct platfo return 0; } @@ -30,7 +30,7 @@ .probe = bcm_enet_probe, .remove = bcm_enet_remove, .driver = { -@@ -1983,6 +1985,42 @@ struct platform_driver bcm63xx_enet_driv +@@ -1984,6 +1986,42 @@ struct platform_driver bcm63xx_enet_driv }, }; @@ -73,7 +73,7 @@ /* * switch mii access callbacks */ -@@ -2236,29 +2274,6 @@ static int bcm_enetsw_open(struct net_de +@@ -2237,29 +2275,6 @@ static int bcm_enetsw_open(struct net_de enetsw_writeb(priv, rgmii_ctrl, ENETSW_RGMII_CTRL_REG(i)); } @@ -103,7 +103,7 @@ /* initialize flow control buffer allocation */ enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0, ENETDMA_BUFALLOC_REG(priv->rx_chan)); -@@ -2718,6 +2733,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2719,6 +2734,9 @@ static int bcm_enetsw_probe(struct platf struct bcm63xx_enetsw_platform_data *pd; struct resource *res_mem; int ret, irq_rx, irq_tx; @@ -113,7 +113,7 @@ /* stop if shared driver failed, assume driver->probe will be * called in the same order we register devices (correct ?) -@@ -2807,6 +2825,43 @@ static int bcm_enetsw_probe(struct platf +@@ -2808,6 +2826,43 @@ static int bcm_enetsw_probe(struct platf priv->pdev = pdev; priv->net_dev = dev; @@ -157,7 +157,7 @@ return 0; out_put_clk: -@@ -2835,6 +2890,9 @@ static int bcm_enetsw_remove(struct plat +@@ -2836,6 +2891,9 @@ static int bcm_enetsw_remove(struct plat priv = netdev_priv(dev); unregister_netdev(dev); |