[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1433256225-476-1-git-send-email-kishon@ti.com>
Date: Tue, 2 Jun 2015 20:13:31 +0530
From: Kishon Vijay Abraham I <kishon@...com>
To: <gregkh@...uxfoundation.org>
CC: <kishon@...com>, <linux-kernel@...r.kernel.org>
Subject: [GIT PULL] phy: for v4.2 merge window
Hi Greg,
Here's the PHY pull request for 4.2 merge window. Please find below
the list of changes that goes in this pull request.
There was a merge conflict in Makefile and Kconfig while trying to merge
with your usb-next branch. It's because one of the PHY drivers (TUSB1210)
went via balbi's tree due to it's dependecy with USB_ULPI_BUS and it
conflicts with BRCMSTB_SATA. The resolution should have both TUSB1210 and
BRCMSTB_SATA present.
Let me know If I have to change something.
Cheers
Kishon
The following changes since commit 2decb2682f80759f631c8332f9a2a34a02150a03:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2015-04-27 14:05:19 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/phy-for-v4.2
for you to fetch changes up to 692fbb89fa0b8028f402e33eb912474e11b5f435:
phy: twl4030-usb: add ABI documentation (2015-06-01 16:08:24 +0530)
----------------------------------------------------------------
phy: for 4.2 merge window
*) new Broadcom SATA3 PHY driver for Broadcom STB SoCs
*) new phy API to get PHY by index which is used in EHCI and
OHCI controller drivers
*) support specifying supply at port level used for multi-port PHYs
*) sparse warning fixes in miphy PHYs
*) fix pm_runtime issues in twl4030 driver
Signed-off-by: Kishon Vijay Abraham I <kishon@...com>
----------------------------------------------------------------
Arun Ramamurthy (3):
phy: core: Add devm_of_phy_get_by_index to phy-core
usb: ehci-platform: Use devm_of_phy_get_by_index
usb: ohci-platform: Use devm_of_phy_get_by_index
Axel Lin (1):
phy: core: Check requested PHY status in _of_phy_get()
Brian Norris (2):
Documentation: devicetree: add Broadcom SATA PHY binding
phy: add Broadcom SATA3 PHY driver for Broadcom STB SoCs
Dmitry Torokhov (1):
phy: phy-core: allow specifying supply at port level
Felipe Balbi (2):
phy: miphy28lp: fix sparse warnings
phy: miphy365x: fix sparse warnings
NeilBrown (4):
phy: twl4030-usb: make runtime pm more reliable.
phy: twl4030-usb: remove pointless 'suspended' test in 'suspend' callback.
phy: twl4030-usb: remove incorrect pm_runtime_get_sync() in probe function.
phy: twl4030-usb: add ABI documentation
Yoshihiro Shimoda (1):
phy: rcar-gen2: Add support for R-Car E2
.../ABI/testing/sysfs-platform-twl4030-usb | 8 +
.../bindings/phy/brcm,brcmstb-sata-phy.txt | 40 ++++
.../devicetree/bindings/phy/rcar-gen2-phy.txt | 1 +
Documentation/phy.txt | 7 +-
drivers/phy/Kconfig | 9 +
drivers/phy/Makefile | 1 +
drivers/phy/phy-brcmstb-sata.c | 216 ++++++++++++++++++++
drivers/phy/phy-core.c | 67 ++++--
drivers/phy/phy-miphy28lp.c | 9 +-
drivers/phy/phy-miphy365x.c | 9 +-
drivers/phy/phy-rcar-gen2.c | 6 +-
drivers/phy/phy-twl4030-usb.c | 34 +--
drivers/usb/host/ehci-platform.c | 69 +++----
drivers/usb/host/ohci-platform.c | 69 +++----
include/linux/phy/phy.h | 9 +
15 files changed, 415 insertions(+), 139 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-platform-twl4030-usb
create mode 100644 Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt
create mode 100644 drivers/phy/phy-brcmstb-sata.c
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists