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

Commit bf96208f authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: refactor set_clock a little 



Some of the indentation made the code awful to read. Fix that. Also,
introduce defines instead of magic hex values. Note that this includes
one change: We mask out know 0xff instead of 0x1ff. But 0x100 has always
been the clock enable bit. It doesn't make any sense to set it depending
on the clock calculation. Update copyright notices, too. I'll be working
on those files some more in the future.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 16a65524

drivers/mmc/host/tmio_mmc_pio.c

+9 −6
Original line number Original line Diff line number Diff line 
/*

/*

 * linux/drivers/mmc/host/tmio_mmc_pio.c

 * linux/drivers/mmc/host/tmio_mmc_pio.c

 *

 *

 * Copyright (C) 2016 Sang Engineering, Wolfram Sang

 * Copyright (C) 2015-16 Renesas Electronics Corporation

 * Copyright (C) 2011 Guennadi Liakhovetski

 * Copyright (C) 2011 Guennadi Liakhovetski

 * Copyright (C) 2007 Ian Molton

 * Copyright (C) 2007 Ian Molton

 * Copyright (C) 2004 Ian Molton

 * Copyright (C) 2004 Ian Molton
@@ -159,7 +161,8 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host, 




	if (new_clock) {

	if (new_clock) {

		for (clock = host->mmc->f_min, clk = 0x80000080;

		for (clock = host->mmc->f_min, clk = 0x80000080;

			new_clock >= (clock<<1); clk >>= 1)

		     new_clock >= (clock << 1);

		     clk >>= 1)

			clock <<= 1;

			clock <<= 1;





		/* 1/1 clock is option */

		/* 1/1 clock is option */
@@ -171,7 +174,7 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host, 
	if (host->set_clk_div)

	if (host->set_clk_div)

		host->set_clk_div(host->pdev, (clk >> 22) & 1);

		host->set_clk_div(host->pdev, (clk >> 22) & 1);





	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, clk & 0x1ff);

	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, clk & CLK_CTL_DIV_MASK);

	if (!(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG))

	if (!(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG))

		msleep(10);

		msleep(10);

}

}
@@ -183,14 +186,14 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host) 
		msleep(10);

		msleep(10);

	}

	}





	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~0x0100 &

	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~CLK_CTL_SCLKEN &

		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));

		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));

	msleep(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG ? 5 : 10);

	msleep(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG ? 5 : 10);

}

}





static void tmio_mmc_clk_start(struct tmio_mmc_host *host)

static void tmio_mmc_clk_start(struct tmio_mmc_host *host)

{

{

	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, 0x0100 |

	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, CLK_CTL_SCLKEN |

		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));

		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));

	msleep(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG ? 1 : 10);

	msleep(host->pdata->flags & TMIO_MMC_FAST_CLK_CHG ? 1 : 10);

include/linux/mmc/tmio.h

+5 −0
Original line number Original line Diff line number Diff line 
/*

/*

 * include/linux/mmc/tmio.h

 * include/linux/mmc/tmio.h

 *

 *

 * Copyright (C) 2016 Sang Engineering, Wolfram Sang

 * Copyright (C) 2015-16 Renesas Electronics Corporation

 * Copyright (C) 2007 Ian Molton

 * Copyright (C) 2007 Ian Molton

 * Copyright (C) 2004 Ian Molton

 * Copyright (C) 2004 Ian Molton

 *

 *
@@ -61,6 +63,9 @@ 
#define TMIO_STAT_CMD_BUSY      0x40000000

#define TMIO_STAT_CMD_BUSY      0x40000000

#define TMIO_STAT_ILL_ACCESS    0x80000000

#define TMIO_STAT_ILL_ACCESS    0x80000000





#define	CLK_CTL_DIV_MASK	0xff

#define	CLK_CTL_SCLKEN		BIT(8)



#define TMIO_BBS		512		/* Boot block size */

#define TMIO_BBS		512		/* Boot block size */





#endif /* LINUX_MMC_TMIO_H */
 
#endif /* LINUX_MMC_TMIO_H */