From: David S. Miller Date: Sun, 25 Jan 2015 01:17:16 +0000 (-0800) Subject: Merge branch 'stmmac-dwmac-rk' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5ec274250d55a3fb27caf994e891f86a9529a2cb;p=linux-beck.git Merge branch 'stmmac-dwmac-rk' Romain Perier says: ==================== net: stmmac: dwmac-rk: Fix phy regulator issues This series fixes few issues in dwmac-rk: 1. Voltage settings was hardcoded into the driver for the phy regulator. The driver now uses the default voltage settings found in the devicetree, which are applied throught the regulator framework. 2. The regulator name used to power on or power off the phy was put in the devicetree variable "phy_regulator", which is not standard and added a lot of code for nothing. The driver now uses the devicetree property "phy-supply" and the corresponding functions to manipulate this regulator. The corresponding devicetree files are also updated. As this new binding for rk3288 has not been released with any official kernel yet (not until 3.20), I don't need to care about keeping compatibility with the old non standard property. ==================== Tested-by: Heiko Stuebner Reviewed-by: Heiko Stuebner Signed-off-by: David S. Miller --- 5ec274250d55a3fb27caf994e891f86a9529a2cb