Commit ac8fb3e8 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

tmio: add a platform flag to disable card write-protection detection 



Write-protection status is not always available, e.g., micro-SD cards do not
have a write-protection switch at all. This patch adds a flag to let platforms
force tmio_mmc to consider the card writable.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarIan Molton <ian@mnementh.co.uk>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 65a1b034

drivers/mmc/host/tmio_mmc.c

+4 −1
Original line number Diff line number Diff line
@@ -748,8 +748,11 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
static int tmio_mmc_get_ro(struct mmc_host *mmc)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);

	struct mfd_cell	*cell = host->pdev->dev.platform_data;

	struct tmio_mmc_data *pdata = cell->driver_data;



	return (sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT) ? 0 : 1;

	return ((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) ||

		(sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT)) ? 0 : 1;

}



static const struct mmc_host_ops tmio_mmc_ops = {

include/linux/mfd/tmio.h

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ 
		tmio_iowrite16((val) >> 16, (base) + ((reg + 2) << (shift))); \

	} while (0)



/* tmio MMC platform flags */

#define TMIO_MMC_WRPROTECT_DISABLE	(1 << 0)



int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base);

int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base);

void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state);
@@ -66,6 +69,7 @@ struct tmio_mmc_dma { 
struct tmio_mmc_data {

	unsigned int			hclk;

	unsigned long			capabilities;

	unsigned long			flags;

	struct tmio_mmc_dma		*dma;

	void (*set_pwr)(struct platform_device *host, int state);

	void (*set_clk_div)(struct platform_device *host, int state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE