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

Commit 24fae0fe authored by Kukjin Kim's avatar Kukjin Kim
Browse files

mmc: s3cmci: moved mach/regs-sdi.h into s3cmci device driver 



Since mach/regs-sdi.h is used only for s3cmci.c, so this moves the
header file into the driver file, drivers/mmc/host/s3cmci.c file.

Cc: Chris Ball <cjb@laptop.org>
Tested-by: default avatarSylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 6dbe51c2

arch/arm/mach-s3c24xx/dma-s3c2410.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <plat/regs-ac97.h>

#include <plat/regs-dma.h>

#include <mach/regs-lcd.h>

#include <mach/regs-sdi.h>

#include <plat/regs-iis.h>

#include <plat/regs-spi.h>

arch/arm/mach-s3c24xx/dma-s3c2412.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <plat/regs-ac97.h>

#include <plat/regs-dma.h>

#include <mach/regs-lcd.h>

#include <mach/regs-sdi.h>

#include <plat/regs-iis.h>

#include <plat/regs-spi.h>

arch/arm/mach-s3c24xx/dma-s3c2440.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <plat/regs-ac97.h>

#include <plat/regs-dma.h>

#include <mach/regs-lcd.h>

#include <mach/regs-sdi.h>

#include <plat/regs-iis.h>

#include <plat/regs-spi.h>

arch/arm/mach-s3c24xx/dma-s3c2443.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <plat/regs-ac97.h>

#include <plat/regs-dma.h>

#include <mach/regs-lcd.h>

#include <mach/regs-sdi.h>

#include <plat/regs-iis.h>

#include <plat/regs-spi.h>

arch/arm/mach-s3c24xx/include/mach/regs-sdi.h

deleted100644 → 0
+0 −127
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/regs-sdi.h

 *

 * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>

 *		      http://www.simtec.co.uk/products/SWLINUX/

 *

 * 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.

 *

 * S3C2410 MMC/SDIO register definitions

*/



#ifndef __ASM_ARM_REGS_SDI

#define __ASM_ARM_REGS_SDI "regs-sdi.h"



#define S3C2410_SDICON                (0x00)

#define S3C2410_SDIPRE                (0x04)

#define S3C2410_SDICMDARG             (0x08)

#define S3C2410_SDICMDCON             (0x0C)

#define S3C2410_SDICMDSTAT            (0x10)

#define S3C2410_SDIRSP0               (0x14)

#define S3C2410_SDIRSP1               (0x18)

#define S3C2410_SDIRSP2               (0x1C)

#define S3C2410_SDIRSP3               (0x20)

#define S3C2410_SDITIMER              (0x24)

#define S3C2410_SDIBSIZE              (0x28)

#define S3C2410_SDIDCON               (0x2C)

#define S3C2410_SDIDCNT               (0x30)

#define S3C2410_SDIDSTA               (0x34)

#define S3C2410_SDIFSTA               (0x38)



#define S3C2410_SDIDATA               (0x3C)

#define S3C2410_SDIIMSK               (0x40)



#define S3C2440_SDIDATA               (0x40)

#define S3C2440_SDIIMSK               (0x3C)



#define S3C2440_SDICON_SDRESET        (1<<8)

#define S3C2440_SDICON_MMCCLOCK       (1<<5)

#define S3C2410_SDICON_BYTEORDER      (1<<4)

#define S3C2410_SDICON_SDIOIRQ        (1<<3)

#define S3C2410_SDICON_RWAITEN        (1<<2)

#define S3C2410_SDICON_FIFORESET      (1<<1)

#define S3C2410_SDICON_CLOCKTYPE      (1<<0)



#define S3C2410_SDICMDCON_ABORT       (1<<12)

#define S3C2410_SDICMDCON_WITHDATA    (1<<11)

#define S3C2410_SDICMDCON_LONGRSP     (1<<10)

#define S3C2410_SDICMDCON_WAITRSP     (1<<9)

#define S3C2410_SDICMDCON_CMDSTART    (1<<8)

#define S3C2410_SDICMDCON_SENDERHOST  (1<<6)

#define S3C2410_SDICMDCON_INDEX       (0x3f)



#define S3C2410_SDICMDSTAT_CRCFAIL    (1<<12)

#define S3C2410_SDICMDSTAT_CMDSENT    (1<<11)

#define S3C2410_SDICMDSTAT_CMDTIMEOUT (1<<10)

#define S3C2410_SDICMDSTAT_RSPFIN     (1<<9)

#define S3C2410_SDICMDSTAT_XFERING    (1<<8)

#define S3C2410_SDICMDSTAT_INDEX      (0xff)



#define S3C2440_SDIDCON_DS_BYTE       (0<<22)

#define S3C2440_SDIDCON_DS_HALFWORD   (1<<22)

