Commit 6e36145d authored by David S. Miller's avatar David S. Miller

Merge branch 'stmmac'

Giuseppe Cavallaro says:

====================
stmmac: review and fix the dwmac-sti glue-logic

This patch is to review the whole glue logic adopted on STi SoCs that
was bugged.
In the old glue-logic there was a lot of confusion when setup the
retiming especially for STiD127 where, for example, the bits 6 and 7
(in the GMAC  control register) have a different meaning of what is
used for STiH4xx SoCs. So we cannot adopt the same glue for all these
SoCs.
Moreover, GiGa on STiD127 didn't work and, for all the SoCs, the RGMII
couldn't run when the speed was 10Mbps (because the clock was not properly
managed).
Note that the phy clock needs to be provided by the platform as well as
documented in the related binding file (updated as consequence).

The old code supported too many configurations never adopted and validated.
This made the code very complex to maintain and debug in case of issues.

The patch simplifies all the configurations as commented in the tables
inside the file and obviously it has been tested on all the boards
based on the SoCs mentioned.

With this patch, the dwmac-sti is also ready to support new configurations that
will be available on next SoC generations.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8c2a7a5d 53b26b9b
STMicroelectronics SoC DWMAC glue layer controller STMicroelectronics SoC DWMAC glue layer controller
This file documents differences between the core properties in
Documentation/devicetree/bindings/net/stmmac.txt
and what is needed on STi platforms to program the stmmac glue logic.
The device node has following properties. The device node has following properties.
Required properties: Required properties:
- compatible : Can be "st,stih415-dwmac", "st,stih416-dwmac" or - compatible : Can be "st,stih415-dwmac", "st,stih416-dwmac",
"st,stid127-dwmac". "st,stih407-dwmac", "st,stid127-dwmac".
- reg : Offset of the glue configuration register map in system - reg : Offset of the glue configuration register map in system
configuration regmap pointed by st,syscon property and size. configuration regmap pointed by st,syscon property and size.
- st,syscon : Should be phandle to system configuration node which
- reg-names : Should be "sti-ethconf".
- st,syscon : Should be phandle to system configuration node which
encompases this glue registers. encompases this glue registers.
- st,gmac_en: this is to enable the gmac into a dedicated sysctl control
register available on STiH407 SoC.
- sti-ethconf: this is the gmac glue logic register to enable the GMAC,
select among the different modes and program the clk retiming.
- pinctrl-0: pin-control for all the MII mode supported.
- st,tx-retime-src: On STi Parts for Giga bit speeds, 125Mhz clocks can be Optional properties:
wired up in from different sources. One via TXCLK pin and other via CLK_125 - resets : phandle pointing to the system reset controller with correct
pin. This wiring is totally board dependent. However the retiming glue reset line index for ethernet reset.
logic should be configured accordingly. Possible values for this property - st,ext-phyclk: valid only for RMII where PHY can generate 50MHz clock or
MAC can generate it.
"txclk" - if 125Mhz clock is wired up via txclk line. - st,tx-retime-src: This specifies which clk is wired up to the mac for
"clk_125" - if 125Mhz clock is wired up via clk_125 line. retimeing tx lines. This is totally board dependent and can take one of the
posssible values from "txclk", "clk_125" or "clkgen".
This property is only valid for Giga bit setup( GMII, RGMII), and it is If not passed, the internal clock will be used by default.
un-used for non-giga bit (MII and RMII) setups. Also note that internal - sti-ethclk: this is the phy clock.
clockgen can not generate stable 125Mhz clock. - sti-clkconf: this is an extra sysconfig register, available in new SoCs,
to program the clk retiming.
- st,ext-phyclk: This boolean property indicates who is generating the clock - st,gmac_en: to enable the GMAC, this only is present in some SoCs; e.g.
for tx and rx. This property is only valid for RMII case where the clock can STiH407.
be generated from the MAC or PHY.
- clock-names: should be "sti-ethclk".
- clocks: Should point to ethernet clockgen which can generate phyclk.
Example: Example:
ethernet0: dwmac@fe810000 { ethernet0: dwmac@9630000 {
device_type = "network"; device_type = "network";
compatible = "st,stih416-dwmac", "snps,dwmac", "snps,dwmac-3.710"; status = "disabled";
reg = <0xfe810000 0x8000>, <0x8bc 0x4>; compatible = "st,stih407-dwmac", "snps,dwmac", "snps,dwmac-3.710";
reg-names = "stmmaceth", "sti-ethconf"; reg = <0x9630000 0x8000>, <0x80 0x4>;
interrupts = <0 133 0>, <0 134 0>, <0 135 0>; reg-names = "stmmaceth", "sti-ethconf";
interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
phy-mode = "mii";
st,syscon = <&syscfg_rear>; st,syscon = <&syscfg_sbc_reg>;
st,gmac_en;
resets = <&softreset STIH407_ETH1_SOFTRESET>;
reset-names = "stmmaceth";
snps,pbl = <32>; interrupts = <GIC_SPI 98 IRQ_TYPE_NONE>,
<GIC_SPI 99 IRQ_TYPE_NONE>,
<GIC_SPI 100 IRQ_TYPE_NONE>;
interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
snps,pbl = <32>;
snps,mixed-burst; snps,mixed-burst;
resets = <&softreset STIH416_ETH0_SOFTRESET>; pinctrl-names = "default";
reset-names = "stmmaceth"; pinctrl-0 = <&pinctrl_rgmii1>;
pinctrl-0 = <&pinctrl_mii0>;
pinctrl-names = "default"; clock-names = "stmmaceth", "sti-ethclk";
clocks = <&CLK_S_GMAC0_PHY>; clocks = <&CLK_S_C0_FLEXGEN CLK_EXT2F_A9>,
clock-names = "stmmaceth"; <&CLK_S_C0_FLEXGEN CLK_ETH_PHY>;
}; };
...@@ -40,6 +40,7 @@ static const struct of_device_id stmmac_dt_ids[] = { ...@@ -40,6 +40,7 @@ static const struct of_device_id stmmac_dt_ids[] = {
{ .compatible = "st,stih415-dwmac", .data = &sti_gmac_data}, { .compatible = "st,stih415-dwmac", .data = &sti_gmac_data},
{ .compatible = "st,stih416-dwmac", .data = &sti_gmac_data}, { .compatible = "st,stih416-dwmac", .data = &sti_gmac_data},
{ .compatible = "st,stid127-dwmac", .data = &sti_gmac_data}, { .compatible = "st,stid127-dwmac", .data = &sti_gmac_data},
{ .compatible = "st,stih407-dwmac", .data = &sti_gmac_data},
#endif #endif
#ifdef CONFIG_DWMAC_SOCFPGA #ifdef CONFIG_DWMAC_SOCFPGA
{ .compatible = "altr,socfpga-stmmac", .data = &socfpga_gmac_data }, { .compatible = "altr,socfpga-stmmac", .data = &socfpga_gmac_data },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment