Skip to content

Commit

Permalink
Merge branch 'stmmac-IPQ806x'
Browse files Browse the repository at this point in the history
Mathieu Olivari says:

====================
Add support for QCA IPQ806x Ethernet GMAC controller

This patch set adds support for the integrated Ethernet GMAC controller
on QCA IPQ806x SoC. This controller is based on a Gigabit Synopsys
DesignWare IP, already supported in the stmmac driver located in
drivers/net/ethernet/stmicro/stmmac.

This change is done as a follow-up to the following thread:
*http://www.spinics.net/lists/netdev/msg311265.html
While previous attempt was creating a new driver to drive this controller,
this new post leverages the existing stmmac driver by implementing the
SoC specific glue to it.

Aside from the pure stmmac glue layer, we have a couple of related
patches:
*IPQ806x NSS clock addition is cherry-picked and refreshed from the
 following thread: https://lkml.org/lkml/2014/8/6/390
*phy-handle and fixed-link support are also added in this change set so the
 driver can be fully functional on platforms using device-trees as well as
 ethernet switches.

V2:
 *Fix MODULE_LICENSE to "Dual BSD/GPL" as the dwmac-ipq806x.c is using
  ISC license.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed May 31, 2015
2 parents a74eab6 + 95e130a commit 5befa5e
Show file tree
Hide file tree
Showing 10 changed files with 1,089 additions and 14 deletions.
35 changes: 35 additions & 0 deletions Documentation/devicetree/bindings/net/ipq806x-dwmac.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
* IPQ806x DWMAC Ethernet controller

The device inherits all the properties of the dwmac/stmmac devices
described in the file net/stmmac.txt with the following changes.

Required properties:

- compatible: should be "qcom,ipq806x-gmac" along with "snps,dwmac"
and any applicable more detailed version number
described in net/stmmac.txt

- qcom,nss-common: should contain a phandle to a syscon device mapping the
nss-common registers.

- qcom,qsgmii-csr: should contain a phandle to a syscon device mapping the
qsgmii-csr registers.

Example:

gmac: ethernet@37000000 {
device_type = "network";
compatible = "qcom,ipq806x-gmac";
reg = <0x37000000 0x200000>;
interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "macirq";

qcom,nss-common = <&nss_common>;
qcom,qsgmii-csr = <&qsgmii_csr>;

clocks = <&gcc GMAC_CORE1_CLK>;
clock-names = "stmmaceth";

resets = <&gcc GMAC_CORE1_RESET>;
reset-names = "stmmaceth";
};
Loading

0 comments on commit 5befa5e

Please sign in to comment.