diff --git a/drivers/mmc/host/ls2kmci.c b/drivers/mmc/host/ls2kmci.c index bbe8fe06a..2b623026e 100644 --- a/drivers/mmc/host/ls2kmci.c +++ b/drivers/mmc/host/ls2kmci.c @@ -70,7 +70,7 @@ static const int dbgmap_err = dbg_fail; static const int dbgmap_info = dbg_info | dbg_conf; static const int dbgmap_debug = dbg_err | dbg_debug; -static void __iomem *cd_gpio_inten_base; +// static void __iomem *cd_gpio_inten_base; #define dbg(host, channels, args...) \ do { \ if (dbgmap_err & channels) \ @@ -866,8 +866,8 @@ static int ls2k_mci_probe(struct platform_device *pdev) struct dma_chan *chan; __be32 *of_property = NULL; struct mmc_gpio *ctx; - int cd_gpio_num; - u64 val; + // int cd_gpio_num; + // u64 val; if (dev_fwnode(&pdev->dev)) { if (!device_property_read_u64(&pdev->dev, "dma-mask", @@ -915,12 +915,12 @@ static int ls2k_mci_probe(struct platform_device *pdev) } host->phys_base = r->start; - if (r->start == LS2K1000_SDIO_REG_BASE) - cd_gpio_inten_base = (void *)LS2K1000_GPIO_INTEN_BASE; - else if (r->start == LS2K0500_SDIO0_REG_BASE) - cd_gpio_inten_base = (void *)LS2K0500_SDIO0_GPIO_INTEN_BASE; - else if (r->start == LS2K0500_SDIO1_REG_BASE) - cd_gpio_inten_base = (void *)LS2K0500_SDIO1_GPIO_INTEN_BASE; + // if (r->start == LS2K1000_SDIO_REG_BASE) + // cd_gpio_inten_base = (void *)LS2K1000_GPIO_INTEN_BASE; + // else if (r->start == LS2K0500_SDIO0_REG_BASE) + // cd_gpio_inten_base = (void *)LS2K0500_SDIO0_GPIO_INTEN_BASE; + // else if (r->start == LS2K0500_SDIO1_REG_BASE) + // cd_gpio_inten_base = (void *)LS2K0500_SDIO1_GPIO_INTEN_BASE; host->base = ioremap(r->start, r->end - r->start + 1); @@ -1008,16 +1008,16 @@ static int ls2k_mci_probe(struct platform_device *pdev) ctx = mmc->slot.handler_priv; - if (!(mmc->caps & MMC_CAP_NONREMOVABLE) && - !(mmc->caps & MMC_CAP_NEEDS_POLL) && cd_gpio_inten_base) { - cd_gpio_num = desc_to_gpio(ctx->cd_gpio); - local_irq_save(flags); - val = readq((void *)cd_gpio_inten_base); - val |= (0x1 << cd_gpio_num); - writeq(val, (void *)cd_gpio_inten_base); - local_irq_restore(flags); - ls2k_mci_gpio_get_cd(mmc); - } + // if (!(mmc->caps & MMC_CAP_NONREMOVABLE) && + // !(mmc->caps & MMC_CAP_NEEDS_POLL) && cd_gpio_inten_base) { + // cd_gpio_num = desc_to_gpio(ctx->cd_gpio); + // local_irq_save(flags); + // val = readq((void *)cd_gpio_inten_base); + // val |= (0x1 << cd_gpio_num); + // writeq(val, (void *)cd_gpio_inten_base); + // local_irq_restore(flags); + // ls2k_mci_gpio_get_cd(mmc); + // } ret = mmc_add_host(mmc); if (ret) { dev_err(&pdev->dev, "failed to add mmc host.\n");