| Message ID | 1377283987-20040-3-git-send-email-zonque@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 08/23/2013 10:53 PM, 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> > --- > Documentation/devicetree/bindings/net/cpsw.txt | 5 ++++- > drivers/net/ethernet/ti/cpsw.c | 5 +++++ > 2 files changed, 9 insertions(+), 1 deletion(-) > 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 [...] > @@ -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? WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 23.08.2013 21:10, Sergei Shtylyov wrote: > Hello. > > On 08/23/2013 10:53 PM, 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> >> --- >> Documentation/devicetree/bindings/net/cpsw.txt | 5 ++++- >> drivers/net/ethernet/ti/cpsw.c | 5 +++++ >> 2 files changed, 9 insertions(+), 1 deletion(-) > >> 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 > [...] >> @@ -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 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 fc3263f..4feba2f 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; @@ -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); + 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 | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-)