Commit fe3e137c authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.2-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.3.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 565e4684 3f18c504

drivers/mmc/core/sdio_bus.c

+14 −3
Original line number Diff line number Diff line
@@ -294,6 +294,12 @@ static void sdio_release_func(struct device *dev) 
	if (!(func->card->quirks & MMC_QUIRK_NONSTD_SDIO))

		sdio_free_func_cis(func);



	/*

	 * We have now removed the link to the tuples in the

	 * card structure, so remove the reference.

	 */

	put_device(&func->card->dev);



	kfree(func->info);

	kfree(func->tmpbuf);

	kfree(func);
@@ -324,6 +330,12 @@ struct sdio_func *sdio_alloc_func(struct mmc_card *card) 


	device_initialize(&func->dev);



	/*

	 * We may link to tuples in the card structure,

	 * we need make sure we have a reference to it.

	 */

	get_device(&func->card->dev);



	func->dev.parent = &card->dev;

	func->dev.bus = &sdio_bus_type;

	func->dev.release = sdio_release_func;
@@ -377,10 +389,9 @@ int sdio_add_func(struct sdio_func *func) 
 */

void sdio_remove_func(struct sdio_func *func)

{

	if (!sdio_func_present(func))

		return;



	if (sdio_func_present(func))

		device_del(&func->dev);



	of_node_put(func->dev.of_node);

	put_device(&func->dev);

}

drivers/mmc/core/sdio_cis.c

+0 −12
Original line number Diff line number Diff line
@@ -403,12 +403,6 @@ int sdio_read_func_cis(struct sdio_func *func) 
	if (ret)

		return ret;



	/*

	 * Since we've linked to tuples in the card structure,

	 * we must make sure we have a reference to it.

	 */

	get_device(&func->card->dev);



	/*

	 * Vendor/device id is optional for function CIS, so

	 * copy it from the card structure as needed.
@@ -434,11 +428,5 @@ void sdio_free_func_cis(struct sdio_func *func) 
	}



	func->tuples = NULL;



	/*

	 * We have now removed the link to the tuples in the

	 * card structure, so remove the reference.

	 */

	put_device(&func->card->dev);

}

drivers/mmc/host/jz4740_mmc.c

+10 −0
Original line number Diff line number Diff line
@@ -1053,6 +1053,16 @@ static int jz4740_mmc_probe(struct platform_device* pdev) 
	mmc->ops = &jz4740_mmc_ops;

	if (!mmc->f_max)

		mmc->f_max = JZ_MMC_CLK_RATE;



	/*

	 * There seems to be a problem with this driver on the JZ4760 and

	 * JZ4760B SoCs. There, when using the maximum rate supported (50 MHz),

	 * the communication fails with many SD cards.

	 * Until this bug is sorted out, limit the maximum rate to 24 MHz.

	 */

	if (host->version == JZ_MMC_JZ4760 && mmc->f_max > JZ_MMC_CLK_RATE)

		mmc->f_max = JZ_MMC_CLK_RATE;



	mmc->f_min = mmc->f_max / 128;

	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;

drivers/mmc/host/meson-gx-mmc.c

+13 −10
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ static int meson_mmc_clk_init(struct meson_host *host) 
	clk_reg |= FIELD_PREP(CLK_CORE_PHASE_MASK, CLK_PHASE_180);

	clk_reg |= FIELD_PREP(CLK_TX_PHASE_MASK, CLK_PHASE_0);

	clk_reg |= FIELD_PREP(CLK_RX_PHASE_MASK, CLK_PHASE_0);

	if (host->mmc->caps & MMC_CAP_SDIO_IRQ)

		clk_reg |= CLK_IRQ_SDIO_SLEEP(host);

	writel(clk_reg, host->regs + SD_EMMC_CLOCK);
@@ -948,16 +949,18 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) 
{

	struct meson_host *host = dev_id;

	struct mmc_command *cmd;

	u32 status, raw_status;

	u32 status, raw_status, irq_mask = IRQ_EN_MASK;

	irqreturn_t ret = IRQ_NONE;



	if (host->mmc->caps & MMC_CAP_SDIO_IRQ)

		irq_mask |= IRQ_SDIO;

	raw_status = readl(host->regs + SD_EMMC_STATUS);

	status = raw_status & (IRQ_EN_MASK | IRQ_SDIO);

	status = raw_status & irq_mask;



	if (!status) {

		dev_dbg(host->dev,

			"Unexpected IRQ! irq_en 0x%08lx - status 0x%08x\n",

			 IRQ_EN_MASK | IRQ_SDIO, raw_status);

			"Unexpected IRQ! irq_en 0x%08x - status 0x%08x\n",

			 irq_mask, raw_status);

		return IRQ_NONE;

	}
@@ -1201,6 +1204,11 @@ static int meson_mmc_probe(struct platform_device *pdev) 
	if (ret)

		return dev_err_probe(&pdev->dev, ret, "error parsing DT\n");



	mmc->caps |= MMC_CAP_CMD23;



	if (mmc->caps & MMC_CAP_SDIO_IRQ)

		mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;



	host->data = (struct meson_mmc_data *)

		of_device_get_match_data(&pdev->dev);

	if (!host->data)
@@ -1262,11 +1270,6 @@ static int meson_mmc_probe(struct platform_device *pdev) 


	spin_lock_init(&host->lock);



	mmc->caps |= MMC_CAP_CMD23;



	if (mmc->caps & MMC_CAP_SDIO_IRQ)

		mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;



	if (host->dram_access_quirk) {

		/* Limit segments to 1 due to low available sram memory */

		mmc->max_segs = 1;

drivers/mmc/host/mmc_spi.c

+4 −4
Original line number Diff line number Diff line
@@ -1437,7 +1437,7 @@ static int mmc_spi_probe(struct spi_device *spi) 


	status = mmc_add_host(mmc);

	if (status != 0)

		goto fail_add_host;

		goto fail_glue_init;



	/*

	 * Index 0 is card detect
@@ -1445,7 +1445,7 @@ static int mmc_spi_probe(struct spi_device *spi) 
	 */

	status = mmc_gpiod_request_cd(mmc, NULL, 0, false, 1000);

	if (status == -EPROBE_DEFER)

		goto fail_add_host;

		goto fail_gpiod_request;

	if (!status) {

		/*

		 * The platform has a CD GPIO signal that may support
@@ -1460,7 +1460,7 @@ static int mmc_spi_probe(struct spi_device *spi) 
	/* Index 1 is write protect/read only */

	status = mmc_gpiod_request_ro(mmc, NULL, 1, 0);

	if (status == -EPROBE_DEFER)

		goto fail_add_host;

		goto fail_gpiod_request;

	if (!status)

		has_ro = true;
@@ -1474,7 +1474,7 @@ static int mmc_spi_probe(struct spi_device *spi) 
				? ", cd polling" : "");

	return 0;



fail_add_host:

fail_gpiod_request:

	mmc_remove_host(mmc);

fail_glue_init:

	mmc_spi_dma_free(host);