| Message ID | 1377247417-27386-3-git-send-email-zonque@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 23-08-2013 12:43, Daniel Mack wrote: > At least the AM33xx SoC has a control module register to configure > details such as the hardware ethernet interface mode. > 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. > Signed-off-by: Daniel Mack <zonque@gmail.com> [...] > diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c > index 1a91aac..bd0b664 100644 > --- a/drivers/net/ethernet/ti/cpsw.c > +++ b/drivers/net/ethernet/ti/cpsw.c [...] > @@ -1999,6 +2000,21 @@ static int cpsw_probe(struct platform_device *pdev) > goto clean_runtime_disable_ret; > } > > + /* If the control memory region is unspecified, continue without it. > + * If it is specified, but we're unable to reserve it, bail. > + */ > + res = platform_get_resource(pdev, IORESOURCE_MEM, 2); > + if (!res) { > + dev_err(priv->dev, "error getting control i/o resource\n"); If the resource is optional, why use dev_err()? > + goto no_gmii_sel; > + } > + priv->gmii_sel_reg = devm_ioremap_resource(&pdev->dev, res); > + if (!priv->gmii_sel_reg) { devm_ioremap_resource() doesn't return NULL, it returns error, so you should check with IS_ERR() and propagate the error to the caller with PTR_ERR(). > + dev_err(priv->dev, "unable to map control i/o region\n"); devm_ioremap_resource() prints out the error messages itself, so you don't have to. > + goto clean_runtime_disable_ret; > + } > + > +no_gmii_sel: > memset(&dma_params, 0, sizeof(dma_params)); > memset(&ale_params, 0, sizeof(ale_params)); WBR, Sergei
On 23.08.2013 16:03, Sergei Shtylyov wrote: > On 23-08-2013 12:43, Daniel Mack wrote: >> + dev_err(priv->dev, "unable to map control i/o region\n"); > > devm_ioremap_resource() prints out the error messages itself, so you don't > have to. Right. Thanks. Will send a v4. Best, Daniel
diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt index 05d660e..4e5ca54 100644 --- a/Documentation/devicetree/bindings/net/cpsw.txt +++ b/Documentation/devicetree/bindings/net/cpsw.txt @@ -4,7 +4,10 @@ TI SoC Ethernet Switch Controller Device Tree Bindings Required properties: - compatible : Should be "ti,cpsw" - reg : physical base address and size of the cpsw - registers map + registers map. + An optional third memory region can be supplied if + the platform has a control module register to + configure phy interface details - interrupts : property with a value describing the interrupt number - interrupt-parent : The parent interrupt controller diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 1a91aac..bd0b664 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -372,6 +372,7 @@ struct cpsw_priv { struct cpsw_platform_data data; struct cpsw_ss_regs __iomem *regs; struct cpsw_wr_regs __iomem *wr_regs; + u32 __iomem *gmii_sel_reg; u8 __iomem *hw_stats; struct cpsw_host_regs __iomem *host_port_regs; u32 msg_enable; @@ -1999,6 +2000,21 @@ static int cpsw_probe(struct platform_device *pdev) goto clean_runtime_disable_ret; } + /* If the control memory region is unspecified, continue without it. + * If it is specified, but we're unable to reserve it, bail. + */ + res = platform_get_resource(pdev, IORESOURCE_MEM, 2); + if (!res) { + dev_err(priv->dev, "error getting control i/o resource\n"); + goto no_gmii_sel; + } + priv->gmii_sel_reg = devm_ioremap_resource(&pdev->dev, res); + if (!priv->gmii_sel_reg) { + dev_err(priv->dev, "unable to map control i/o region\n"); + goto clean_runtime_disable_ret; + } + +no_gmii_sel: memset(&dma_params, 0, sizeof(dma_params)); memset(&ale_params, 0, sizeof(ale_params));
At least the AM33xx SoC has a control module register to configure details such as the hardware ethernet interface mode. 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. Signed-off-by: Daniel Mack <zonque@gmail.com> --- Documentation/devicetree/bindings/net/cpsw.txt | 5 ++++- drivers/net/ethernet/ti/cpsw.c | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-)