davinci: MMC: Add a function to control reset state of the controller
PATCH v3 1/2 davinci: MMC: Add a function to control reset state of the controller
Add a helper function which will aid in changing the reset status of the controller.
Signed-off-by Chaithrika U S <[email protected]>
Acked-by Kevin Hilman <[email protected]>
---
Applies to Linus' kernel tree
drivers/mmc/host/davinci_mmc.c | 37 ++++++++++++++++--------------------- 1 files changed, 16 insertions(+), 21 deletions(-)
drivers/mmc/host/davinci_mmc.c +16 -21
@@ -884,19 +884,26 @@ static void mmc_davinci_cmd_done(struct mmc_davinci_host *host, } } -static void -davinci_abort_data (struct mmc_davinci_host *host,struct mmc_data *data) +static inline void mmc_davinci_reset_ctrl (struct mmc_davinci_host *host, +int val) {u32 temp; -/* reset command and data state machines */ temp =readl (host->base +DAVINCI_MMCCTL ); -writel (temp |MMCCTL_CMDRST |MMCCTL_DATRST , - host->base +DAVINCI_MMCCTL ); +if (val)/* reset */ + temp |=MMCCTL_CMDRST |MMCCTL_DATRST ; +else /* enable */ + temp &= ~(MMCCTL_CMDRST |MMCCTL_DATRST ); - temp &= ~(MMCCTL_CMDRST |MMCCTL_DATRST ); -udelay (10 );writel (temp, host->base +DAVINCI_MMCCTL ); +udelay (10 ); +} + +static void +davinci_abort_data (struct mmc_davinci_host *host,struct mmc_data *data) +{ +mmc_davinci_reset_ctrl (host,1 ); +mmc_davinci_reset_ctrl (host,0 ); }static irqreturn_t mmc_davinci_irq (int irq,void *dev_id)
@@ -1100,15 +1107,8 @@ static inline void mmc_davinci_cpufreq_deregister(struct mmc_davinci_host *host)#endif static void __init init_mmcsd_host (struct mmc_davinci_host *host) { -/* DAT line portion is diabled and in reset state */ -writel (readl (host->base +DAVINCI_MMCCTL ) |MMCCTL_DATRST , - host->base +DAVINCI_MMCCTL ); - -/* CMD line portion is diabled and in reset state */ -writel (readl (host->base +DAVINCI_MMCCTL ) |MMCCTL_CMDRST , - host->base +DAVINCI_MMCCTL ); -udelay (10 ); +mmc_davinci_reset_ctrl (host,1 );writel (0 , host->base +DAVINCI_MMCCLK );writel (MMCCLK_CLKEN , host->base +DAVINCI_MMCCLK );
@@ -1116,12 +1116,7 @@ static void __init init_mmcsd_host(struct mmc_davinci_host *host)writel (0x1FFF , host->base +DAVINCI_MMCTOR );writel (0xFFFF , host->base +DAVINCI_MMCTOD ); -writel (readl (host->base +DAVINCI_MMCCTL ) & ~MMCCTL_DATRST , - host->base +DAVINCI_MMCCTL ); -writel (readl (host->base +DAVINCI_MMCCTL ) & ~MMCCTL_CMDRST , - host->base +DAVINCI_MMCCTL ); - -udelay (10 ); +mmc_davinci_reset_ctrl (host,0 ); }static int __init davinci_mmcsd_probe (struct platform_device *pdev)
Signature · 1 line
1.5.6
Quoted 11 lines · On Fri, 8 Jan 2010 17:08:49 +0530 Chaithrika U S <[email protected]> wrote:
drivers/mmc/host/davinci_mmc.c +2
-5-static void -davinci_abort_data (struct mmc_davinci_host *host,struct mmc_data *data) +static inline void mmc_davinci_reset_ctrl (struct mmc_davinci_host *host, +int val) {u32 temp; -/* reset command and data state machines */ temp =readl (host->base +DAVINCI_MMCCTL ); -writel (temp |MMCCTL_CMDRST |MMCCTL_DATRST , - host->base +DAVINCI_MMCCTL );
drivers/mmc/host/davinci_mmc.c static void mmc_davinci_cmd_done(struct mmc_davinci_host *host, · line 900
Quoted 10 lines
drivers/mmc/host/davinci_mmc.c +6
-2+if (val)/* reset */ + temp |=MMCCTL_CMDRST |MMCCTL_DATRST ; +else /* enable */ + temp &= ~(MMCCTL_CMDRST |MMCCTL_DATRST ); - temp &= ~(MMCCTL_CMDRST |MMCCTL_DATRST ); -udelay (10 );writel (temp, host->base +DAVINCI_MMCCTL ); +udelay (10 ); +}
nit: it's hard for a reader of the code to work out why a udelay() such as the above was included. Perhaps the data sheet for the hardware would tell him, if he has access to it.
But generally speaking, the code is better code if it explains the reasoning to the reader.