[PATCH v5 2/5] net: ethernet: cpsw: add optional third memory region for CONTROL module

On 23.08.2013 21:10, Sergei Shtylyov wrote:

Hello.

On 08/23/2013 10:53 PM, Daniel Mack wrote:

quoted

At least the AM33xx SoC has a control module register to configure
details such as the hardware ethernet interface mode.

quoted

I'm not sure whether all SoCs which feature the cpsw block have such a
register, so that third memory region is considered optional for now.

quoted

Signed-off-by: Daniel Mack <zonque@gmail.com>
---
  Documentation/devicetree/bindings/net/cpsw.txt | 5 ++++-
  drivers/net/ethernet/ti/cpsw.c                 | 5 +++++
  2 files changed, 9 insertions(+), 1 deletion(-)

quoted

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index fc3263f..4feba2f 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c

[...]

quoted

@@ -1989,6 +1990,10 @@ static int cpsw_probe(struct platform_device *pdev)
  		goto clean_runtime_disable_ret;
  	}

+	/* Don't fail hard if the optional control memory region is missing */
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
+	priv->gmii_sel_reg = devm_ioremap_resource(&pdev->dev, res);

    Hm, but why now you don't fail if devm_ioremap_resource() fails?

Well, because I thought maybe we should just ignore failures of that
kind altogether for this optional resource. There will still be a
warning in that case. Did you like the old approach better?


Daniel