From 62a6bd61d8832d106c46fbbcd3e9c798fecfe215 Mon Sep 17 00:00:00 2001 From: Frank Wang Date: Mon, 22 May 2023 09:42:09 +0800 Subject: [PATCH] phy: rockchip: usbdp: fix compile error for kernel 5.19 Fix the typec_switch and typec_mux object to align with Commit 713fd49b430c ("usb: typec: mux: Introduce indirection"). Signed-off-by: Frank Wang Change-Id: Ibb526c3d65a495426abf8c911f92df065b545132 --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c index f1a5169e16d3..e0ad8a5130c1 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -107,8 +107,8 @@ struct rockchip_udphy { struct regmap *udphygrf; struct regmap *usbgrf; struct regmap *vogrf; - struct typec_switch *sw; - struct typec_mux *mux; + struct typec_switch_dev *sw; + struct typec_mux_dev *mux; struct mutex mutex; /* mutex to protect access to individual PHYs */ /* clocks and rests */ @@ -583,7 +583,7 @@ static int upphy_set_typec_default_mapping(struct rockchip_udphy *udphy) return 0; } -static int udphy_orien_sw_set(struct typec_switch *sw, +static int udphy_orien_sw_set(struct typec_switch_dev *sw, enum typec_orientation orien) { struct rockchip_udphy *udphy = typec_switch_get_drvdata(sw); @@ -1065,7 +1065,7 @@ static const struct phy_ops rockchip_u3phy_ops = { .owner = THIS_MODULE, }; -static int usbdp_typec_mux_set(struct typec_mux *mux, +static int usbdp_typec_mux_set(struct typec_mux_dev *mux, struct typec_mux_state *state) { struct rockchip_udphy *udphy = typec_mux_get_drvdata(mux);