From: Kishon Vijay Abraham I <kishon@ti.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: Chanwoo Choi <cw00.choi@samsung.com>, <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] phy: for 4.9
Date: Thu, 15 Sep 2016 16:26:51 +0530 [thread overview]
Message-ID: <57DA7E73.7070208@ti.com> (raw)
In-Reply-To: <20160915103639.GA27845@kroah.com>
On Thursday 15 September 2016 04:06 PM, Greg KH wrote:
> On Thu, Sep 15, 2016 at 03:52:56PM +0530, Kishon Vijay Abraham I wrote:
>> +Chanwoo
>>
>> Hi Greg,
>>
>> On Thursday 15 September 2016 02:08 PM, Greg KH wrote:
>>> On Wed, Sep 14, 2016 at 01:13:41PM +0530, Kishon Vijay Abraham I wrote:
>>>> Hi Greg,
>>>>
>>>> Please find the phy pull request for 4.9 merge window below. It adds
>>>> 4 new phy drivers, adds support for a couple of phys using existing
>>>> drivers, adds phy_reset() API which can be used by the controller
>>>> drivers to reset the phy and includes misc fixes and cleanups.
>>>>
>>>> It also includes an immutable extcon branch (ib-extcon-phy-4.9) from
>>>> Chanwoo, since the Type-C PHY driver is dependent on extcon.
>>>>
>>>> Let me know if I have to change something.
>>>>
>>>> Thanks
>>>> Kishon
>>>>
>>>> The following changes since commit 017300da3a4547d85e52c2484fc0bd759e1bbcdb:
>>>>
>>>> phy: sun9i-usb: fix error handling (2016-08-12 14:59:10 +0530)
>>>>
>>>> are available in the git repository at:
>>>>
>>>> git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/phy-for-4.9
>>>>
>>>> for you to fetch changes up to b78ea84a7d45b9e5ad2eee429a2140065a39d755:
>>>>
>>>> phy-twl4030-usb: initialize charging-related stuff via pm_runtime (2016-09-14 10:59:12 +0530)
>>>
>>> commit c7914e8dfa4032d24ef7af4c86b9c841ec6b74e6 is odd, it is touching
>>> EXTCON_PROP_DISP_MAX without saying why in the changelog, what happened
>>> there? How do I resolve this?
>>
>> This came from the extcon tree. Chanwoo?
>>>
>>> There are merge issues when I pull this into my usb-next branch in a
>>> number of extcon files:
>>> drivers/extcon/extcon-adc-jack.c
>>> drivers/extcon/extcon-arizona.c
>>> drivers/extcon/extcon-gpio.c
>>> include/linux/extcon.h
>>>
>>> Now I can guess at the merge resolutions, but I doubt you want me to :)
>>>
>>> Can you give me a hint as to what to do here?
>>
>> I guess there was a change in the immutable branch ib-extcon-phy-4.9 after it
>> was merged to PHY tree.
>>
>> The resolution for extcon-adc-jack.c, extcon-arizona.c, extcon-gpio.c should be
>> based on the following patch (it replaces extcon_set_cable_state_ with
>> extcon_set_state_sync)
>>
>> https://git.kernel.org/cgit/linux/kernel/git/gregkh/usb.git/commit/?h=usb-next&id=8670b4598064007abfc44554e713fa2004734e1d
>>
>> The resolution for extcon.h should be based on
>> https://git.kernel.org/cgit/linux/kernel/git/gregkh/usb.git/commit/?h=usb-next&id=c7914e8dfa4032d24ef7af4c86b9c841ec6b74e6
>>
>> Alternatively, I've resolved the conflicts and pushed the linux-phy tree.
>> git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git
>> tags/phy-for-4.9-resolved
>
> Can you do a new pull request for this, so I know I get it correctly?
sure.. here it goes..
The following changes since commit 81522637485dd6ec9de4279c9714d58f884b6091:
Merge tag 'usb-for-v4.9' of
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
(2016-09-14 20:37:50 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git
tags/phy-for-4.9-updated
for you to fetch changes up to e3de5885ddc79341c80caccf820a28a2c5aba146:
Merge branch 'next' into resolution (2016-09-15 15:46:11 +0530)
----------------------------------------------------------------
phy: for 4.9 (with extcon merge resolution)
updated tag for 4.9 based on usb-next along with extcon merge
resolution
phy updates includes:
*) phy driver for USB 3.0 PHY on Northstar
*) phy driver for Rockchip usb2phy
*) phy driver for the Rockchip SoC internal PCIe PHY
*) phy driver for USB Type-C PHY on rk3399
*) phy_reset() API
*) support for Allwinner A64 usb phy, usb2 phy in r8a7796
*) Fixes in twl4030-usb, tegra phy, sun4i-usb phy, da8xx-usb phy
and omap-usb2 phy
*) other misc cleanups
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
----------------------------------------------------------------
Andreas Kemnade (2):
phy-twl4030-usb: better handle musb_mailbox() failure
phy-twl4030-usb: initialize charging-related stuff via pm_runtime
Arnd Bergmann (1):
usb: phy: add USB_SUPPORT dependency
Axel Lin (3):
phy: exynos5-usbdrd: Remove "static" from local variable
phy: bcm-ns2-pcie: Get rid of struct ns2_pci_phy
phy: bcm-ns2-pcie: Set missing .owner field in ns2_pci_phy_ops
Baoyou Xie (2):
phy: tegra: add missing header dependencies
phy: tegra: mark tegra_xusb_lane_lookup_function() static
Chanwoo Choi (12):
extcon: arizona: Remove the usage of extcon_update_state()
extcon: adc-jack: Remove the usage of extcon_set_state()
extcon: gpio: Remove the usage of extcon_set_state()
extcon: Remove the state_store() to prevent the wrong access
extcon: Block the bit masking operation for cable state except for extcon
core
extcon: Add the extcon_type to gather each connector into five category
extcon: Add the support for extcon property according to extcon type
extcon: Add the support for the capability of each property
extcon: Rename the extcon_set/get_state() to maintain the function naming
pattern
extcon: Add the synchronization extcon APIs to support the notification
extcon: Add new EXTCON_DISP_HMD for Head-mounted Display device
extcon: Add new EXTCON_CHG_WPT for Wireless Power Transfer device
Charles Keepax (1):
extcon: arizona: Remove unneeded semi-colon
Chen-Yu Tsai (1):
phy: sun4i-usb: Use spinlock to guard phyctl register access
Chris Zhong (4):
extcon: Add EXTCON_DISP_DP and the property for USB Type-C
phy: Add USB Type-C PHY driver for rk3399
Documentation: bindings: add dt doc for Rockchip USB Type-C PHY
phy: rockchip-typec: add pm runtime support
David Lechner (1):
phy: da8xx-usb: Fix syscon device name
Frank Wang (3):
Documentation: bindings: add DT documentation for Rockchip USB2PHY
phy: rockchip-inno-usb2: add a new driver for Rockchip usb2phy
phy: rockchip-inno-usb2: add COMMON_CLK dependency
Guenter Roeck (1):
extcon: Introduce EXTCON_PROP_USB_SS property for SuperSpeed mode
Hans de Goede (5):
phy-sun4i-usb: Use bool where appropriate
phy-sun4i-usb: Refactor forced session ending
phy-sun4i-usb: Simplify missing dr_mode handling
phy-sun4i-usb: Add support for phy_set_mode
phy-sun4i-usb: Warn when external vbus is detected
Icenowy Zheng (2):
dt: bindings: add bindings for Allwinner A64 usb phy
phy: sun4i: add support for A64 usb phy
Julia Lawall (1):
phy: qcom-ufs: use of_property_read_bool
Kishon Vijay Abraham I (2):
Merge branch 'ib-extcon-phy-4.9' of
git://git.kernel.org/.../chanwoo/extcon into next
Merge branch 'next' into resolution
Maninder Singh (1):
extcon: Fix compile time warning
Rafał Miłecki (1):
phy: bcm-ns-usb3: new driver for USB 3.0 PHY on Northstar
Randy Li (2):
phy: Add reset callback
phy: rockchip-usb: use rockchip_usb_phy_reset to reset phy during wakeup
Sekhar Nori (2):
phy: omap-usb2: support suspend/resume
dt-bindings: phy: ti: add documentation for ti,dra7x-usb2
Shawn Lin (2):
Documentation: bindings: add dt documentation for Rockchip PCIe PHY
phy: add a driver for the Rockchip SoC internal PCIe PHY
Stephen Boyd (1):
extcon: Move extcon_get_edev_by_phandle() errors to dbg level
Venkat Reddy Talla (1):
extcon: adc-jack: update cable state during boot
Yoshihiro Shimoda (2):
phy: rcar-gen3-usb2: revise the example of device tree doc
phy: rcar-gen3-usb2: Add a compatible string for r8a7796
.../devicetree/bindings/phy/bcm-ns-usb3-phy.txt | 23 +
.../bindings/phy/phy-rockchip-inno-usb2.txt | 64 ++
.../devicetree/bindings/phy/phy-rockchip-typec.txt | 101 ++
.../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 6 +-
.../devicetree/bindings/phy/rockchip-pcie-phy.txt | 31 +
.../devicetree/bindings/phy/rockchip-usb-phy.txt | 3 +
.../devicetree/bindings/phy/sun4i-usb-phy.txt | 1 +
Documentation/devicetree/bindings/phy/ti-phy.txt | 2 +
drivers/extcon/extcon-gpio.c | 1 +
drivers/phy/Kconfig | 36 +
drivers/phy/Makefile | 4 +
drivers/phy/phy-bcm-ns-usb3.c | 274 ++++++
drivers/phy/phy-bcm-ns2-pcie.c | 28 +-
drivers/phy/phy-core.c | 15 +
drivers/phy/phy-da8xx-usb.c | 2 +-
drivers/phy/phy-exynos5-usbdrd.c | 4 +-
drivers/phy/phy-omap-usb2.c | 100 +-
drivers/phy/phy-qcom-ufs.c | 6 +-
drivers/phy/phy-rcar-gen3-usb2.c | 1 +
drivers/phy/phy-rockchip-inno-usb2.c | 707 ++++++++++++++
drivers/phy/phy-rockchip-pcie.c | 357 +++++++
drivers/phy/phy-rockchip-typec.c | 1023 ++++++++++++++++++++
drivers/phy/phy-rockchip-usb.c | 20 +
drivers/phy/phy-sun4i-usb.c | 154 +--
drivers/phy/phy-twl4030-usb.c | 25 +-
drivers/phy/tegra/xusb.c | 4 +-
include/linux/extcon.h | 57 ++
include/linux/phy/phy.h | 3 +
28 files changed, 2905 insertions(+), 147 deletions(-)
create mode 100644 Documentation/devicetree/bindings/phy/bcm-ns-usb3-phy.txt
create mode 100644
Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt
create mode 100644 Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt
create mode 100644 Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt
create mode 100644 drivers/phy/phy-bcm-ns-usb3.c
create mode 100644 drivers/phy/phy-rockchip-inno-usb2.c
create mode 100644 drivers/phy/phy-rockchip-pcie.c
create mode 100644 drivers/phy/phy-rockchip-typec.c
next prev parent reply other threads:[~2016-09-15 10:57 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-14 7:43 [GIT PULL] phy: for 4.9 Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 01/51] phy: exynos5-usbdrd: Remove "static" from local variable Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 02/51] dt: bindings: add bindings for Allwinner A64 usb phy Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 03/51] phy: sun4i: add support for " Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 04/51] phy: bcm-ns-usb3: new driver for USB 3.0 PHY on Northstar Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 05/51] phy: qcom-ufs: use of_property_read_bool Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 06/51] Documentation: bindings: add DT documentation for Rockchip USB2PHY Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 07/51] phy: rockchip-inno-usb2: add a new driver for Rockchip usb2phy Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 08/51] Documentation: bindings: add dt documentation for Rockchip PCIe PHY Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 09/51] phy: add a driver for the Rockchip SoC internal " Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 10/51] phy: tegra: add missing header dependencies Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 11/51] phy: tegra: mark tegra_xusb_lane_lookup_function() static Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 12/51] phy: bcm-ns2-pcie: Get rid of struct ns2_pci_phy Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 13/51] phy: bcm-ns2-pcie: Set missing .owner field in ns2_pci_phy_ops Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 14/51] phy: rcar-gen3-usb2: revise the example of device tree doc Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 15/51] phy: rcar-gen3-usb2: Add a compatible string for r8a7796 Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 16/51] phy: omap-usb2: support suspend/resume Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 17/51] dt-bindings: phy: ti: add documentation for ti,dra7x-usb2 Kishon Vijay Abraham I
2016-09-14 7:43 ` [PATCH 18/51] phy: rockchip-inno-usb2: add COMMON_CLK dependency Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 19/51] extcon: adc-jack: update cable state during boot Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 20/51] extcon: Move extcon_get_edev_by_phandle() errors to dbg level Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 21/51] extcon: arizona: Remove unneeded semi-colon Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 22/51] extcon: arizona: Remove the usage of extcon_update_state() Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 23/51] extcon: adc-jack: Remove the usage of extcon_set_state() Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 24/51] extcon: gpio: " Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 25/51] extcon: Remove the state_store() to prevent the wrong access Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 26/51] extcon: Block the bit masking operation for cable state except for extcon core Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 27/51] extcon: Fix compile time warning Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 28/51] extcon: Add the extcon_type to gather each connector into five category Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 29/51] extcon: Add the support for extcon property according to extcon type Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 30/51] extcon: Add the support for the capability of each property Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 31/51] extcon: Rename the extcon_set/get_state() to maintain the function naming pattern Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 32/51] extcon: Add the synchronization extcon APIs to support the notification Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 33/51] extcon: Add EXTCON_DISP_DP and the property for USB Type-C Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 34/51] extcon: Add new EXTCON_DISP_HMD for Head-mounted Display device Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 35/51] extcon: Add new EXTCON_CHG_WPT for Wireless Power Transfer device Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 36/51] extcon: Introduce EXTCON_PROP_USB_SS property for SuperSpeed mode Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 37/51] phy: da8xx-usb: Fix syscon device name Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 38/51] phy: Add USB Type-C PHY driver for rk3399 Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 39/51] Documentation: bindings: add dt doc for Rockchip USB Type-C PHY Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 40/51] usb: phy: add USB_SUPPORT dependency Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 41/51] phy: rockchip-typec: add pm runtime support Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 42/51] phy-sun4i-usb: Use bool where appropriate Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 43/51] phy-sun4i-usb: Refactor forced session ending Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 44/51] phy-sun4i-usb: Simplify missing dr_mode handling Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 45/51] phy-sun4i-usb: Add support for phy_set_mode Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 46/51] phy-sun4i-usb: Warn when external vbus is detected Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 47/51] phy: Add reset callback Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 48/51] phy: rockchip-usb: use rockchip_usb_phy_reset to reset phy during wakeup Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 49/51] phy: sun4i-usb: Use spinlock to guard phyctl register access Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 50/51] phy-twl4030-usb: better handle musb_mailbox() failure Kishon Vijay Abraham I
2016-09-14 7:44 ` [PATCH 51/51] phy-twl4030-usb: initialize charging-related stuff via pm_runtime Kishon Vijay Abraham I
2016-09-15 8:38 ` [GIT PULL] phy: for 4.9 Greg KH
2016-09-15 10:22 ` Kishon Vijay Abraham I
2016-09-15 10:36 ` Greg KH
2016-09-15 10:56 ` Kishon Vijay Abraham I [this message]
2016-09-15 11:13 ` Kishon Vijay Abraham I
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57DA7E73.7070208@ti.com \
--to=kishon@ti.com \
--cc=cw00.choi@samsung.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.