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

Commit cba179ae authored by Simon Horman's avatar Simon Horman Committed by Chris Ball
Browse files

mmc: tmio_mmc: Move some defines into a shared header 



Also add TMIO_BBS.

This allows these defines to also be used by zboot.

Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 5fd01579

drivers/mmc/host/tmio_mmc.h

+4 −26
Original line number Original line Diff line number Diff line
@@ -17,31 +17,9 @@ 
#define TMIO_MMC_H

#define TMIO_MMC_H





#include <linux/highmem.h>

#include <linux/highmem.h>

#include <linux/mmc/tmio.h>

#include <linux/pagemap.h>

#include <linux/pagemap.h>





/* Definitions for values the CTRL_STATUS register can take. */

#define TMIO_STAT_CMDRESPEND    0x00000001

#define TMIO_STAT_DATAEND       0x00000004

#define TMIO_STAT_CARD_REMOVE   0x00000008

#define TMIO_STAT_CARD_INSERT   0x00000010

#define TMIO_STAT_SIGSTATE      0x00000020

#define TMIO_STAT_WRPROTECT     0x00000080

#define TMIO_STAT_CARD_REMOVE_A 0x00000100

#define TMIO_STAT_CARD_INSERT_A 0x00000200

#define TMIO_STAT_SIGSTATE_A    0x00000400

#define TMIO_STAT_CMD_IDX_ERR   0x00010000

#define TMIO_STAT_CRCFAIL       0x00020000

#define TMIO_STAT_STOPBIT_ERR   0x00040000

#define TMIO_STAT_DATATIMEOUT   0x00080000

#define TMIO_STAT_RXOVERFLOW    0x00100000

#define TMIO_STAT_TXUNDERRUN    0x00200000

#define TMIO_STAT_CMDTIMEOUT    0x00400000

#define TMIO_STAT_RXRDY         0x01000000

#define TMIO_STAT_TXRQ          0x02000000

#define TMIO_STAT_ILL_FUNC      0x20000000

#define TMIO_STAT_CMD_BUSY      0x40000000

#define TMIO_STAT_ILL_ACCESS    0x80000000



/* Definitions for values the CTRL_SDIO_STATUS register can take. */

/* Definitions for values the CTRL_SDIO_STATUS register can take. */

#define TMIO_SDIO_STAT_IOIRQ	0x0001

#define TMIO_SDIO_STAT_IOIRQ	0x0001

#define TMIO_SDIO_STAT_EXPUB52	0x4000

#define TMIO_SDIO_STAT_EXPUB52	0x4000

drivers/mmc/host/tmio_mmc_dma.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/dmaengine.h>

#include <linux/dmaengine.h>

#include <linux/mfd/tmio.h>

#include <linux/mfd/tmio.h>

#include <linux/mmc/host.h>

#include <linux/mmc/host.h>

#include <linux/mmc/tmio.h>

#include <linux/pagemap.h>

#include <linux/pagemap.h>

#include <linux/scatterlist.h>

#include <linux/scatterlist.h>

drivers/mmc/host/tmio_mmc_pio.c

+1 −20
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/mfd/tmio.h>

#include <linux/mfd/tmio.h>

#include <linux/mmc/host.h>

#include <linux/mmc/host.h>

#include <linux/mmc/tmio.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/pagemap.h>

#include <linux/pagemap.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>
@@ -44,26 +45,6 @@ 




#include "tmio_mmc.h"

#include "tmio_mmc.h"





#define CTL_SD_CMD 0x00

#define CTL_ARG_REG 0x04

#define CTL_STOP_INTERNAL_ACTION 0x08

#define CTL_XFER_BLK_COUNT 0xa

#define CTL_RESPONSE 0x0c

#define CTL_STATUS 0x1c

#define CTL_IRQ_MASK 0x20

#define CTL_SD_CARD_CLK_CTL 0x24

#define CTL_SD_XFER_LEN 0x26

