[PATCH] board: amlogic: vim3: fix phy-names property setup

phy-names was improperly implemented resulting in an inoperable USB-OTG port.
- phy-names = "usb2-phy0\0\0usb2-phy1\0"; + phy-names = "usb2-phy0\0usb2-phy1";
Signed-off-by: Artem Lapkin art@khadas.com --- board/amlogic/vim3/vim3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c index c8ebd676..6a67a39c 100644 --- a/board/amlogic/vim3/vim3.c +++ b/board/amlogic/vim3/vim3.c @@ -109,8 +109,8 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd) }
/* Update PHY names (mandatory to disable USB3.0) */ - len = strlcpy(data, "usb2-phy0", 32) + 1; - len += strlcpy(&data[len], "usb2-phy1", 32 - len) + 1; + len = strlcpy(data, "usb2-phy0", 32); + len += strlcpy(&data[len], "usb2-phy1", 32 - len); ret = fdt_setprop(blob, node, "phy-names", data, len); if (ret < 0) { printf("vim3: failed to update usb phy names property (%d)\n", ret);

On 13/07/2021 08:48, Artem Lapkin wrote:
phy-names was improperly implemented resulting in an inoperable USB-OTG port.
- phy-names = "usb2-phy0\0\0usb2-phy1\0";
- phy-names = "usb2-phy0\0usb2-phy1";
Signed-off-by: Artem Lapkin art@khadas.com
board/amlogic/vim3/vim3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c index c8ebd676..6a67a39c 100644 --- a/board/amlogic/vim3/vim3.c +++ b/board/amlogic/vim3/vim3.c @@ -109,8 +109,8 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd) }
/* Update PHY names (mandatory to disable USB3.0) */
len = strlcpy(data, "usb2-phy0", 32) + 1;
len += strlcpy(&data[len], "usb2-phy1", 32 - len) + 1;
len = strlcpy(data, "usb2-phy0", 32);
ret = fdt_setprop(blob, node, "phy-names", data, len); if (ret < 0) { printf("vim3: failed to update usb phy names property (%d)\n", ret);len += strlcpy(&data[len], "usb2-phy1", 32 - len);
Good catch,
Acked-by: Neil Armstrong narmstrong@baylibre.com
Neil

On 13/07/2021 08:48, Artem Lapkin wrote:
phy-names was improperly implemented resulting in an inoperable USB-OTG port.
- phy-names = "usb2-phy0\0\0usb2-phy1\0";
- phy-names = "usb2-phy0\0usb2-phy1";
Signed-off-by: Artem Lapkin art@khadas.com
board/amlogic/vim3/vim3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c index c8ebd676..6a67a39c 100644 --- a/board/amlogic/vim3/vim3.c +++ b/board/amlogic/vim3/vim3.c @@ -109,8 +109,8 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd) }
/* Update PHY names (mandatory to disable USB3.0) */
len = strlcpy(data, "usb2-phy0", 32) + 1;
len += strlcpy(&data[len], "usb2-phy1", 32 - len) + 1;
len = strlcpy(data, "usb2-phy0", 32);
ret = fdt_setprop(blob, node, "phy-names", data, len); if (ret < 0) { printf("vim3: failed to update usb phy names property (%d)\n", ret);len += strlcpy(&data[len], "usb2-phy1", 32 - len);
Applied to u-boot-amlogic,
Thanks, Neil
participants (2)
-
Artem Lapkin
-
Neil Armstrong