linux-toradex.git/drivers/net/phy/micrel.c, branch v3.14.43

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-12-18T21:42:06+00:00

Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller

net: phy: micrel: fix checkpath errors

2013-12-18T05:49:02+00:00

checkpatch spotted a few spaces vs tabs errors, fix them.

Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller

micrel: add support for KSZ8041RNLI

2013-12-11T18:54:13+00:00

Renesas R-Car development boards use KSZ8041RNLI PHY which for some reason has
ID of 0x00221537 that is not documented for KSZ8041-family PHYs and does not
match the  documented ID of  0x0022151x (where 'x' is the revision).  We have
to add the new #define PHY_ID_* and new ksphy_driver[] entry, almost the same
as KSZ8041 one, differing only in the 'phy_id' and 'name' fields.

Signed-off-by: Sergei Shtylyov 
Tested-by: Geert Uytterhoeven 
Signed-off-by: David S. Miller

phy/micrel: Add suspend/resume support to Micrel PHYs

2013-09-20T18:41:03+00:00

All supported Micrel PHYs implement the standard "power down" bit 11 of BMCR,
so this patch adds support using the generic genphy_{suspend,resume} functions.

Signed-off-by: Patrice Vilchez 
[b.brezillon@overkiz.com: adapt to newer kernel and generalize to other phys]
Signed-off-by: Boris BREZILLON 
[nicolas.ferre@atmel.com: commit message modification]
Signed-off-by: Nicolas Ferre 
Cc: David J. Choi 
Signed-off-by: David S. Miller

net/phy: micrel: Add OF configuration support for ksz9021

2013-08-21T07:03:38+00:00

Some boards require custom PHY configuration, for example due to trace
length differences.  Add the ability to configure these registers in
order to get the PHY to function on boards that need it.

Because PHYs are auto-detected based on MDIO device IDs, allow PHY
configuration to be specified in the parent Ethernet device node if no
PHY device node is present.

Signed-off-by: Sean Cross 
Signed-off-by: David S. Miller

net: phy: micrel: Staticize ksz8873mll_read_status()

2013-08-07T23:59:10+00:00

ksz8873mll_read_status() is used only in this file.
Fix the following sparse warning:

drivers/net/phy/micrel.c:147:5: warning: symbol 'ksz8873mll_read_status' was not declared. Should it be static?

Signed-off-by: Jingoo Han 
Signed-off-by: David S. Miller

phy/micrel: move flag handling to function for common use

2013-03-12T10:50:59+00:00

The flag MICREL_PHY_50MHZ_CLK is not of exclusive use of KSZ8051
model. At least KSZ8021 and KSZ8031 models also use it.
This patch moves the handling of this and future flags to a
separate function so that the different PHY models can call it on
their init function, if needed.

Signed-off-by: Hector Palacios 
Signed-off-by: David S. Miller

phy/micrel: Add support for KSZ8031

2013-03-12T10:50:58+00:00

Micrel PHY KSZ8031 is similar to KSZ8021 and also requires the special
initialization of "Operation Mode Strap Override" in reg 0x16
introduced in 212ea99 (phy/micrel: Implement support for KSZ8021).

Signed-off-by: Hector Palacios 
Reviewed-by: Marek Vasut 
Signed-off-by: David S. Miller

net/phy: micrel: Disable asymmetric pause for KSZ9021

2013-02-28T20:37:30+00:00

Phyter KSZ9021 has hardware bug. If asymmetric pause is enabled,
then it is necessary to disconnect and then reconnect the ethernet
cable to get the phyter working. The solution is to disable the
asymmetric pause.

Signed-off-by: Vlastimil Kosar 
Signed-off-by: David S. Miller

drivers/net/phy/micrel_phy: Add support for new PHYs

2013-01-28T23:42:10+00:00

Summary of changes:
.Newly added phys
	-KSZ8081/KSZ8091, which has some phy ids.
	-KSZ8061
	-KSZ9031, which is Gigabit phy.
	-KSZ886X, which has a switch function.
	-KSZ8031, which has a same phy ids with KSZ8021.

Signed-off-by: David J. Choi 
Signed-off-by: David S. Miller