#define CTL_SD_MEM_CARD_OPT 0x28

#define CTL_SD_ERROR_DETAIL_STATUS 0x2c

#define CTL_SD_DATA_PORT 0x30

#define CTL_TRANSACTION_CTL 0x34

#define CTL_SDIO_STATUS 0x36

#define CTL_SDIO_IRQ_MASK 0x38

#define CTL_RESET_SD 0xe0

#define CTL_SDIO_REGS 0x100

#define CTL_CLK_AND_WAIT_CTL 0x138

#define CTL_RESET_SDIO 0x1e0



static u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr)

static u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr)

{

{

	return readw(host->ctl + (addr << host->bus_shift));

	return readw(host->ctl + (addr << host->bus_shift));

include/linux/mmc/tmio.h

0 → 100644
+63 −0
Original line number Original line Diff line number Diff line 
/*

 * include/linux/mmc/tmio.h

 *

 * Copyright (C) 2007 Ian Molton

 * Copyright (C) 2004 Ian Molton

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * Driver for the MMC / SD / SDIO cell found in:

 *

 * TC6393XB TC6391XB TC6387XB T7L66XB ASIC3

 */

#ifndef _LINUX_MMC_TMIO_H_

#define _LINUX_MMC_TMIO_H_



#define CTL_SD_CMD 0x00

#define CTL_ARG_REG 0x04

#define CTL_STOP_INTERNAL_ACTION 0x08

#define CTL_XFER_BLK_COUNT 0xa

#define CTL_RESPONSE 0x0c

#define CTL_STATUS 0x1c

#define CTL_IRQ_MASK 0x20

#define CTL_SD_CARD_CLK_CTL 0x24

#define CTL_SD_XFER_LEN 0x26

#define CTL_SD_MEM_CARD_OPT 0x28

#define CTL_SD_ERROR_DETAIL_STATUS 0x2c

#define CTL_SD_DATA_PORT 0x30

#define CTL_TRANSACTION_CTL 0x34

#define CTL_SDIO_STATUS 0x36

#define CTL_SDIO_IRQ_MASK 0x38

#define CTL_RESET_SD 0xe0

#define CTL_SDIO_REGS 0x100

#define CTL_CLK_AND_WAIT_CTL 0x138

#define CTL_RESET_SDIO 0x1e0



/* Definitions for values the CTRL_STATUS register can take. */

#define TMIO_STAT_CMDRESPEND    0x00000001

#define TMIO_STAT_DATAEND       0x00000004

#define TMIO_STAT_CARD_REMOVE   0x00000008

#define TMIO_STAT_CARD_INSERT   0x00000010

#define TMIO_STAT_SIGSTATE      0x00000020

#define TMIO_STAT_WRPROTECT     0x00000080

#define TMIO_STAT_CARD_REMOVE_A 0x00000100

#define TMIO_STAT_CARD_INSERT_A 0x00000200

#define TMIO_STAT_SIGSTATE_A    0x00000400

#define TMIO_STAT_CMD_IDX_ERR   0x00010000

#define TMIO_STAT_CRCFAIL       0x00020000

#define TMIO_STAT_STOPBIT_ERR   0x00040000

#define TMIO_STAT_DATATIMEOUT   0x00080000

#define TMIO_STAT_RXOVERFLOW    0x00100000

#define TMIO_STAT_TXUNDERRUN    0x00200000

#define TMIO_STAT_CMDTIMEOUT    0x00400000

#define TMIO_STAT_RXRDY         0x01000000

#define TMIO_STAT_TXRQ          0x02000000

#define TMIO_STAT_ILL_FUNC      0x20000000

#define TMIO_STAT_CMD_BUSY      0x40000000

#define TMIO_STAT_ILL_ACCESS    0x80000000



#define TMIO_BBS		512		/* Boot block size */



#endif /* _LINUX_MMC_TMIO_H_ */