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

Commit 070e6d3f authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Ulf Hansson
Browse files

mmc: sdhci-esdhc-imx: use sdhci_pltfm_init for private allocation 



Commit 0e748234 ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates the sdhci
esdhc-imx driver to this allocation.

Signed-off-by: default avatarJisheng Zhang <jszhang@marvell.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 13db83e2

drivers/mmc/host/sdhci-esdhc-imx.c

+17 −21
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static inline void esdhc_clrset_le(struct sdhci_host *host, u32 mask, u32 val, i 
static u32 esdhc_readl_le(struct sdhci_host *host, int reg)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);

	u32 val = readl(host->ioaddr + reg);



	if (unlikely(reg == SDHCI_PRESENT_STATE)) {
@@ -338,7 +338,7 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg) 
static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);

	u32 data;



	if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)) {
@@ -388,7 +388,7 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg) 
static u16 esdhc_readw_le(struct sdhci_host *host, int reg)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);

	u16 ret = 0;

	u32 val;
@@ -448,7 +448,7 @@ static u16 esdhc_readw_le(struct sdhci_host *host, int reg) 
static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);

	u32 new_val = 0;



	switch (reg) {
@@ -556,7 +556,7 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg) 
static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);

	u32 new_val;

	u32 mask;
@@ -633,7 +633,7 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host, 
					 unsigned int clock)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);

	unsigned int host_clock = pltfm_host->clock;

	int pre_div = 2;

	int div = 1;
@@ -692,7 +692,7 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host, 
static unsigned int esdhc_pltfm_get_ro(struct sdhci_host *host)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);

	struct esdhc_platform_data *boarddata = &imx_data->boarddata;



	switch (boarddata->wp_type) {
@@ -794,7 +794,7 @@ static int esdhc_change_pinstate(struct sdhci_host *host, 
						unsigned int uhs)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);

	struct pinctrl_state *pinctrl;



	dev_dbg(mmc_dev(host->mmc), "change pinctrl state for uhs %d\n", uhs);
@@ -864,7 +864,7 @@ static void esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned timing) 
{

	u32 m;

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);

	struct esdhc_platform_data *boarddata = &imx_data->boarddata;



	/* disable ddr mode and disable HS400 mode */
@@ -917,7 +917,7 @@ static void esdhc_reset(struct sdhci_host *host, u8 mask) 
static unsigned int esdhc_get_max_timeout_count(struct sdhci_host *host)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);



	return esdhc_is_usdhc(imx_data) ? 1 << 28 : 1 << 27;

}
@@ -925,7 +925,7 @@ static unsigned int esdhc_get_max_timeout_count(struct sdhci_host *host) 
static void esdhc_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);



	/* use maximum timeout counter */

	sdhci_writeb(host, esdhc_is_usdhc(imx_data) ? 0xF : 0xE,
@@ -1100,21 +1100,17 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
	int err;

	struct pltfm_imx_data *imx_data;



	host = sdhci_pltfm_init(pdev, &sdhci_esdhc_imx_pdata, 0);

	host = sdhci_pltfm_init(pdev, &sdhci_esdhc_imx_pdata,

				sizeof(*imx_data));

	if (IS_ERR(host))

		return PTR_ERR(host);



	pltfm_host = sdhci_priv(host);



	imx_data = devm_kzalloc(&pdev->dev, sizeof(*imx_data), GFP_KERNEL);

	if (!imx_data) {

		err = -ENOMEM;

		goto free_sdhci;

	}

	imx_data = sdhci_pltfm_priv(pltfm_host);



	imx_data->socdata = of_id ? of_id->data : (struct esdhc_soc_data *)

						  pdev->id_entry->driver_data;

	pltfm_host->priv = imx_data;



	imx_data->clk_ipg = devm_clk_get(&pdev->dev, "ipg");

	if (IS_ERR(imx_data->clk_ipg)) {
@@ -1241,7 +1237,7 @@ static int sdhci_esdhc_imx_remove(struct platform_device *pdev) 
{

	struct sdhci_host *host = platform_get_drvdata(pdev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);

	int dead = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff);



	pm_runtime_get_sync(&pdev->dev);
@@ -1264,7 +1260,7 @@ static int sdhci_esdhc_runtime_suspend(struct device *dev) 
{

	struct sdhci_host *host = dev_get_drvdata(dev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);

	int ret;



	ret = sdhci_runtime_suspend_host(host);
@@ -1282,7 +1278,7 @@ static int sdhci_esdhc_runtime_resume(struct device *dev) 
{

	struct sdhci_host *host = dev_get_drvdata(dev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct pltfm_imx_data *imx_data = pltfm_host->priv;

	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);



	if (!sdhci_sdio_irq_enabled(host)) {

		clk_prepare_enable(imx_data->clk_per);