| Message ID | 20230316120549.21486-2-rashmi.a@intel.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Remove Intel Thunder Bay emmc patches | expand |
On Thu, 16 Mar 2023 at 13:06, <rashmi.a@intel.com> wrote: > > From: "A, Rashmi" <rashmi.a@intel.com> > > Remove Thunder Bay specific code as the product got cancelled > and there are no end customers or users. > > Signed-off-by: A, Rashmi <rashmi.a@intel.com> > Reviewed-by: Hunter, Adrian <adrian.hunter@intel.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/sdhci-of-arasan.c | 29 +---------------------------- > 1 file changed, 1 insertion(+), 28 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c > index 89c431a34c43..fbafc87266aa 100644 > --- a/drivers/mmc/host/sdhci-of-arasan.c > +++ b/drivers/mmc/host/sdhci-of-arasan.c > @@ -193,13 +193,6 @@ static const struct sdhci_arasan_soc_ctl_map intel_lgm_sdxc_soc_ctl_map = { > .hiword_update = false, > }; > > -static const struct sdhci_arasan_soc_ctl_map thunderbay_soc_ctl_map = { > - .baseclkfreq = { .reg = 0x0, .width = 8, .shift = 14 }, > - .clockmultiplier = { .reg = 0x4, .width = 8, .shift = 14 }, > - .support64b = { .reg = 0x4, .width = 1, .shift = 24 }, > - .hiword_update = false, > -}; > - > static const struct sdhci_arasan_soc_ctl_map intel_keembay_soc_ctl_map = { > .baseclkfreq = { .reg = 0x0, .width = 8, .shift = 14 }, > .clockmultiplier = { .reg = 0x4, .width = 8, .shift = 14 }, > @@ -465,15 +458,6 @@ static const struct sdhci_pltfm_data sdhci_arasan_cqe_pdata = { > SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN, > }; > > -static const struct sdhci_pltfm_data sdhci_arasan_thunderbay_pdata = { > - .ops = &sdhci_arasan_cqe_ops, > - .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, > - .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN | > - SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN | > - SDHCI_QUIRK2_STOP_WITH_TC | > - SDHCI_QUIRK2_CAPS_BIT63_FOR_HS400, > -}; > - > #ifdef CONFIG_PM_SLEEP > /** > * sdhci_arasan_suspend - Suspend method for the driver > @@ -1150,12 +1134,6 @@ static struct sdhci_arasan_of_data sdhci_arasan_generic_data = { > .clk_ops = &arasan_clk_ops, > }; > > -static const struct sdhci_arasan_of_data sdhci_arasan_thunderbay_data = { > - .soc_ctl_map = &thunderbay_soc_ctl_map, > - .pdata = &sdhci_arasan_thunderbay_pdata, > - .clk_ops = &arasan_clk_ops, > -}; > - > static const struct sdhci_pltfm_data sdhci_keembay_emmc_pdata = { > .ops = &sdhci_arasan_cqe_ops, > .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | > @@ -1289,10 +1267,6 @@ static const struct of_device_id sdhci_arasan_of_match[] = { > .compatible = "intel,keembay-sdhci-5.1-sdio", > .data = &intel_keembay_sdio_data, > }, > - { > - .compatible = "intel,thunderbay-sdhci-5.1", > - .data = &sdhci_arasan_thunderbay_data, > - }, > /* Generic compatible below here */ > { > .compatible = "arasan,sdhci-8.9a", > @@ -1716,8 +1690,7 @@ static int sdhci_arasan_probe(struct platform_device *pdev) > > if (of_device_is_compatible(np, "intel,keembay-sdhci-5.1-emmc") || > of_device_is_compatible(np, "intel,keembay-sdhci-5.1-sd") || > - of_device_is_compatible(np, "intel,keembay-sdhci-5.1-sdio") || > - of_device_is_compatible(np, "intel,thunderbay-sdhci-5.1")) { > + of_device_is_compatible(np, "intel,keembay-sdhci-5.1-sdio")) { > sdhci_arasan_update_clockmultiplier(host, 0x0); > sdhci_arasan_update_support64b(host, 0x0); > > -- > 2.17.1 >
diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c index 89c431a34c43..fbafc87266aa 100644 --- a/drivers/mmc/host/sdhci-of-arasan.c +++ b/drivers/mmc/host/sdhci-of-arasan.c @@ -193,13 +193,6 @@ static const struct sdhci_arasan_soc_ctl_map intel_lgm_sdxc_soc_ctl_map = { .hiword_update = false, }; -static const struct sdhci_arasan_soc_ctl_map thunderbay_soc_ctl_map = { - .baseclkfreq = { .reg = 0x0, .width = 8, .shift = 14 }, - .clockmultiplier = { .reg = 0x4, .width = 8, .shift = 14 }, - .support64b = { .reg = 0x4, .width = 1, .shift = 24 }, - .hiword_update = false, -}; - static const struct sdhci_arasan_soc_ctl_map intel_keembay_soc_ctl_map = { .baseclkfreq = { .reg = 0x0, .width = 8, .shift = 14 }, .clockmultiplier = { .reg = 0x4, .width = 8, .shift = 14 }, @@ -465,15 +458,6 @@ static const struct sdhci_pltfm_data sdhci_arasan_cqe_pdata = { SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN, }; -static const struct sdhci_pltfm_data sdhci_arasan_thunderbay_pdata = { - .ops = &sdhci_arasan_cqe_ops, - .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, - .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN | - SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN | - SDHCI_QUIRK2_STOP_WITH_TC | - SDHCI_QUIRK2_CAPS_BIT63_FOR_HS400, -}; - #ifdef CONFIG_PM_SLEEP /** * sdhci_arasan_suspend - Suspend method for the driver @@ -1150,12 +1134,6 @@ static struct sdhci_arasan_of_data sdhci_arasan_generic_data = { .clk_ops = &arasan_clk_ops, }; -static const struct sdhci_arasan_of_data sdhci_arasan_thunderbay_data = { - .soc_ctl_map = &thunderbay_soc_ctl_map, - .pdata = &sdhci_arasan_thunderbay_pdata, - .clk_ops = &arasan_clk_ops, -}; - static const struct sdhci_pltfm_data sdhci_keembay_emmc_pdata = { .ops = &sdhci_arasan_cqe_ops, .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | @@ -1289,10 +1267,6 @@ static const struct of_device_id sdhci_arasan_of_match[] = { .compatible = "intel,keembay-sdhci-5.1-sdio", .data = &intel_keembay_sdio_data, }, - { - .compatible = "intel,thunderbay-sdhci-5.1", - .data = &sdhci_arasan_thunderbay_data, - }, /* Generic compatible below here */ { .compatible = "arasan,sdhci-8.9a", @@ -1716,8 +1690,7 @@ static int sdhci_arasan_probe(struct platform_device *pdev) if (of_device_is_compatible(np, "intel,keembay-sdhci-5.1-emmc") || of_device_is_compatible(np, "intel,keembay-sdhci-5.1-sd") || - of_device_is_compatible(np, "intel,keembay-sdhci-5.1-sdio") || - of_device_is_compatible(np, "intel,thunderbay-sdhci-5.1")) { + of_device_is_compatible(np, "intel,keembay-sdhci-5.1-sdio")) { sdhci_arasan_update_clockmultiplier(host, 0x0); sdhci_arasan_update_support64b(host, 0x0);