D8956.1785261323.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8956.1785261323.diff
View Options

	Index: sys/mips/ingenic/jz4780_mmc.c
	===================================================================
	--- sys/mips/ingenic/jz4780_mmc.c
	+++ sys/mips/ingenic/jz4780_mmc.c
	@@ -412,13 +412,9 @@
	jz4780_mmc_reset(struct jz4780_mmc_softc *sc)
	{
	int timeout;
	- int reg;

	/* Stop the clock */
	- reg = JZ_MMC_READ_4(sc, JZ_MSC_CTRL);
	- reg &= ~(JZ_CLOCK_CTRL_M);
	- reg \|= JZ_CLOCK_STOP;
	- JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, reg);
	+ JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, JZ_CLOCK_STOP);

	timeout = 1000;
	while (--timeout > 0) {
	@@ -432,9 +428,7 @@
	}

	/* Reset */
	- reg = JZ_MMC_READ_4(sc, JZ_MSC_CTRL);
	- reg \|= JZ_RESET;
	- JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, reg);
	+ JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, JZ_RESET);

	timeout = 10;
	while (--timeout > 0) {
	@@ -647,7 +641,7 @@
	{
	struct jz4780_mmc_softc *sc;
	struct mmc_command *cmd;
	- uint32_t cmdat, ctrl, iwait;
	+ uint32_t cmdat, iwait;
	int blksz;

	sc = device_get_softc(bus);
	@@ -731,9 +725,7 @@
	JZ_MMC_WRITE_4(sc, JZ_MSC_CMD, cmd->opcode);
	JZ_MMC_WRITE_4(sc, JZ_MSC_CMDAT, cmdat);

	- ctrl = JZ_MMC_READ_4(sc, JZ_MSC_CTRL);
	- ctrl \|= JZ_START_OP \| JZ_CLOCK_START;
	- JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, ctrl);
	+ JZ_MMC_WRITE_4(sc, JZ_MSC_CTRL, JZ_START_OP \| JZ_CLOCK_START);

	callout_reset(&sc->sc_timeoutc, sc->sc_timeout * hz,
	jz4780_mmc_timeout, sc);