diff --git a/arch/arm/boot/dts/amlogic/meson-s7d.dtsi b/arch/arm/boot/dts/amlogic/meson-s7d.dtsi index a8332bf18..ec4463134 100644 --- a/arch/arm/boot/dts/amlogic/meson-s7d.dtsi +++ b/arch/arm/boot/dts/amlogic/meson-s7d.dtsi @@ -725,7 +725,7 @@ pll-setting-1 = <0x244a0030>; pll-setting-2 = <0x03200022>; pll-setting-4 = <0x7e18>; - pll-setting-5 = <0x7>; + pll-setting-5 = <0x9>; //dis-thred-enhance = <0x2>; pll-version = <3>; phy0-reset-level-bit = <8>; @@ -746,7 +746,7 @@ pll-setting-1 = <0x244a0030>; pll-setting-2 = <0x03200022>; pll-setting-4 = <0x7e18>; - pll-setting-5 = <0x7>; + pll-setting-5 = <0x9>; //dis-thred-enhance = <0x2>; pll-version = <3>; phy0-reset-level-bit = <9>; diff --git a/arch/arm64/boot/dts/amlogic/meson-s7d.dtsi b/arch/arm64/boot/dts/amlogic/meson-s7d.dtsi index 308f2e1a3..c5d9965c0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-s7d.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-s7d.dtsi @@ -726,7 +726,7 @@ pll-setting-1 = <0x244a0030>; pll-setting-2 = <0x03200022>; pll-setting-4 = <0x7e18>; - pll-setting-5 = <0x7>; + pll-setting-5 = <0x9>; //dis-thred-enhance = <0x2>; pll-version = <3>; phy0-reset-level-bit = <8>; @@ -747,7 +747,7 @@ pll-setting-1 = <0x244a0030>; pll-setting-2 = <0x03200022>; pll-setting-4 = <0x7e18>; - pll-setting-5 = <0x7>; + pll-setting-5 = <0x9>; //dis-thred-enhance = <0x2>; pll-version = <3>; phy0-reset-level-bit = <9>; diff --git a/drivers/usb/crgdrdphy/phy-aml-crg-drd-usb2.c b/drivers/usb/crgdrdphy/phy-aml-crg-drd-usb2.c index f05893362..13730a784 100644 --- a/drivers/usb/crgdrdphy/phy-aml-crg-drd-usb2.c +++ b/drivers/usb/crgdrdphy/phy-aml-crg-drd-usb2.c @@ -45,6 +45,8 @@ static void usb_set_calibration_trim cali = cali >> 8; if (cali_en) { cali = cali & 0xf; + if (is_meson_s7d_cpu()) + cali = cali + 2; if (cali > 12) cali = 12; } else {