From: Gary Yang <gary.yang@cixtech.com>
To: Vinod Koul <vkoul@kernel.org>,
Neil Armstrong <neil.armstrong@linaro.org>,
Manivannan Sadhasivam <mani@kernel.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Fugang Duan <fugang.duan@cixtech.com>
Cc: Gary Yang <gary.yang@cixtech.com>, Luo Liu <Luo.Liu@cixtech.com>,
CIX Linux Kernel Upstream Group <cix-kernel-upstream@cixtech.com>,
linux-phy@lists.infradead.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 0/2] phy: cix: add Sky1 USB/DP combo PHY support
Date: Tue, 17 Nov 2026 16:34:32 +0800 [thread overview]
Message-ID: <20261117083434.3414417-1-gary.yang@cixtech.com> (raw)
In-Reply-To: <20261102082112.2306326-1-gary.yang@cixtech.com>
This series adds support for the USB/DP combo PHY of the CIX Sky1 SoC.
Each PHY instance drives one SuperSpeedPlus USB lane and up to four
DisplayPort lanes of a USB Type-C port. The USB and the DP controller get
their own PHY through the PHY_TYPE_USB3 and PHY_TYPE_DP cells. Plug
orientation and the USB/DP mode decision are taken by the Type-C connector
driver; the PHY consumes them through the Type-C switch and mux API.
The USB and the DisplayPort controllers and the Type-C connector are not
yet described in the CIX device trees. The graph links and the consumers
will be added together with them.
Patch 1 adds the binding and patch 2 the driver. The SoC and board nodes
are sent separately as a follow-up, since they go through the SoC tree.
Patch 2 builds on Luo Liu's "Add Sky1 DisplayPort PHY support" series:
https://lore.kernel.org/linux-phy/20261102030425.1957585-1-Luo.Liu@cixtech.com
That series creates drivers/phy/cix/ together with the PHY_CIX_DP Kconfig
symbol and the CIX SKY1 DISPLAYPORT PHY DRIVER MAINTAINERS entry. This
series adds the PHY_CIX_USBDP symbol and the new binding, and renames the
entry to CIX SKY1 PHY DRIVERS. It should be applied on top of Luo's series
to avoid conflicts in drivers/phy/cix/{Kconfig,Makefile} and MAINTAINERS.
Changes in v2:
- Replace the hand-written regmap backend over the PHY registers with
direct writel()/readl() access.
- Take the DP link rate in Mb/s, as defined by struct
phy_configure_opts_dp, and select the register table from the link
configuration entry instead of repeating it per case.
- Protect the PHY state with guard(mutex) and drop the goto-based unlock
paths.
- Use dev_err_probe() consistently in probe().
- Fix local variable ordering in probe() and sky1_udphy_init(), and
drop the unused register read.
- Lowercase hex constants, fix overlong lines, add the missing copyright
header and a missing newline before return.
- Move the driver out of ARM/CIX SOC SUPPORT into the CIX SKY1 PHY DRIVERS
entry, and drop the commit message claim about the bootloader handing
over an initialized port.
- Validate the DP link rate before the PLL is touched, so that an
unsupported rate no longer leaves PLL1 disabled.
- Honour set_rate, set_lanes and set_voltages independently, and keep the
negotiated lane count in the driver, so that a caller that only updates
the voltage swing and pre-emphasis levels, as dw-dp does, works with an
uninitialised lanes field. Validate all of the options before any of
them is applied.
- Program the TX voltage swing and pre-emphasis levels per lane instead
of applying the settings of lane 0 to all lanes.
- Add .init to the USB3 PHY ops and only touch the PHY registers while
the PHY is powered.
- Track the active and the requested mode separately and reprogram the
PHY on the next power-on only when the alt mode or the plug orientation
has changed, instead of enabling the APB clock a second time.
- Reset the PHY when it is reprogrammed, and only reprogram it when the
register table actually changes, so that an active USB link is left
alone when the mode changes between USB and USB+DisplayPort.
- Handle the deprecated DisplayPort pin assignment F as a USB+DP state,
like the other Type-C mux drivers do.
- Report the DisplayPort lane count only after the PHY has been powered
on.
- Ignore Type-C mux states of alt modes other than DisplayPort, which
used to be mistaken for a DisplayPort state because the state numbers
overlap.
- Describe the two PHYs with #phy-cells = <1> instead of child nodes,
reference the common USB switch binding, describe the Type-C graph
connection, and drop the cix,default-conf property.
- Keep the binding example limited to the PHY node and its graph ports,
and drop the stubbed USB and DisplayPort consumers.
Gary Yang (2):
dt-bindings: phy: add CIX Sky1 USB/DP combo PHY
phy: cix: add Sky1 USB/DP combo PHY driver
.../bindings/phy/cix,sky1-usbdp-phy.yaml | 150 ++
MAINTAINERS | 4 +-
drivers/phy/cix/Kconfig | 16 +
drivers/phy/cix/Makefile | 1 +
drivers/phy/cix/phy-cix-usbdp.c | 1422 +++++++++++++++++
drivers/phy/cix/phy-cix-usbdp.h | 257 +++
6 files changed, 1849 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/phy/cix,sky1-usbdp-phy.yaml
create mode 100644 drivers/phy/cix/phy-cix-usbdp.c
create mode 100644 drivers/phy/cix/phy-cix-usbdp.h
--
2.50.1
next prev parent reply other threads:[~2026-11-17 8:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-02 8:21 [PATCH 0/3] phy: cix: add Sky1 USB/DP combo PHY Gary Yang
2026-11-02 8:21 ` [PATCH 1/3] dt-bindings: phy: add CIX " Gary Yang
2026-11-02 8:21 ` [PATCH 2/3] phy: cix: add Sky1 USB/DP combo PHY driver Gary Yang
2026-11-15 20:35 ` Manivannan Sadhasivam
2026-11-02 8:21 ` [PATCH 3/3] arm64: dts: cix: add Sky1 USB/DP combo PHY Gary Yang
2026-11-17 8:34 ` Gary Yang [this message]
2026-11-17 8:34 ` [PATCH v2 1/2] dt-bindings: phy: add CIX " Gary Yang
2026-11-17 8:34 ` [PATCH v2 2/2] phy: cix: add Sky1 USB/DP combo PHY driver Gary Yang
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=20261117083434.3414417-1-gary.yang@cixtech.com \
--to=gary.yang@cixtech.com \
--cc=Luo.Liu@cixtech.com \
--cc=cix-kernel-upstream@cixtech.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=fugang.duan@cixtech.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=mani@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=robh@kernel.org \
--cc=vkoul@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox