eea227c60d
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
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From ec905f2ea78ec40602a685ede31c5e4f9893d196 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
|
Date: Sat, 21 Feb 2015 16:35:07 +0100
|
|
Subject: [PATCH 3/6] net: bcm63xx_enet: use named gpio for ephy reset gpio
|
|
|
|
Allow using a named optional gpio for ephy reset gpio registration.
|
|
---
|
|
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
--- 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>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/if_vlan.h>
|
|
+#include <linux/gpio/consumer.h>
|
|
|
|
#include <bcm63xx_dev_enet.h>
|
|
#include "bcm63xx_enet.h"
|
|
@@ -2852,10 +2853,18 @@ static int bcm_enet_shared_probe(struct
|
|
{
|
|
struct resource *res;
|
|
void __iomem *p[3];
|
|
+ struct gpio_desc *ephy_reset;
|
|
unsigned int i;
|
|
|
|
memset(bcm_enet_shared_base, 0, sizeof(bcm_enet_shared_base));
|
|
|
|
+ ephy_reset = devm_gpiod_get(&pdev->dev, "ephy-reset");
|
|
+ if (IS_ERR(ephy_reset)) {
|
|
+ if (PTR_ERR(ephy_reset) != -ENOENT)
|
|
+ return PTR_ERR(ephy_reset);
|
|
+ ephy_reset = NULL;
|
|
+ }
|
|
+
|
|
for (i = 0; i < 3; i++) {
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, i);
|
|
p[i] = devm_ioremap_resource(&pdev->dev, res);
|
|
@@ -2865,6 +2874,9 @@ static int bcm_enet_shared_probe(struct
|
|
|
|
memcpy(bcm_enet_shared_base, p, sizeof(bcm_enet_shared_base));
|
|
|
|
+ if (ephy_reset)
|
|
+ gpiod_direction_output(ephy_reset, 0);
|
|
+
|
|
return 0;
|
|
}
|
|
|