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

Commit 6322cdd0 authored by Philip Rakity's avatar Philip Rakity Committed by Chris Ball
Browse files

mmc: sdhci: add hooks for setting UHS in platform specific code 



Allow platform specific code to set UHS registers if
implementation requires speciial platform specific handling

Signed-off-by: default avatarPhilip Rakity <prakity@marvell.com>
Reviewed-by: default avatarArindam Nath <arindam.nath@amd.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent a8e6df73

drivers/mmc/host/sdhci.c

+18 −15
Original line number Original line Diff line number Diff line
@@ -1346,8 +1346,16 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
			sdhci_set_clock(host, clock);

			sdhci_set_clock(host, clock);

		}

		}





		ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);





		/* Reset SD Clock Enable */

		clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL);

		clk &= ~SDHCI_CLOCK_CARD_EN;

		sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);



		if (host->ops->set_uhs_signaling)

			host->ops->set_uhs_signaling(host, ios->timing);

		else {

			ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);

			/* Select Bus Speed Mode for host */

			/* Select Bus Speed Mode for host */

			ctrl_2 &= ~SDHCI_CTRL_UHS_MASK;

			ctrl_2 &= ~SDHCI_CTRL_UHS_MASK;

			if (ios->timing == MMC_TIMING_UHS_SDR12)

			if (ios->timing == MMC_TIMING_UHS_SDR12)
@@ -1360,13 +1368,8 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
				ctrl_2 |= SDHCI_CTRL_UHS_SDR104;

				ctrl_2 |= SDHCI_CTRL_UHS_SDR104;

			else if (ios->timing == MMC_TIMING_UHS_DDR50)

			else if (ios->timing == MMC_TIMING_UHS_DDR50)

				ctrl_2 |= SDHCI_CTRL_UHS_DDR50;

				ctrl_2 |= SDHCI_CTRL_UHS_DDR50;



		/* Reset SD Clock Enable */

		clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL);

		clk &= ~SDHCI_CLOCK_CARD_EN;

		sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);



			sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);

			sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);

		}





		/* Re-enable SD Clock */

		/* Re-enable SD Clock */

		clock = host->clock;

		clock = host->clock;

drivers/mmc/host/sdhci.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -270,6 +270,8 @@ struct sdhci_ops { 
	unsigned int    (*get_ro)(struct sdhci_host *host);

	unsigned int    (*get_ro)(struct sdhci_host *host);

	void	(*platform_reset_enter)(struct sdhci_host *host, u8 mask);

	void	(*platform_reset_enter)(struct sdhci_host *host, u8 mask);

	void	(*platform_reset_exit)(struct sdhci_host *host, u8 mask);

	void	(*platform_reset_exit)(struct sdhci_host *host, u8 mask);

	int	(*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs);



};

};





#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS

#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS