Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 423f6c2e authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Chris Ball
Browse files

mmc: sdhi: update sh_mobile_sdhi_of_data for r8a7790 



This patch updates r8a7790 DT data to have SoC specific settings.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 81bbbc72

drivers/mmc/host/sh_mobile_sdhi.c

+9 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
struct sh_mobile_sdhi_of_data {

	unsigned long tmio_flags;

	unsigned long capabilities;

	unsigned long capabilities2;

};



static const struct sh_mobile_sdhi_of_data sh_mobile_sdhi_of_cfg[] = {
@@ -51,6 +52,12 @@ static const struct sh_mobile_sdhi_of_data of_rcar_gen1_compatible = { 
	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

};



static const struct sh_mobile_sdhi_of_data of_rcar_gen2_compatible = {

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,

	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,

	.capabilities2	= MMC_CAP2_NO_MULTI_READ,

};



static const struct of_device_id sh_mobile_sdhi_of_match[] = {

	{ .compatible = "renesas,sdhi-shmobile" },

	{ .compatible = "renesas,sdhi-sh7372" },
@@ -59,7 +66,7 @@ static const struct of_device_id sh_mobile_sdhi_of_match[] = { 
	{ .compatible = "renesas,sdhi-r8a7740", .data = &sh_mobile_sdhi_of_cfg[0], },

	{ .compatible = "renesas,sdhi-r8a7778", .data = &of_rcar_gen1_compatible, },

	{ .compatible = "renesas,sdhi-r8a7779", .data = &of_rcar_gen1_compatible, },

	{ .compatible = "renesas,sdhi-r8a7790", .data = &sh_mobile_sdhi_of_cfg[0], },

	{ .compatible = "renesas,sdhi-r8a7790", .data = &of_rcar_gen2_compatible, },

	{},

};

MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match);
@@ -219,6 +226,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) 
		const struct sh_mobile_sdhi_of_data *of_data = of_id->data;

		mmc_data->flags |= of_data->tmio_flags;

		mmc_data->capabilities |= of_data->capabilities;

		mmc_data->capabilities2 |= of_data->capabilities2;

	}



	/* SD control register space size is 0x100, 0x200 for bus_shift=1 */