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

Commit 4240ff0a authored by Ben Dooks's avatar Ben Dooks Committed by Pierre Ossman
Browse files

sdhci: Add get_{max,timeout}_clock callbacks 



Some controllers do not provide clock information in their capabilities
(in the Samsung case, it is because there are multiple clock sources
available to the controller). Add hooks to allow the system to supply
clock information.

p.s.
In the original Ben's patch there was a bug that makes sdhci_add_host()
return -ENODEV even if callbacks were specified. This is fixed now.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent c5075a10

drivers/mmc/host/sdhci.c

+15 −7
Original line number Diff line number Diff line
@@ -1674,20 +1674,28 @@ int sdhci_add_host(struct sdhci_host *host) 


	host->max_clk =

		(caps & SDHCI_CLOCK_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT;

	host->max_clk *= 1000000;

	if (host->max_clk == 0) {

		printk(KERN_ERR "%s: Hardware doesn't specify base clock "

		if (!host->ops->get_max_clock) {

			printk(KERN_ERR

			       "%s: Hardware doesn't specify base clock "

			       "frequency.\n", mmc_hostname(mmc));

			return -ENODEV;

		}

	host->max_clk *= 1000000;

		host->max_clk = host->ops->get_max_clock(host);

	}



	host->timeout_clk =

		(caps & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT;

	if (host->timeout_clk == 0) {

		printk(KERN_ERR "%s: Hardware doesn't specify timeout clock "

		if (!host->ops->get_timeout_clock) {

			printk(KERN_ERR

			       "%s: Hardware doesn't specify timeout clock "

			       "frequency.\n", mmc_hostname(mmc));

			return -ENODEV;

		}

		host->timeout_clk = host->ops->get_timeout_clock(host);

	}

	if (caps & SDHCI_TIMEOUT_CLK_UNIT)

		host->timeout_clk *= 1000;

drivers/mmc/host/sdhci.h

+2 −0
Original line number Diff line number Diff line
@@ -285,6 +285,8 @@ struct sdhci_ops { 
#endif



	int		(*enable_dma)(struct sdhci_host *host);

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

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

};



#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS