Hi Sasha,
On 12/27/22 14:35, Sasha Levin wrote:
From: Andre Przywara andre.przywara@arm.com
[ Upstream commit 0f607406525d25019dd9c498bcc0b42734fc59d5 ]
The USB PHY used in the Allwinner H616 SoC inherits some traits from its various predecessors: it has four full PHYs like the H3, needs some extra bits to be set like the H6, and puts SIDDQ on a different bit like the A100. Plus it needs this weird PHY2 quirk.
Name all those properties in a new config struct and assign a new compatible name to it.
Signed-off-by: Andre Przywara andre.przywara@arm.com Reviewed-by: Samuel Holland samuel@sholland.org Link: https://lore.kernel.org/r/20221031111358.3387297-5-andre.przywara@arm.com Signed-off-by: Vinod Koul vkoul@kernel.org Signed-off-by: Sasha Levin sashal@kernel.org
drivers/phy/allwinner/phy-sun4i-usb.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index 651d5e2a25ce..230987e55ece 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -974,6 +974,17 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { .missing_phys = BIT(1) | BIT(2), }; +static const struct sun4i_usb_phy_cfg sun50i_h616_cfg = {
- .num_phys = 4,
- .type = sun50i_h6_phy,
- .disc_thresh = 3,
- .phyctl_offset = REG_PHYCTL_A33,
- .dedicated_clocks = true,
- .phy0_dual_route = true,
- .hci_phy_ctl_clear = PHY_CTL_SIDDQ,
- .needs_phy2_siddq = true,
This will fail to compile without b45c6d80325b ("phy: sun4i-usb: Introduce port2 SIDDQ quirk"). However, like Andre mentioned in reference to the devicetree updates[1], we were not expecting any of these patches to be backported. Since you already dropped the DT portion, there is no need to bother with these two patches either.
Regards, Samuel
[1]: https://lore.kernel.org/lkml/20221220000115.19c152fe@slackpad.lan/
+};
static const struct of_device_id sun4i_usb_phy_of_match[] = { { .compatible = "allwinner,sun4i-a10-usb-phy", .data = &sun4i_a10_cfg }, { .compatible = "allwinner,sun5i-a13-usb-phy", .data = &sun5i_a13_cfg }, @@ -988,6 +999,7 @@ static const struct of_device_id sun4i_usb_phy_of_match[] = { { .compatible = "allwinner,sun50i-a64-usb-phy", .data = &sun50i_a64_cfg}, { .compatible = "allwinner,sun50i-h6-usb-phy", .data = &sun50i_h6_cfg },
- { .compatible = "allwinner,sun50i-h616-usb-phy", .data = &sun50i_h616_cfg }, { },
}; MODULE_DEVICE_TABLE(of, sun4i_usb_phy_of_match);