linux/drivers/net/phy, branch v3.12.14

drivers: net: phy: cicada.c: clears warning Use #include instead of

2013-09-17T23:07:00Z

clears following warnings : WARNING: Use include instead of WARNING: Use include instead of Signed-off-by: Avinash Kumar Signed-off-by: David S. Miller

net: mdio-octeon: use platform_{get,set}_drvdata()

2013-09-04T02:38:46Z

Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device. This is a purely cosmetic change. Signed-off-by: Jingoo Han Signed-off-by: David S. Miller

net: mdio-mux-gpio: use dev_get_platdata()

2013-08-30T21:43:39Z

Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly. This is a cosmetic change to make the code simpler and enhance the readability. Signed-off-by: Jingoo Han Signed-off-by: David S. Miller

net: mdio-gpio: use dev_get_platdata()

2013-08-30T21:43:39Z

net: mdio-sun4i: Convert to devm_* api

2013-08-29T18:54:49Z

Use devm_ioremap_resource instead of of_iomap() and devm_kzalloc() instead of kmalloc() to make cleanup paths simpler. This patch also fixes the resource leak caused by missing corresponding iounamp() of the of_iomap(). Signed-off-by: Jisheng Zhang Acked-by: Maxime Ripard Signed-off-by: David S. Miller

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

2013-08-26T20:37:08Z

Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c include/linux/inetdevice.h The inetdevice.h conflict involves moving the IPV4_DEVCONF values into a UAPI header, overlapping additions of some new entries. The iwlwifi conflict is a context overlap. Signed-off-by: David S. Miller

net: phy: mdio-octeon: use platform_set_drvdata()

2013-08-22T03:51:11Z

Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_set_drvdata() with &pdev->dev, so we can directly pass a struct platform_device. Signed-off-by: Libo Chen Signed-off-by: David S. Miller

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

2013-08-21T07:03:38Z

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: rtl8211: fix interrupt on status link change

2013-08-21T00:10:58Z

This is to fix a problem in the rtl8211 where the driver wasn't properly enabled the interrupt on link change status. it has to enable the ineterrupt on the bit 10 in the register 18 (INER). Reported-by: Sharma Bhupesh Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller

net: phy: mdio: add missing __iomem annotation

2013-08-07T23:59:10Z

Added missing __iomem annotation in order to fix the following sparse warnings: drivers/net/phy/mdio-mux-mmioreg.c:51:27: warning: incorrect type in initializer (different address spaces) drivers/net/phy/mdio-mux-mmioreg.c:51:27: expected void *p drivers/net/phy/mdio-mux-mmioreg.c:51:27: got void [noderef] * drivers/net/phy/mdio-mux-mmioreg.c:57:21: warning: incorrect type in argument 1 (different address spaces) drivers/net/phy/mdio-mux-mmioreg.c:57:21: expected void const volatile [noderef] *addr drivers/net/phy/mdio-mux-mmioreg.c:57:21: got void *p drivers/net/phy/mdio-mux-mmioreg.c:60:25: warning: incorrect type in argument 2 (different address spaces) drivers/net/phy/mdio-mux-mmioreg.c:60:25: expected void volatile [noderef] *addr drivers/net/phy/mdio-mux-mmioreg.c:60:25: got void *p drivers/net/phy/mdio-mux-mmioreg.c:64:25: warning: incorrect type in argument 1 (different address spaces) drivers/net/phy/mdio-mux-mmioreg.c:64:25: expected void volatile [noderef] *addr drivers/net/phy/mdio-mux-mmioreg.c:64:25: got void *p Signed-off-by: Jingoo Han Signed-off-by: David S. Miller