diff --git a/arch/arm64/boot/dts/qcom/glymur.dtsi b/arch/arm64/boot/dts/qcom/glymur.dtsi
index c22560b55670a..97f47540ccd6e 100644
--- a/arch/arm64/boot/dts/qcom/glymur.dtsi
+++ b/arch/arm64/boot/dts/qcom/glymur.dtsi
@@ -5493,8 +5493,6 @@
 					      <&intc GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,
 					      <&pdc 12 IRQ_TYPE_LEVEL_HIGH>,
 					      <&pdc 11 IRQ_TYPE_LEVEL_HIGH>,
-					      <&pdc 14 IRQ_TYPE_LEVEL_HIGH>,
-					      <&pdc 13 IRQ_TYPE_LEVEL_HIGH>,
 					      <&pdc 78 IRQ_TYPE_LEVEL_HIGH>,
 					      <&pdc 77 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "dwc_usb3",
@@ -5504,8 +5502,6 @@
 					  "hs_phy_2",
 					  "dp_hs_phy_1",
 					  "dm_hs_phy_1",
-					  "dp_hs_phy_2",
-					  "dm_hs_phy_2",
 					  "ss_phy_1",
 					  "ss_phy_2";
 
diff --git a/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c b/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
index efeec4709a15d..7db2fbff61638 100644
--- a/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
+++ b/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
@@ -229,7 +229,10 @@ static int eusb2_repeater_set_mode(struct phy *phy,
 static int eusb2_repeater_exit(struct phy *phy)
 {
 	struct eusb2_repeater *rptr = phy_get_drvdata(phy);
+	struct regmap *regmap = rptr->regmap;
+	u32 base = rptr->base;
 
+	regmap_write(regmap, base + EUSB2_EN_CTL1, 0);
 	return regulator_bulk_disable(rptr->cfg->num_vregs, rptr->vregs);
 }