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

Commit 70e60206 authored by Shawn Guo's avatar Shawn Guo
Browse files

mmc: mxs-mmc: use global stmp_device functionality 



Use global stmp_device functionality to reduce mach-dependency.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarMarek Vasut <marex@denx.de>
Acked-by: default avatarChris Ball <cjb@laptop.org>
parent ce4c6f9b

drivers/mmc/host/mxs-mmc.c

+7 −7
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ 
#include <linux/module.h>

#include <linux/fsl/mxs-dma.h>

#include <linux/pinctrl/consumer.h>

#include <linux/stmp_device.h>



#include <mach/mxs.h>

#include <mach/common.h>

#include <mach/mmc.h>



#define DRIVER_NAME	"mxs-mmc"
@@ -191,7 +191,7 @@ static void mxs_mmc_reset(struct mxs_mmc_host *host) 
{

	u32 ctrl0, ctrl1;



	mxs_reset_block(host->base);

	stmp_reset_block(host->base);



	ctrl0 = BM_SSP_CTRL0_IGNORE_CRC;

	ctrl1 = BF_SSP(0x3, CTRL1_SSP_MODE) |
@@ -279,7 +279,7 @@ static irqreturn_t mxs_mmc_irq_handler(int irq, void *dev_id) 


	stat = readl(host->base + HW_SSP_CTRL1);

	writel(stat & MXS_MMC_IRQ_BITS,

	       host->base + HW_SSP_CTRL1 + MXS_CLR_ADDR);

	       host->base + HW_SSP_CTRL1 + STMP_OFFSET_REG_CLR);



	if ((stat & BM_SSP_CTRL1_SDIO_IRQ) && (stat & BM_SSP_CTRL1_SDIO_IRQ_EN))

		mmc_signal_sdio_irq(host->mmc);
@@ -637,18 +637,18 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) 


	if (enable) {

		writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,

		       host->base + HW_SSP_CTRL0 + MXS_SET_ADDR);

		       host->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);

		writel(BM_SSP_CTRL1_SDIO_IRQ_EN,

		       host->base + HW_SSP_CTRL1 + MXS_SET_ADDR);

		       host->base + HW_SSP_CTRL1 + STMP_OFFSET_REG_SET);



		if (readl(host->base + HW_SSP_STATUS) & BM_SSP_STATUS_SDIO_IRQ)

			mmc_signal_sdio_irq(host->mmc);



	} else {

		writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,

		       host->base + HW_SSP_CTRL0 + MXS_CLR_ADDR);

		       host->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);

		writel(BM_SSP_CTRL1_SDIO_IRQ_EN,

		       host->base + HW_SSP_CTRL1 + MXS_CLR_ADDR);

		       host->base + HW_SSP_CTRL1 + STMP_OFFSET_REG_CLR);

	}



	spin_unlock_irqrestore(&host->lock, flags);