phy: sun4i-usb: add support for the USB PHY on F1C100s SoC
v5 cover phy: sun4i-usb: add support for the USB PHY on F1C100s SoC
Hi,
this is a rebased version of v4[1], with no actual changes. I haven't received any feedback on the last version, but technically this looks mostly approved to me anyway, we just need to get around to merge it now, I guess?
This is a spin-off of v3 of the suniv F1C100s USB support series[2], just carrying the USB PHY bits. It's now based on top of v6.2-rc2. The actual binding and driver changes in the first two patches are straightforward. Since it came up in reviews, I reworked the quirk handling in the phy-sun4i-usb.c driver, to become more maintainable and readable, in patch 3/3. For a changelog, see below.
Cheers,
Andre
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
[2] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Changelog v4 ... v5:
- rebase on top of v6.2-rc2
Changelog v3 ... v4:
- split off from rest of suniv F1C100s USB series
- rebase on top of H616 USB PHY patches
- drop phy2_is_hsic in favour of reusing existing hsic_index member
- add tags
Changelog v2 ... v3:
- remove redundant "Device Tree Bindings" suffix in DT binding doc title
- add BSD license to binding doc file (as per checkpatch)
- use existing PHY sun4i_a10_phy type instead of inventing new one
- add patch to clean up sunxi USB PHY driver
Changelog v1 ... v2:
- USB PHY binding: clarify the relation with other phy-sun4i-usb bindings
Andre Przywara (1):
phy: sun4i-usb: Replace types with explicit quirk flags
Icenowy Zheng (2):
dt-bindings: phy: add binding document for Allwinner F1C100s USB PHY
phy: sun4i-usb: add support for the USB PHY on F1C100s SoC
.../phy/allwinner,suniv-f1c100s-usb-phy.yaml | 83 +++++++++++++++++++ drivers/phy/allwinner/phy-sun4i-usb.c | 59 ++++++------- 2 files changed, 107 insertions(+), 35 deletions(-) create mode 100644 Documentation/devicetree/bindings/phy/allwinner,suniv-f1c100s-usb-phy.yaml
Signature · 1 line
2.25.1
PATCH v5 1/3 dt-bindings: phy: add binding document for Allwinner F1C100s USB PHY
From: Icenowy Zheng <[email protected]>
Allwinner F1C100s has the most simple USB PHY among all Allwinner SoCs, because it has only one OTG USB controller, no host-only OHCI/EHCI controllers.
Add a binding document for it. Following the current situation of one YAML file per SoC, this one is based on allwinner,sun8i-v3s-usb-phy.yaml, but with OHCI/EHCI-related bits removed. (The same driver in Linux, phy-sun4i-usb, covers all these binding files now.)
--- .../phy/allwinner,suniv-f1c100s-usb-phy.yaml | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/allwinner,suniv-f1c100s-usb-phy.yaml
Documentation/devicetree/bindings/phy/allwinner,suniv-f1c100s-usb-phy.yaml new file +83 -0
@@ -0,0 +1,83 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/allwinner,suniv-f1c100s-usb-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner F1C100s USB PHY + +maintainers: + - Chen-Yu Tsai <[email protected]> + - Maxime Ripard <[email protected]> + +properties: + "#phy-cells": + const: 1 + + compatible: + const: allwinner,suniv-f1c100s-usb-phy + + reg: + maxItems: 1 + description: PHY Control registers + + reg-names: + const: phy_ctrl + + clocks: + maxItems: 1 + description: USB OTG PHY bus clock + + clock-names: + const: usb0_phy + + resets: + maxItems: 1 + description: USB OTG reset + + reset-names: + const: usb0_reset + + usb0_id_det-gpios: + maxItems: 1 + description: GPIO to the USB OTG ID pin + + usb0_vbus_det-gpios: + maxItems: 1 + description: GPIO to the USB OTG VBUS detect pin + + usb0_vbus_power-supply: + description: Power supply to detect the USB OTG VBUS + + usb0_vbus-supply: + description: Regulator controlling USB OTG VBUS + +required: + - "#phy-cells" + - compatible + - clocks + - clock-names + - reg + - reg-names + - resets + - reset-names + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/clock/suniv-ccu-f1c100s.h> + #include <dt-bindings/reset/suniv-ccu-f1c100s.h> + + phy@1c13400 { + compatible = "allwinner,suniv-f1c100s-usb-phy"; + reg = <0x01c13400 0x10>; + reg-names = "phy_ctrl"; + clocks = <&ccu CLK_USB_PHY0>; + clock-names = "usb0_phy"; + resets = <&ccu RST_USB_PHY0>; + reset-names = "usb0_reset"; + #phy-cells = <1>; + usb0_id_det-gpios = <&pio 4 2 GPIO_ACTIVE_HIGH>; + };
Signature · 1 line
2.25.1
PATCH v5 2/3 phy: sun4i-usb: add support for the USB PHY on F1C100s SoC
In reply to Andre PrzywaraFrom: Icenowy Zheng <[email protected]>
The F1C100s SoC has one USB OTG port connected to a MUSB controller.
Add support for its USB PHY.
--- drivers/phy/allwinner/phy-sun4i-usb.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/phy/allwinner/phy-sun4i-usb.c +10 -0
@@ -918,6 +918,14 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)return 0 ; } +static const struct sun4i_usb_phy_cfg suniv_f1c100s_cfg = { + .num_phys =1 , + .type = sun4i_a10_phy, + .disc_thresh =3 , + .phyctl_offset =REG_PHYCTL_A10 , + .dedicated_clocks = true, +}; +static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = { .num_phys =3 , .type = sun4i_a10_phy,
@@ -1059,6 +1067,8 @@ static const struct of_device_id sun4i_usb_phy_of_match[] = { .data = &sun50i_a64_cfg}, { .compatible = "allwinner,sun50i-h6-usb-phy", .data = &sun50i_h6_cfg }, { .compatible = "allwinner,sun50i-h616-usb-phy", .data = &sun50i_h616_cfg }, + { .compatible = "allwinner,suniv-f1c100s-usb-phy", + .data = &suniv_f1c100s_cfg }, { }, };MODULE_DEVICE_TABLE (of, sun4i_usb_phy_of_match);
Signature · 1 line
2.25.1
PATCH v5 3/3 phy: sun4i-usb: Replace types with explicit quirk flags
In reply to Andre PrzywaraSo far we were assigning some crude "type" (SoC name, really) to each Allwinner USB PHY model, then guarding certain quirks based on this. This does not only look weird, but gets more or more cumbersome to maintain.
Remove the bogus type names altogether, instead introduce flags for each quirk, and explicitly check for them.
This improves readability, and simplifies future extensions.
--- drivers/phy/allwinner/phy-sun4i-usb.c | 51 ++++++++------------------- 1 file changed, 15 insertions(+), 36 deletions(-)
drivers/phy/allwinner/phy-sun4i-usb.c +15 -36
@@ -99,28 +99,17 @@#define DEBOUNCE_TIME msecs_to_jiffies(50)#define POLL_TIME msecs_to_jiffies(250) -enum sun4i_usb_phy_type { - sun4i_a10_phy, - sun6i_a31_phy, - sun8i_a33_phy, - sun8i_a83t_phy, - sun8i_h3_phy, - sun8i_r40_phy, - sun8i_v3s_phy, - sun50i_a64_phy, - sun50i_h6_phy, -}; -struct sun4i_usb_phy_cfg {int num_phys;int hsic_index; -enum sun4i_usb_phy_type type;u32 disc_thresh;u32 hci_phy_ctl_clear;u8 phyctl_offset;bool dedicated_clocks;bool phy0_dual_route;bool needs_phy2_siddq; +bool siddq_in_base; +bool poll_vbusen;int missing_phys; };
@@ -252,7 +241,8 @@ static void sun4i_usb_phy_passby(struct sun4i_usb_phy *phy, int enable)SUNXI_AHB_INCRX_ALIGN_EN |SUNXI_ULPI_BYPASS_EN ;/* A83T USB2 is HSIC */ -if (phy_data->cfg->type == sun8i_a83t_phy && phy->index ==2 ) +if (phy_data->cfg->hsic_index && + phy->index == phy_data->cfg->hsic_index) bits |=SUNXI_EHCI_HS_FORCE |SUNXI_HSIC_CONNECT_INT |SUNXI_HSIC ;
@@ -340,8 +330,7 @@ static int sun4i_usb_phy_init(struct phy *_phy)writel (val, phy->pmu +REG_HCI_PHY_CTL ); } -if (data->cfg->type == sun8i_a83t_phy || - data->cfg->type == sun50i_h6_phy) { +if (data->cfg->siddq_in_base) {if (phy->index ==0 ) { val =readl (data->base + data->cfg->phyctl_offset); val |=PHY_CTL_VBUSVLDEXT ;
@@ -385,8 +374,7 @@ static int sun4i_usb_phy_exit(struct phy *_phy)struct sun4i_usb_phy_data *data =to_sun4i_usb_phy_data (phy);if (phy->index ==0 ) { -if (data->cfg->type == sun8i_a83t_phy || - data->cfg->type == sun50i_h6_phy) { +if (data->cfg->siddq_in_base) {void __iomem *phyctl = data->base + data->cfg->phyctl_offset;
@@ -466,9 +454,8 @@ static bool sun4i_usb_phy0_poll(struct sun4i_usb_phy_data *data)* vbus using the N_VBUSEN pin on the pmic, so we must poll * when using the pmic for vbus-det _and_ we're driving vbus. */ -if ((data->cfg->type == sun6i_a31_phy || - data->cfg->type == sun8i_a33_phy) && - data->vbus_power_supply && data->phys[0 ].regulator_on) +if (data->cfg->poll_vbusen && data->vbus_power_supply && + data->phys[0 ].regulator_on)return true;return false;
@@ -920,7 +907,6 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)static const struct sun4i_usb_phy_cfg suniv_f1c100s_cfg = { .num_phys =1 , - .type = sun4i_a10_phy, .disc_thresh =3 , .phyctl_offset =REG_PHYCTL_A10 , .dedicated_clocks = true,
@@ -928,7 +914,6 @@ static const struct sun4i_usb_phy_cfg suniv_f1c100s_cfg = {static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = { .num_phys =3 , - .type = sun4i_a10_phy, .disc_thresh =3 , .phyctl_offset =REG_PHYCTL_A10 , .dedicated_clocks = false,
@@ -936,7 +921,6 @@ static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = {static const struct sun4i_usb_phy_cfg sun5i_a13_cfg = { .num_phys =2 , - .type = sun4i_a10_phy, .disc_thresh =2 , .phyctl_offset =REG_PHYCTL_A10 , .dedicated_clocks = false,
@@ -944,15 +928,14 @@ static const struct sun4i_usb_phy_cfg sun5i_a13_cfg = {static const struct sun4i_usb_phy_cfg sun6i_a31_cfg = { .num_phys =3 , - .type = sun6i_a31_phy, .disc_thresh =3 , .phyctl_offset =REG_PHYCTL_A10 , .dedicated_clocks = true, + .poll_vbusen = true, };static const struct sun4i_usb_phy_cfg sun7i_a20_cfg = { .num_phys =3 , - .type = sun4i_a10_phy, .disc_thresh =2 , .phyctl_offset =REG_PHYCTL_A10 , .dedicated_clocks = false,
@@ -960,31 +943,30 @@ static const struct sun4i_usb_phy_cfg sun7i_a20_cfg = {static const struct sun4i_usb_phy_cfg sun8i_a23_cfg = { .num_phys =2 , - .type = sun6i_a31_phy, .disc_thresh =3 , .phyctl_offset =REG_PHYCTL_A10 , .dedicated_clocks = true, + .poll_vbusen = true, };static const struct sun4i_usb_phy_cfg sun8i_a33_cfg = { .num_phys =2 , - .type = sun8i_a33_phy, .disc_thresh =3 , .phyctl_offset =REG_PHYCTL_A33 , .dedicated_clocks = true, + .poll_vbusen = true, };static const struct sun4i_usb_phy_cfg sun8i_a83t_cfg = { .num_phys =3 , .hsic_index =2 , - .type = sun8i_a83t_phy, .phyctl_offset =REG_PHYCTL_A33 , .dedicated_clocks = true, + .siddq_in_base = true, };static const struct sun4i_usb_phy_cfg sun8i_h3_cfg = { .num_phys =4 , - .type = sun8i_h3_phy, .disc_thresh =3 , .phyctl_offset =REG_PHYCTL_A33 , .dedicated_clocks = true,
@@ -994,7 +976,6 @@ static const struct sun4i_usb_phy_cfg sun8i_h3_cfg = {static const struct sun4i_usb_phy_cfg sun8i_r40_cfg = { .num_phys =3 , - .type = sun8i_r40_phy, .disc_thresh =3 , .phyctl_offset =REG_PHYCTL_A33 , .dedicated_clocks = true,
@@ -1004,7 +985,6 @@ static const struct sun4i_usb_phy_cfg sun8i_r40_cfg = {static const struct sun4i_usb_phy_cfg sun8i_v3s_cfg = { .num_phys =1 , - .type = sun8i_v3s_phy, .disc_thresh =3 , .phyctl_offset =REG_PHYCTL_A33 , .dedicated_clocks = true,
@@ -1014,16 +994,15 @@ static const struct sun4i_usb_phy_cfg sun8i_v3s_cfg = {static const struct sun4i_usb_phy_cfg sun20i_d1_cfg = { .num_phys =2 , - .type = sun50i_h6_phy, .phyctl_offset =REG_PHYCTL_A33 , .dedicated_clocks = true, .hci_phy_ctl_clear =PHY_CTL_SIDDQ , .phy0_dual_route = true, + .siddq_in_base = true, };static const struct sun4i_usb_phy_cfg sun50i_a64_cfg = { .num_phys =2 , - .type = sun50i_a64_phy, .disc_thresh =3 , .phyctl_offset =REG_PHYCTL_A33 , .dedicated_clocks = true,
@@ -1033,22 +1012,22 @@ static const struct sun4i_usb_phy_cfg sun50i_a64_cfg = {static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { .num_phys =4 , - .type = sun50i_h6_phy, .phyctl_offset =REG_PHYCTL_A33 , .dedicated_clocks = true, .phy0_dual_route = true, .missing_phys =BIT (1 ) |BIT (2 ), + .siddq_in_base = true, };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, + .siddq_in_base = true, };static const struct of_device_id sun4i_usb_phy_of_match[] = {
Signature · 1 line
2.25.1
Quoted 7 lines · Andre Przywara
Hi,
this is a rebased version of v4[1], with no actual changes. I haven't received any feedback on the last version, but technically this looks mostly approved to me anyway, we just need to get around to merge it now, I guess?
Quoted 6 lines
This is a spin-off of v3 of the suniv F1C100s USB support series[2], just carrying the USB PHY bits. It's now based on top of v6.2-rc2. The actual binding and driver changes in the first two patches are straightforward. Since it came up in reviews, I reworked the quirk handling in the
phy-sun4i-usb.cdriver, to become more maintainable and readable, in patch 3/3. For a changelog, see below.
Applied, thanks
Signature · 1 line
~Vinod