diff options
author | David S. Miller <davem@davemloft.net> | 2017-06-20 13:23:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-20 13:23:06 -0400 |
commit | cc07cb935aec4f608e059f3dcd6242a7ecc4a59b (patch) | |
tree | 78705413a99e6ac6e90fc11f524fb0715ff5e719 /Documentation/devicetree | |
parent | Merge branch 'net-Introduction-of-the-tc-tests' (diff) | |
parent | net-next: stmmac: dwmac-sun8i: add support for V3s EMAC (diff) | |
download | linux-dev-cc07cb935aec4f608e059f3dcd6242a7ecc4a59b.tar.xz linux-dev-cc07cb935aec4f608e059f3dcd6242a7ecc4a59b.zip |
Merge branch 'net-next-stmmac-dwmac-sun8i-add-support-for-V3s'
Icenowy Zheng says:
====================
net-next: stmmac: dwmac-sun8i: add support for V3s
Allwinner V3s features an EMAC like the on in H3, but without external MII
interfaces, so being not able really to use RMII/RGMII.
And it has a different default value of syscon (0x38000 instead of 0x58000
on H3), which shows a problem that the EMAC clock freq should be 24MHz.
(Both H3 and V3s SoCs doesn't have extra xtal input for EPHY, and the
main xtal is 24MHz. The default value of H3 is set to 24MHz, but the V3s
default value is set to 25MHz).
First two patches are device tree binding patches, the third forces
the frequency to 24MHz and the fourth really add the V3s support.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/misc/allwinner,syscon.txt | 1 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/net/dwmac-sun8i.txt | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/misc/allwinner,syscon.txt b/Documentation/devicetree/bindings/misc/allwinner,syscon.txt index cb5769137c6c..31494a24fe69 100644 --- a/Documentation/devicetree/bindings/misc/allwinner,syscon.txt +++ b/Documentation/devicetree/bindings/misc/allwinner,syscon.txt @@ -9,6 +9,7 @@ Required properties for the system controller: - reg: address and length of the register for the device. - compatible: should be "syscon" and one of the following string: "allwinner,sun8i-h3-system-controller" + "allwinner,sun8i-v3s-system-controller" "allwinner,sun50i-a64-system-controller" "allwinner,sun8i-a83t-system-controller" diff --git a/Documentation/devicetree/bindings/net/dwmac-sun8i.txt b/Documentation/devicetree/bindings/net/dwmac-sun8i.txt index 08e708c73193..725f3b187886 100644 --- a/Documentation/devicetree/bindings/net/dwmac-sun8i.txt +++ b/Documentation/devicetree/bindings/net/dwmac-sun8i.txt @@ -7,6 +7,7 @@ Required properties: - compatible: should be one of the following string: "allwinner,sun8i-a83t-emac" "allwinner,sun8i-h3-emac" + "allwinner,sun8i-v3s-emac" "allwinner,sun50i-a64-emac" - reg: address and length of the register for the device. - interrupts: interrupt for the device @@ -22,6 +23,7 @@ Required properties: - syscon: A phandle to the syscon of the SoC with one of the following compatible string: - allwinner,sun8i-h3-system-controller + - allwinner,sun8i-v3s-system-controller - allwinner,sun50i-a64-system-controller - allwinner,sun8i-a83t-system-controller @@ -31,7 +33,9 @@ Optional properties: Both delay properties need to be a multiple of 100. They control the delay for external PHY. -Optional properties for "allwinner,sun8i-h3-emac": +Optional properties for the following compatibles: + - "allwinner,sun8i-h3-emac", + - "allwinner,sun8i-v3s-emac": - allwinner,leds-active-low: EPHY LEDs are active low Required child node of emac: @@ -44,7 +48,9 @@ Required properties of the mdio node: The device node referenced by "phy" or "phy-handle" should be a child node of the mdio node. See phy.txt for the generic PHY bindings. -Required properties of the phy node with "allwinner,sun8i-h3-emac": +Required properties of the phy node with the following compatibles: + - "allwinner,sun8i-h3-emac", + - "allwinner,sun8i-v3s-emac": - clocks: a phandle to the reference clock for the EPHY - resets: a phandle to the reset control for the EPHY |