#define S3C2440_SDIDCON_DS_WORD       (2<<22)

#define S3C2410_SDIDCON_IRQPERIOD     (1<<21)

#define S3C2410_SDIDCON_TXAFTERRESP   (1<<20)

#define S3C2410_SDIDCON_RXAFTERCMD    (1<<19)

#define S3C2410_SDIDCON_BUSYAFTERCMD  (1<<18)

#define S3C2410_SDIDCON_BLOCKMODE     (1<<17)

#define S3C2410_SDIDCON_WIDEBUS       (1<<16)

#define S3C2410_SDIDCON_DMAEN         (1<<15)

#define S3C2410_SDIDCON_STOP          (1<<14)

#define S3C2440_SDIDCON_DATSTART      (1<<14)

#define S3C2410_SDIDCON_DATMODE	      (3<<12)

#define S3C2410_SDIDCON_BLKNUM        (0x7ff)



/* constants for S3C2410_SDIDCON_DATMODE */

#define S3C2410_SDIDCON_XFER_READY    (0<<12)

#define S3C2410_SDIDCON_XFER_CHKSTART (1<<12)

#define S3C2410_SDIDCON_XFER_RXSTART  (2<<12)

#define S3C2410_SDIDCON_XFER_TXSTART  (3<<12)



#define S3C2410_SDIDCON_BLKNUM_MASK   (0xFFF)

#define S3C2410_SDIDCNT_BLKNUM_SHIFT  (12)



#define S3C2410_SDIDSTA_RDYWAITREQ    (1<<10)

#define S3C2410_SDIDSTA_SDIOIRQDETECT (1<<9)

#define S3C2410_SDIDSTA_FIFOFAIL      (1<<8)	/* reserved on 2440 */

#define S3C2410_SDIDSTA_CRCFAIL       (1<<7)

#define S3C2410_SDIDSTA_RXCRCFAIL     (1<<6)

#define S3C2410_SDIDSTA_DATATIMEOUT   (1<<5)

#define S3C2410_SDIDSTA_XFERFINISH    (1<<4)

#define S3C2410_SDIDSTA_BUSYFINISH    (1<<3)

#define S3C2410_SDIDSTA_SBITERR       (1<<2)	/* reserved on 2410a/2440 */

#define S3C2410_SDIDSTA_TXDATAON      (1<<1)

#define S3C2410_SDIDSTA_RXDATAON      (1<<0)



#define S3C2440_SDIFSTA_FIFORESET      (1<<16)

#define S3C2440_SDIFSTA_FIFOFAIL       (3<<14)  /* 3 is correct (2 bits) */

#define S3C2410_SDIFSTA_TFDET          (1<<13)

#define S3C2410_SDIFSTA_RFDET          (1<<12)

#define S3C2410_SDIFSTA_TFHALF         (1<<11)

#define S3C2410_SDIFSTA_TFEMPTY        (1<<10)

#define S3C2410_SDIFSTA_RFLAST         (1<<9)

#define S3C2410_SDIFSTA_RFFULL         (1<<8)

#define S3C2410_SDIFSTA_RFHALF         (1<<7)

#define S3C2410_SDIFSTA_COUNTMASK      (0x7f)



#define S3C2410_SDIIMSK_RESPONSECRC    (1<<17)

#define S3C2410_SDIIMSK_CMDSENT        (1<<16)

#define S3C2410_SDIIMSK_CMDTIMEOUT     (1<<15)

#define S3C2410_SDIIMSK_RESPONSEND     (1<<14)

#define S3C2410_SDIIMSK_READWAIT       (1<<13)

#define S3C2410_SDIIMSK_SDIOIRQ        (1<<12)

#define S3C2410_SDIIMSK_FIFOFAIL       (1<<11)

#define S3C2410_SDIIMSK_CRCSTATUS      (1<<10)

#define S3C2410_SDIIMSK_DATACRC        (1<<9)

#define S3C2410_SDIIMSK_DATATIMEOUT    (1<<8)

#define S3C2410_SDIIMSK_DATAFINISH     (1<<7)

#define S3C2410_SDIIMSK_BUSYFINISH     (1<<6)

#define S3C2410_SDIIMSK_SBITERR        (1<<5)	/* reserved 2440/2410a */

#define S3C2410_SDIIMSK_TXFIFOHALF     (1<<4)

#define S3C2410_SDIIMSK_TXFIFOEMPTY    (1<<3)

#define S3C2410_SDIIMSK_RXFIFOLAST     (1<<2)

#define S3C2410_SDIIMSK_RXFIFOFULL     (1<<1)

#define S3C2410_SDIIMSK_RXFIFOHALF     (1<<0)



#endif /* __ASM_ARM_REGS_SDI */