forked from Openwrt/openwrt
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.43 Removed upstreamed: generic/backport-6.12/612-07-v6.17-net-dsa-b53-prevent-SWITCH_CTRL-access-on-BCM5325.patch[1] generic-backport/612-08-v6.17-net-dsa-b53-fix-IP_MULTICAST_CTRL-on-BCM5325.patch[2] generic-backport/612-09-v6.17-net-dsa-b53-prevent-DIS_LEARNING-access-on-BCM5325.patch[3] generic-backport/612-11-v6.17-net-dsa-b53-prevent-GMII_PORT_OVERRIDE_CTRL-access-on-BCM5325.patch[4] generic-backport/612-14-v6.17-net-dsa-b53-ensure-BCM5325-PHYs-are-enabled.patch[5] generic-backport/830-v6.17-Revert-leds-trigger-netdev-Configure-LED-blink-inter.patch[6] bcm27xx/patches-6.12/950-0100-media-tc358743-Increase-FIFO-level-to-374.patch[7] bcm27xx/patches-6.12/950-0102-media-tc358743-Check-I2C-succeeded-during-probe.patch[8] bcm27xx/patches-6.12/950-0107-media-tc358743-Return-an-appropriate-colorspace-from.patch[9] bcm27xx/patches-6.12/950-0341-Allow-RESET_BRCMSTB-on-ARCH_BCM2835.patch[10] lantiq/patches-6.12/102-11-v6.17-MIPS-lantiq-falcon-sysctrl-fix-request-memory-check-.patch[11] lantiq/patches-6.12/102-12-v6.17-MIPS-vpe-mt-add-missing-prototypes-for-vpe_-alloc-st.patch[12] qualcommax/patches-6.12/0170-clk-qcom-gcc-ipq8074-fix-broken-freq-table-for-nss_port6_tx_clk_src.patch[13] generic/backport-6.12/612-13-v6.17-net-dsa-b53-fix-b53_imp_vlan_setup-for-BCM5325.patch[14] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=f16f96ccfe56ef2d627c20ba47f6d9d7dea40f5b 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=394bd12d1f93ed2fa0fa1d8f31ffd3c344681e85 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=9f45e4858f8096bb27f9a2c75fc24a538dffad67 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=15cf46cc6ecc7a54b397294675d11c379ddf69ef 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=0d250ad617a035904744cef74a5d5dc43d0199b9 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=cb9bb872366e10fa42e1e0200a0c2e5d05a27bec 7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=f25d566c5674decd0051a3e624805fc1524729bf 8. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=3e03ee3b65baeac4c253b30650492ffffad9b608 9. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=b42b107293b52ac8d46238815b1071138a47a7e4 10. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=e285cdb9d2e4ba2e4515ae898f92e9f38be64eb3 11. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=1e9079ff83eac962bc3b1e2fbad73b2f7d5256f4 12. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=8520c843d9a2770012f23da08e4e2ccf1bb05ba6 13. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=f1c5c55fb6cda312f5ed15505588caaf05a69043 14. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=757955c80663ac3df7053abaf6fcc75051ef7a7c Build system: x86/64 (Intel N150 based) Build-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64-glibc Run-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64-glibc Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/19618 Signed-off-by: Robert Marko <robimarko@gmail.com>
109 lines
3.1 KiB
Diff
109 lines
3.1 KiB
Diff
From 28edd829133766eb3cefaf2e49d3ee701968061b Mon Sep 17 00:00:00 2001
|
|
From: Christian Marangi <ansuelsmth@gmail.com>
|
|
Date: Tue, 9 May 2023 01:57:17 +0200
|
|
Subject: [PATCH] mmc: sdhci-msm: comment unused sdhci_msm_set_clock
|
|
|
|
comment unused sdhci_msm_set_clock and __sdhci_msm_set_clock as due to some
|
|
current problem, we are forced to use sdhci_set_clock.
|
|
|
|
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|
---
|
|
drivers/mmc/host/sdhci-msm.c | 86 ++++++++++++++++++------------------
|
|
1 file changed, 43 insertions(+), 43 deletions(-)
|
|
|
|
--- a/drivers/mmc/host/sdhci-msm.c
|
|
+++ b/drivers/mmc/host/sdhci-msm.c
|
|
@@ -1818,49 +1818,49 @@ static unsigned int sdhci_msm_get_min_cl
|
|
return SDHCI_MSM_MIN_CLOCK;
|
|
}
|
|
|
|
-/*
|
|
- * __sdhci_msm_set_clock - sdhci_msm clock control.
|
|
- *
|
|
- * Description:
|
|
- * MSM controller does not use internal divider and
|
|
- * instead directly control the GCC clock as per
|
|
- * HW recommendation.
|
|
- **/
|
|
-static void __sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock)
|
|
-{
|
|
- u16 clk;
|
|
-
|
|
- sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
|
|
-
|
|
- if (clock == 0)
|
|
- return;
|
|
-
|
|
- /*
|
|
- * MSM controller do not use clock divider.
|
|
- * Thus read SDHCI_CLOCK_CONTROL and only enable
|
|
- * clock with no divider value programmed.
|
|
- */
|
|
- clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
|
|
- sdhci_enable_clk(host, clk);
|
|
-}
|
|
-
|
|
-/* sdhci_msm_set_clock - Called with (host->lock) spinlock held. */
|
|
-static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock)
|
|
-{
|
|
- struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
- struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);
|
|
-
|
|
- if (!clock) {
|
|
- host->mmc->actual_clock = msm_host->clk_rate = 0;
|
|
- goto out;
|
|
- }
|
|
-
|
|
- sdhci_msm_hc_select_mode(host);
|
|
-
|
|
- msm_set_clock_rate_for_bus_mode(host, clock);
|
|
-out:
|
|
- __sdhci_msm_set_clock(host, clock);
|
|
-}
|
|
+// /*
|
|
+// * __sdhci_msm_set_clock - sdhci_msm clock control.
|
|
+// *
|
|
+// * Description:
|
|
+// * MSM controller does not use internal divider and
|
|
+// * instead directly control the GCC clock as per
|
|
+// * HW recommendation.
|
|
+// **/
|
|
+// static void __sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock)
|
|
+// {
|
|
+// u16 clk;
|
|
+
|
|
+// sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
|
|
+
|
|
+// if (clock == 0)
|
|
+// return;
|
|
+
|
|
+// /*
|
|
+// * MSM controller do not use clock divider.
|
|
+// * Thus read SDHCI_CLOCK_CONTROL and only enable
|
|
+// * clock with no divider value programmed.
|
|
+// */
|
|
+// clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
|
|
+// sdhci_enable_clk(host, clk);
|
|
+// }
|
|
+
|
|
+// /* sdhci_msm_set_clock - Called with (host->lock) spinlock held. */
|
|
+// static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock)
|
|
+// {
|
|
+// struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
+// struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);
|
|
+
|
|
+// if (!clock) {
|
|
+// host->mmc->actual_clock = msm_host->clk_rate = 0;
|
|
+// goto out;
|
|
+// }
|
|
+
|
|
+// sdhci_msm_hc_select_mode(host);
|
|
+
|
|
+// msm_set_clock_rate_for_bus_mode(host, clock);
|
|
+// out:
|
|
+// __sdhci_msm_set_clock(host, clock);
|
|
+// }
|
|
|
|
/*****************************************************************************\
|
|
* *
|