From 8fda8d4852b39c1011e363ece56e894ff09b5317 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 28 Jan 2022 14:00:34 +0100 Subject: [PATCH] Remove deprecated patches that breaks meson64 edge --- ...ip-emmc-remove-mmc-hs400-enhanced-st.patch | 75 ------------- ...dwc3-meson-g12a-fix-shared-reset-con.patch | 105 ------------------ ...s-meson-fixups-for-WeTek-common-dtsi.patch | 68 ------------ 3 files changed, 248 deletions(-) delete mode 100644 patch/kernel/archive/meson64-5.15/0001-arm64-dts-rockchip-emmc-remove-mmc-hs400-enhanced-st.patch delete mode 100644 patch/kernel/archive/meson64-5.15/0015-FROMLIST-v1-usb-dwc3-meson-g12a-fix-shared-reset-con.patch delete mode 100644 patch/kernel/archive/meson64-5.15/0058-arm64-dts-meson-fixups-for-WeTek-common-dtsi.patch diff --git a/patch/kernel/archive/meson64-5.15/0001-arm64-dts-rockchip-emmc-remove-mmc-hs400-enhanced-st.patch b/patch/kernel/archive/meson64-5.15/0001-arm64-dts-rockchip-emmc-remove-mmc-hs400-enhanced-st.patch deleted file mode 100644 index c50c11e623..0000000000 --- a/patch/kernel/archive/meson64-5.15/0001-arm64-dts-rockchip-emmc-remove-mmc-hs400-enhanced-st.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 26e8623e687e30fa9195e9da22479ccdb6afc91b Mon Sep 17 00:00:00 2001 -From: Artem Lapkin -Date: Wed, 10 Nov 2021 13:22:16 +0800 -Subject: [PATCH] arm64: dts: rockchip: emmc remove mmc-hs400-enhanced-strobe - rk3399-khadas-edge - -Remove mmc-hs400-enhanced-strobe for rk3399-khadas-edge - -Not compitable for some eMMC chips ( BJTD4R 29.1 GiB ). And no -performance difference in our case from emmc-hs400-enhanced-strobe option -for other eMMC chips. - -Problem example ( eMMC chip BJTD4R 29.1 GiB ): - -[ 0.068282] platform ff770000.syscon:phy@f780: Fixing up cyclic dependency with fe330000.mmc -[ 7.001493] mmc2: CQHCI version 5.10 -[ 7.027971] mmc2: SDHCI controller on fe330000.mmc [fe330000.mmc] using ADMA -....... -[ 7.207086] mmc2: mmc_select_hs400es failed, error -110 -[ 7.207129] mmc2: error -110 whilst initialising MMC card -[ 7.308893] mmc2: mmc_select_hs400es failed, error -110 -[ 7.308921] mmc2: error -110 whilst initialising MMC card -[ 7.427524] mmc2: mmc_select_hs400es failed, error -110 -[ 7.427546] mmc2: error -110 whilst initialising MMC card -[ 7.590993] mmc2: mmc_select_hs400es failed, error -110 -[ 7.591012] mmc2: error -110 whilst initialising MMC card - -Workable example without mmc-hs400-enhanced-strobe: - -[ 6.960785] mmc2: CQHCI version 5.10 -[ 6.984672] mmc2: SDHCI controller on fe330000.mmc [fe330000.mmc] using ADMA -[ 7.175021] mmc2: Command Queue Engine enabled -[ 7.175053] mmc2: new HS400 MMC card at address 0001 -[ 7.175808] mmcblk2: mmc2:0001 BJTD4R 29.1 GiB -[ 7.176033] mmcblk2boot0: mmc2:0001 BJTD4R 4.00 MiB -[ 7.176245] mmcblk2boot1: mmc2:0001 BJTD4R 4.00 MiB -[ 7.176495] mmcblk2rpmb: mmc2:0001 BJTD4R 4.00 MiB, chardev (242:0) - -Performance note for mmc-hs400-enhanced-strobe usage: - -Other chips DUTA42 116 GiB works well with or without -mmc-hs400-enhanced-strobe! - -..... mmc-hs400-enhanced-strobe disabled - -786432000 bytes (786 MB, 750 MiB) copied, 3 s, 262 MB/s - -..... mmc-hs400-enhanced-strobe enabled - -[ 7.135880] mmc2: Command Queue Engine enabled -[ 7.135928] mmc2: new HS400 Enhanced strobe MMC card at address 0001 -[ 7.136992] mmcblk2: mmc2:0001 DUTA42 116 GiB - -1048576000 bytes (1.0 GB, 1000 MiB) copied, 4 s, 262 MB/s - -Signed-off-by: Artem Lapkin ---- - arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi -index d5c7648c841d..f1fcc6b5b402 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi -@@ -705,7 +705,6 @@ &sdmmc { - &sdhci { - bus-width = <8>; - mmc-hs400-1_8v; -- mmc-hs400-enhanced-strobe; - non-removable; - status = "okay"; - }; --- -2.25.1 - diff --git a/patch/kernel/archive/meson64-5.15/0015-FROMLIST-v1-usb-dwc3-meson-g12a-fix-shared-reset-con.patch b/patch/kernel/archive/meson64-5.15/0015-FROMLIST-v1-usb-dwc3-meson-g12a-fix-shared-reset-con.patch deleted file mode 100644 index 52c08ff7ab..0000000000 --- a/patch/kernel/archive/meson64-5.15/0015-FROMLIST-v1-usb-dwc3-meson-g12a-fix-shared-reset-con.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 1ff484448145880c7bd8083439fd267598b77169 Mon Sep 17 00:00:00 2001 -From: Amjad Ouled-Ameur -Date: Fri, 13 Nov 2020 07:46:15 +0000 -Subject: [PATCH 15/58] FROMLIST(v1): usb: dwc3: meson-g12a: fix shared reset - control use - -reset_control_(de)assert() calls are called on a shared reset line when -reset_control_reset has been used. This is not allowed by the reset -framework. - -Use reset_control_rearm() call in suspend() and remove() as a way to state -that the resource is no longer used, hence the shared reset line -may be triggered again by other devices. Use reset_control_rearm() also in -case probe fails after reset() has been called. - -reset_control_rearm() keeps use of triggered_count sane in the reset -framework, use of reset_control_reset() on shared reset line should be -balanced with reset_control_rearm(). - -Signed-off-by: Amjad Ouled-Ameur -Reported-by: Jerome Brunet ---- - drivers/usb/dwc3/dwc3-meson-g12a.c | 19 +++++++++++++------ - 1 file changed, 13 insertions(+), 6 deletions(-) - -diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c -index bdf1f98dfad8..6570146cabc5 100644 ---- a/drivers/usb/dwc3/dwc3-meson-g12a.c -+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c -@@ -750,7 +750,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) - - ret = dwc3_meson_g12a_get_phys(priv); - if (ret) -- goto err_disable_clks; -+ goto err_rearm; - - ret = priv->drvdata->setup_regmaps(priv, base); - if (ret) -@@ -759,7 +759,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) - if (priv->vbus) { - ret = regulator_enable(priv->vbus); - if (ret) -- goto err_disable_clks; -+ goto err_rearm; - } - - /* Get dr_mode */ -@@ -775,13 +775,13 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) - - ret = priv->drvdata->usb_init(priv); - if (ret) -- goto err_disable_regulator; -+ goto err_rearm; - - /* Init PHYs */ - for (i = 0 ; i < PHY_COUNT ; ++i) { - ret = phy_init(priv->phys[i]); - if (ret) -- goto err_disable_regulator; -+ goto err_rearm; - } - - /* Set PHY Power */ -@@ -816,6 +816,9 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) - for (i = 0 ; i < PHY_COUNT ; ++i) - phy_exit(priv->phys[i]); - -+err_rearm: -+ reset_control_rearm(priv->reset); -+ - err_disable_clks: - clk_bulk_disable_unprepare(priv->drvdata->num_clks, - priv->drvdata->clks); -@@ -843,6 +846,8 @@ static int dwc3_meson_g12a_remove(struct platform_device *pdev) - pm_runtime_put_noidle(dev); - pm_runtime_set_suspended(dev); - -+ reset_control_rearm(priv->reset); -+ - clk_bulk_disable_unprepare(priv->drvdata->num_clks, - priv->drvdata->clks); - -@@ -883,7 +888,7 @@ static int __maybe_unused dwc3_meson_g12a_suspend(struct device *dev) - phy_exit(priv->phys[i]); - } - -- reset_control_assert(priv->reset); -+ reset_control_rearm(priv->reset); - - return 0; - } -@@ -893,7 +898,9 @@ static int __maybe_unused dwc3_meson_g12a_resume(struct device *dev) - struct dwc3_meson_g12a *priv = dev_get_drvdata(dev); - int i, ret; - -- reset_control_deassert(priv->reset); -+ ret = reset_control_reset(priv->reset); -+ if (ret) -+ return ret; - - ret = priv->drvdata->usb_init(priv); - if (ret) --- -2.25.1 - diff --git a/patch/kernel/archive/meson64-5.15/0058-arm64-dts-meson-fixups-for-WeTek-common-dtsi.patch b/patch/kernel/archive/meson64-5.15/0058-arm64-dts-meson-fixups-for-WeTek-common-dtsi.patch deleted file mode 100644 index 1973ce14b2..0000000000 --- a/patch/kernel/archive/meson64-5.15/0058-arm64-dts-meson-fixups-for-WeTek-common-dtsi.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b7a3260479da902b11b1ce7738b2f5a86aa39834 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Tue, 29 Dec 2020 09:31:57 +0000 -Subject: [PATCH 58/58] arm64: dts: meson: fixups for WeTek common dtsi - -Minor changes that result from work on mainline u-boot support, closer -study of vendor 3.14 device-tree, and access to vendor schematics: - -- Add missing GPIO binding -- Add higher max-freq to SDIO and SD -- Add higher rates to SDIO -- Use updated LED bindings - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -index a350fee1264d..8c6453fd130f 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -@@ -6,6 +6,8 @@ - */ - - #include "meson-gxbb.dtsi" -+#include -+#include - - / { - aliases { -@@ -25,8 +27,10 @@ memory@0 { - leds { - compatible = "gpio-leds"; - -- led-system { -- label = "wetek-play:system-status"; -+ blue { -+ /* red in suspend or power-off */ -+ color = ; -+ function = LED_FUNCTION_POWER; - gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>; - default-state = "on"; - panic-indicator; -@@ -199,7 +203,10 @@ &sd_emmc_a { - - bus-width = <4>; - cap-sd-highspeed; -- max-frequency = <50000000>; -+ sd-uhs-sdr12; -+ sd-uhs-sdr25; -+ sd-uhs-sdr50; -+ max-frequency = <200000000>; - - non-removable; - disable-wp; -@@ -227,7 +234,7 @@ &sd_emmc_b { - - bus-width = <4>; - cap-sd-highspeed; -- max-frequency = <50000000>; -+ max-frequency = <100000000>; - disable-wp; - - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; --- -2.25.1 -