From e2765ce8925ce7bd1c7d904d362b04cba6a9f06b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sat, 22 Oct 2022 00:11:03 +0200 Subject: [PATCH] Adjust media edge kernel compilation (#4314) --- config/kernel/linux-media-edge.config | 2 +- ...-general-add-dwc3-xhci-usb-trb-quirk.patch | 16 +++++----- .../archive/media-6.0/600-usb-fix.patch | 31 ------------------- 3 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 patch/kernel/archive/media-6.0/600-usb-fix.patch diff --git a/config/kernel/linux-media-edge.config b/config/kernel/linux-media-edge.config index 0c34bcc256..03f8b9e9a1 100644 --- a/config/kernel/linux-media-edge.config +++ b/config/kernel/linux-media-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.0.0-rc7 Kernel Configuration +# Linux/arm64 6.0.2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y diff --git a/patch/kernel/archive/media-6.0/340-general-add-dwc3-xhci-usb-trb-quirk.patch b/patch/kernel/archive/media-6.0/340-general-add-dwc3-xhci-usb-trb-quirk.patch index 3cca7e731c..a7b54970dc 100644 --- a/patch/kernel/archive/media-6.0/340-general-add-dwc3-xhci-usb-trb-quirk.patch +++ b/patch/kernel/archive/media-6.0/340-general-add-dwc3-xhci-usb-trb-quirk.patch @@ -8,8 +8,8 @@ index 841daec70..48825b870 100644 "snps,dis-tx-ipgap-linecheck-quirk"); + dwc->xhci_trb_ent_quirk = device_property_read_bool(dev, + "snps,xhci-trb-ent-quirk"); - dwc->parkmode_disable_ss_quirk = device_property_read_bool(dev, - "snps,parkmode-disable-ss-quirk"); + dwc->resume_hs_terminations = device_property_read_bool(dev, + "snps,resume-hs-terminations"); diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 1b241f937..e1ded14fd 100644 @@ -20,17 +20,17 @@ index 1b241f937..e1ded14fd 100644 * @dis_tx_ipgap_linecheck_quirk: set if we disable u2mac linestate * check during HS transmit. + * @xhci_trb_ent_quirk: set if need to enable the Evaluate Next TRB(ENT) -+ flag in the TRB data structure to force xHC to -+ pre-fetch the next TRB of a TD. ++ * flag in the TRB data structure to force xHC to ++ * pre-fetch the next TRB of a TD. + * @resume-hs-terminations: Set if we enable quirk for fixing improper crc + * generation after resume from suspend. * @parkmode_disable_ss_quirk: set if we need to disable all SuperSpeed - * instances in park mode. - * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk @@ -1245,6 +1248,7 @@ struct dwc3 { - unsigned dis_u2_freeclk_exists_quirk:1; - unsigned dis_del_phy_power_chg_quirk:1; unsigned dis_tx_ipgap_linecheck_quirk:1; + unsigned resume_hs_terminations:1; + unsigned xhci_trb_ent_quirk:1; unsigned parkmode_disable_ss_quirk:1; + unsigned gfladj_refclk_lpm_sel:1; unsigned tx_de_emphasis_quirk:1; diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c diff --git a/patch/kernel/archive/media-6.0/600-usb-fix.patch b/patch/kernel/archive/media-6.0/600-usb-fix.patch deleted file mode 100644 index c4b775d411..0000000000 --- a/patch/kernel/archive/media-6.0/600-usb-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -@@ -1124,7 +1124,7 @@ - struct rockchip_usb2phy_port *rport, - struct device_node *child_np) - { -- int ret; -+ int ret, id; - - rport->port_id = USB2PHY_PORT_OTG; - rport->port_cfg = &rphy->phy_cfg->port_cfgs[USB2PHY_PORT_OTG]; -@@ -1162,13 +1162,15 @@ - - ret = devm_extcon_register_notifier(rphy->dev, rphy->edev, - EXTCON_USB_HOST, &rport->event_nb); -- if (ret) -+ if (ret) { - dev_err(rphy->dev, "register USB HOST notifier failed\n"); -+ goto out; -+ } - - if (!of_property_read_bool(rphy->dev->of_node, "extcon")) { - /* do initial sync of usb state */ -- ret = property_enabled(rphy->grf, &rport->port_cfg->utmi_id); -- extcon_set_state_sync(rphy->edev, EXTCON_USB_HOST, !ret); -+ id = property_enabled(rphy->grf, &rport->port_cfg->utmi_id); -+ extcon_set_state_sync(rphy->edev, EXTCON_USB_HOST, !id); - } - } - -