| Message ID | 20250411-livetree-fixup-v2-4-1236823377bb@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Qualcomm: cleanup OF_LIVE fixup and fix RB1/2 | expand |
On 11/04/2025 14:47, Caleb Connolly wrote: > The debug log here had the logic completely backwards, even though the > code is actually correct. Remove it since it's extraneous anyway. > > Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> > --- > arch/arm/mach-snapdragon/of_fixup.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-snapdragon/of_fixup.c b/arch/arm/mach-snapdragon/of_fixup.c > index dcd09ee7cac3e02287647c9e6df5575651e18e85..a5515c02d3de05944dfb7c1b2a5542631b517497 100644 > --- a/arch/arm/mach-snapdragon/of_fixup.c > +++ b/arch/arm/mach-snapdragon/of_fixup.c > @@ -72,13 +72,14 @@ static int fixup_qcom_dwc3(struct device_node *root, struct device_node *glue_np > log_err("Failed to read second phy name: %d\n", ret); > return ret; > } > > - if (!strncmp("usb3-phy", second_phy_name, strlen("usb3-phy"))) { > - log_debug("Second phy isn't superspeed (is '%s') assuming first phy is SS\n", > - second_phy_name); > + /* > + * Determine which phy is the superspeed phy by checking the name of the second phy > + * since it is typically the superspeed one. > + */ > + if (!strncmp("usb3-phy", second_phy_name, strlen("usb3-phy"))) > hsphy_idx = 0; > - } > > /* Overwrite the "phys" property to only contain the high-speed phy */ > ret = of_write_prop(dwc3, "phys", sizeof(*phandles), phandles + hsphy_idx); > if (ret) { > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/arch/arm/mach-snapdragon/of_fixup.c b/arch/arm/mach-snapdragon/of_fixup.c index dcd09ee7cac3e02287647c9e6df5575651e18e85..a5515c02d3de05944dfb7c1b2a5542631b517497 100644 --- a/arch/arm/mach-snapdragon/of_fixup.c +++ b/arch/arm/mach-snapdragon/of_fixup.c @@ -72,13 +72,14 @@ static int fixup_qcom_dwc3(struct device_node *root, struct device_node *glue_np log_err("Failed to read second phy name: %d\n", ret); return ret; } - if (!strncmp("usb3-phy", second_phy_name, strlen("usb3-phy"))) { - log_debug("Second phy isn't superspeed (is '%s') assuming first phy is SS\n", - second_phy_name); + /* + * Determine which phy is the superspeed phy by checking the name of the second phy + * since it is typically the superspeed one. + */ + if (!strncmp("usb3-phy", second_phy_name, strlen("usb3-phy"))) hsphy_idx = 0; - } /* Overwrite the "phys" property to only contain the high-speed phy */ ret = of_write_prop(dwc3, "phys", sizeof(*phandles), phandles + hsphy_idx); if (ret) {
The debug log here had the logic completely backwards, even though the code is actually correct. Remove it since it's extraneous anyway. Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> --- arch/arm/mach-snapdragon/of_fixup.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)