diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/otg_host_mode.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/otg_host_mode.dts
index b1579f3efbf5..0c3b2e16cfe6 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/otg_host_mode.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/otg_host_mode.dts
@@ -26,8 +26,8 @@
 			status = "okay";
 			portnum = <1>;
 			otg = <0>;
-			gpio-vbus-power = "";
-			gpios = <>;
+			gpio-vbus-power;
+			gpios;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/otg_host_mode.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/otg_host_mode.dts
index 53df5fa2185f..843c3b6f3b32 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/otg_host_mode.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/otg_host_mode.dts
@@ -26,8 +26,8 @@
 			status = "okay";
 			portnum = <1>;
 			otg = <0>;
-			gpio-vbus-power = "";
-			gpios = <>;
+			gpio-vbus-power;
+			gpios;
 		};
 	};
 };
diff --git a/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c b/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c
index 66360d8c4c43..d431542c1328 100644
--- a/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c
+++ b/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c
@@ -536,13 +536,14 @@ static int amlogic_new_usb3_v2_probe(struct platform_device *pdev)
 	u32 u3_hhi_mem_pd_shift = 0;
 	u32 u3_hhi_mem_pd_mask = 0;
 	u32 u3_ctrl_iso_shift = 0;
+	int len = 0;
 #if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
 	struct gpio_desc *huben_gd = NULL;
 	struct gpio_desc *hubrst_gd = NULL;
 #endif
 
-	gpio_name = of_get_property(dev->of_node, "gpio-vbus-power", NULL);
-	if (gpio_name) {
+	gpio_name = of_get_property(dev->of_node, "gpio-vbus-power", &len);
+	if (gpio_name && len != 0) {
 		gpio_vbus_power_pin = 1;
 		usb_gd = gpiod_get_index(&pdev->dev,
 				 NULL, 0, GPIOD_OUT_LOW);
@@ -551,8 +552,8 @@ static int amlogic_new_usb3_v2_probe(struct platform_device *pdev)
 	}
 
 #if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
-	gpio_name = of_get_property(dev->of_node, "hub-en", NULL);
-	if (gpio_name) {
+	gpio_name = of_get_property(dev->of_node, "hub-en", &len);
+	if (gpio_name && len != 0) {
 		huben_gd = gpiod_get_index(&pdev->dev,
 				 NULL, 1, GPIOD_OUT_HIGH);
 		if (IS_ERR(huben_gd))
@@ -562,8 +563,8 @@ static int amlogic_new_usb3_v2_probe(struct platform_device *pdev)
 		gpiod_put(huben_gd);
 	}
 
-	gpio_name = of_get_property(dev->of_node, "hub-rst", NULL);
-	if (gpio_name) {
+	gpio_name = of_get_property(dev->of_node, "hub-rst", &len);
+	if (gpio_name && len != 0) {
 		hubrst_gd = gpiod_get_index(&pdev->dev,
 				 NULL, 2, GPIOD_OUT_HIGH);
 		if (IS_ERR(hubrst_gd))