From 5b8524b03de813f027ac49bd3158a7789a4cc4a8 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Fri, 27 Feb 2015 17:39:49 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44565 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.14/423-bcm63xx_enet_add_b53_support.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'target/linux/brcm63xx/patches-3.14/423-bcm63xx_enet_add_b53_support.patch') diff --git a/target/linux/brcm63xx/patches-3.14/423-bcm63xx_enet_add_b53_support.patch b/target/linux/brcm63xx/patches-3.14/423-bcm63xx_enet_add_b53_support.patch index 271119cf59..48a33ef761 100644 --- a/target/linux/brcm63xx/patches-3.14/423-bcm63xx_enet_add_b53_support.patch +++ b/target/linux/brcm63xx/patches-3.14/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 +@@ -31,6 +31,7 @@ #include #include + #include +#include #include #include "bcm63xx_enet.h" -@@ -1978,7 +1979,8 @@ static int bcm_enet_remove(struct platfo +@@ -1979,7 +1980,8 @@ static int bcm_enet_remove(struct platfo return 0; } @@ -30,7 +30,7 @@ .probe = bcm_enet_probe, .remove = bcm_enet_remove, .driver = { -@@ -1987,6 +1989,42 @@ struct platform_driver bcm63xx_enet_driv +@@ -1988,6 +1990,42 @@ struct platform_driver bcm63xx_enet_driv }, }; @@ -73,7 +73,7 @@ /* * switch mii access callbacks */ -@@ -2240,29 +2278,6 @@ static int bcm_enetsw_open(struct net_de +@@ -2241,29 +2279,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)); -@@ -2722,6 +2737,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2723,6 +2738,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 ?) -@@ -2811,6 +2829,43 @@ static int bcm_enetsw_probe(struct platf +@@ -2812,6 +2830,43 @@ static int bcm_enetsw_probe(struct platf priv->pdev = pdev; priv->net_dev = dev; @@ -157,7 +157,7 @@ return 0; out_put_clk: -@@ -2839,6 +2894,9 @@ static int bcm_enetsw_remove(struct plat +@@ -2840,6 +2895,9 @@ static int bcm_enetsw_remove(struct plat priv = netdev_priv(dev); unregister_netdev(dev); -- cgit v1.2.3