diff options
| -rw-r--r-- | arch/arm/include/asm/arch-s5pc1xx/cpu.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-s5pc1xx/mmc.h | 71 | ||||
| -rw-r--r-- | board/samsung/goni/goni.c | 37 | ||||
| -rw-r--r-- | drivers/mmc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/mmc/s5p_mmc.c | 478 | ||||
| -rw-r--r-- | drivers/serial/serial_s5p.c | 4 | ||||
| -rw-r--r-- | include/configs/s5p_goni.h | 6 | 
7 files changed, 597 insertions, 2 deletions
| diff --git a/arch/arm/include/asm/arch-s5pc1xx/cpu.h b/arch/arm/include/asm/arch-s5pc1xx/cpu.h index 90485aaff..b3af8cc78 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/cpu.h +++ b/arch/arm/include/asm/arch-s5pc1xx/cpu.h @@ -38,6 +38,7 @@  #define S5PC100_PWMTIMER_BASE	0xEA000000  #define S5PC100_WATCHDOG_BASE	0xEA200000  #define S5PC100_UART_BASE	0xEC000000 +#define S5PC100_MMC_BASE	0xED800000  /* S5PC110 */  #define S5PC110_GPIO_BASE	0xE0200000 @@ -45,6 +46,7 @@  #define S5PC110_WATCHDOG_BASE	0xE2700000  #define S5PC110_UART_BASE	0xE2900000  #define S5PC110_SROMC_BASE	0xE8000000 +#define S5PC110_MMC_BASE	0xEB000000  #define S5PC110_DMC0_BASE	0xF0000000  #define S5PC110_DMC1_BASE	0xF1400000  #define S5PC110_VIC0_BASE	0xF2000000 diff --git a/arch/arm/include/asm/arch-s5pc1xx/mmc.h b/arch/arm/include/asm/arch-s5pc1xx/mmc.h new file mode 100644 index 000000000..ac560c270 --- /dev/null +++ b/arch/arm/include/asm/arch-s5pc1xx/mmc.h @@ -0,0 +1,71 @@ +/* + * (C) Copyright 2009 SAMSUNG Electronics + * Minkyu Kang <mk7.kang@samsung.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA + * + */ + +#ifndef __ASM_ARCH_MMC_H_ +#define __ASM_ARCH_MMC_H_ + +#ifndef __ASSEMBLY__ +struct s5p_mmc { +	unsigned int	sysad; +	unsigned short	blksize; +	unsigned short	blkcnt; +	unsigned int	argument; +	unsigned short	trnmod; +	unsigned short	cmdreg; +	unsigned int	rspreg0; +	unsigned int	rspreg1; +	unsigned int	rspreg2; +	unsigned int	rspreg3; +	unsigned int	bdata; +	unsigned int	prnsts; +	unsigned char	hostctl; +	unsigned char	pwrcon; +	unsigned char	blkgap; +	unsigned char	wakcon; +	unsigned short	clkcon; +	unsigned char	timeoutcon; +	unsigned char	swrst; +	unsigned int	norintsts;	/* errintsts */ +	unsigned int	norintstsen;	/* errintstsen */ +	unsigned int	norintsigen;	/* errintsigen */ +	unsigned short	acmd12errsts; +	unsigned char	res1[2]; +	unsigned int	capareg; +	unsigned char	res2[4]; +	unsigned int	maxcurr; +	unsigned char	res3[0x34]; +	unsigned int	control2; +	unsigned int	control3; +	unsigned int	control4; +	unsigned char	res4[0x6e]; +	unsigned short	hcver; +	unsigned char	res5[0xFFF00]; +}; + +struct mmc_host { +	struct s5p_mmc *reg; +	unsigned int version;	/* SDHCI spec. version */ +	unsigned int clock;	/* Current clock (MHz) */ +}; + +int s5p_mmc_init(int dev_index); + +#endif	/* __ASSEMBLY__ */ +#endif diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index e512c5908..060d5d17c 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -23,11 +23,18 @@   */  #include <common.h> +#include <asm/arch/gpio.h> +#include <asm/arch/mmc.h>  DECLARE_GLOBAL_DATA_PTR; +static struct s5pc110_gpio *s5pc110_gpio; +  int board_init(void)  { +	/* Set Initial global variables */ +	s5pc110_gpio = (struct s5pc110_gpio *)S5PC110_GPIO_BASE; +  	gd->bd->bi_arch_number = MACH_TYPE_GONI;  	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; @@ -53,3 +60,33 @@ int checkboard(void)  	return 0;  }  #endif + +#ifdef CONFIG_GENERIC_MMC +int board_mmc_init(bd_t *bis) +{ +	int i; + +	/* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */ +	gpio_direction_output(&s5pc110_gpio->gpio_j2, 7, 1); + +	/* +	 * MMC0 GPIO +	 * GPG0[0]	SD_0_CLK +	 * GPG0[1]	SD_0_CMD +	 * GPG0[2]	SD_0_CDn	-> Not used +	 * GPG0[3:6]	SD_0_DATA[0:3] +	 */ +	for (i = 0; i < 7; i++) { +		if (i == 2) +			continue; +		/* GPG0[0:6] special function 2 */ +		gpio_cfg_pin(&s5pc110_gpio->gpio_g0, i, 0x2); +		/* GPG0[0:6] pull disable */ +		gpio_set_pull(&s5pc110_gpio->gpio_g0, i, GPIO_PULL_NONE); +		/* GPG0[0:6] drv 4x */ +		gpio_set_drv(&s5pc110_gpio->gpio_g0, i, GPIO_DRV_4X); +	} + +	return s5p_mmc_init(0); +} +#endif diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 6fa04b84f..8dfd8a32b 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -32,6 +32,7 @@ COBJS-$(CONFIG_OMAP3_MMC) += omap3_mmc.o  COBJS-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o  COBJS-$(CONFIG_MXC_MMC) += mxcmmc.o  COBJS-$(CONFIG_PXA_MMC) += pxa_mmc.o +COBJS-$(CONFIG_S5P_MMC) += s5p_mmc.o  COBJS	:= $(COBJS-y)  SRCS	:= $(COBJS:.o=.c) diff --git a/drivers/mmc/s5p_mmc.c b/drivers/mmc/s5p_mmc.c new file mode 100644 index 000000000..669b1d0d2 --- /dev/null +++ b/drivers/mmc/s5p_mmc.c @@ -0,0 +1,478 @@ +/* + * (C) Copyright 2009 SAMSUNG Electronics + * Minkyu Kang <mk7.kang@samsung.com> + * Jaehoon Chung <jh80.chung@samsung.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA + */ + +#include <common.h> +#include <mmc.h> +#include <asm/io.h> +#include <asm/arch/mmc.h> + +#ifdef DEBUG_S5P_HSMMC +#define dbg(x...)       printf(x) +#else +#define dbg(x...)       do { } while (0) +#endif + +/* support 4 mmc hosts */ +struct mmc mmc_dev[4]; +struct mmc_host mmc_host[4]; + +static inline struct s5p_mmc *s5p_get_base_mmc(int dev_index) +{ +	unsigned long offset = dev_index * sizeof(struct s5p_mmc); + +	if (cpu_is_s5pc100()) +		return (struct s5p_mmc *)(S5PC100_MMC_BASE + offset); +	else +		return (struct s5p_mmc *)(S5PC110_MMC_BASE + offset); +} + +static void mmc_prepare_data(struct mmc_host *host, struct mmc_data *data) +{ +	unsigned char ctrl; + +	dbg("data->dest: %08x\n", (u32)data->dest); +	writel((u32)data->dest, &host->reg->sysad); +	/* +	 * DMASEL[4:3] +	 * 00 = Selects SDMA +	 * 01 = Reserved +	 * 10 = Selects 32-bit Address ADMA2 +	 * 11 = Selects 64-bit Address ADMA2 +	 */ +	ctrl = readb(&host->reg->hostctl); +	ctrl &= ~(3 << 3); +	writeb(ctrl, &host->reg->hostctl); + +	/* We do not handle DMA boundaries, so set it to max (512 KiB) */ +	writew((7 << 12) | (512 << 0), &host->reg->blksize); +	writew(data->blocks, &host->reg->blkcnt); +} + +static void mmc_set_transfer_mode(struct mmc_host *host, struct mmc_data *data) +{ +	unsigned short mode; + +	/* +	 * TRNMOD +	 * MUL1SIN0[5]	: Multi/Single Block Select +	 * RD1WT0[4]	: Data Transfer Direction Select +	 *	1 = read +	 *	0 = write +	 * ENACMD12[2]	: Auto CMD12 Enable +	 * ENBLKCNT[1]	: Block Count Enable +	 * ENDMA[0]	: DMA Enable +	 */ +	mode = (1 << 1) | (1 << 0); +	if (data->blocks > 1) +		mode |= (1 << 5); +	if (data->flags & MMC_DATA_READ) +		mode |= (1 << 4); + +	writew(mode, &host->reg->trnmod); +} + +static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, +			struct mmc_data *data) +{ +	struct mmc_host *host = (struct mmc_host *)mmc->priv; +	int flags, i; +	unsigned int timeout; +	unsigned int mask; +	unsigned int retry = 0x100000; + +	/* Wait max 10 ms */ +	timeout = 10; + +	/* +	 * PRNSTS +	 * CMDINHDAT[1]	: Command Inhibit (DAT) +	 * CMDINHCMD[0]	: Command Inhibit (CMD) +	 */ +	mask = (1 << 0); +	if ((data != NULL) || (cmd->resp_type & MMC_RSP_BUSY)) +		mask |= (1 << 1); + +	/* +	 * We shouldn't wait for data inihibit for stop commands, even +	 * though they might use busy signaling +	 */ +	if (data) +		mask &= ~(1 << 1); + +	while (readl(&host->reg->prnsts) & mask) { +		if (timeout == 0) { +			printf("%s: timeout error\n", __func__); +			return -1; +		} +		timeout--; +		udelay(1000); +	} + +	if (data) +		mmc_prepare_data(host, data); + +	dbg("cmd->arg: %08x\n", cmd->cmdarg); +	writel(cmd->cmdarg, &host->reg->argument); + +	if (data) +		mmc_set_transfer_mode(host, data); + +	if ((cmd->resp_type & MMC_RSP_136) && (cmd->resp_type & MMC_RSP_BUSY)) +		return -1; + +	/* +	 * CMDREG +	 * CMDIDX[13:8]	: Command index +	 * DATAPRNT[5]	: Data Present Select +	 * ENCMDIDX[4]	: Command Index Check Enable +	 * ENCMDCRC[3]	: Command CRC Check Enable +	 * RSPTYP[1:0] +	 *	00 = No Response +	 *	01 = Length 136 +	 *	10 = Length 48 +	 *	11 = Length 48 Check busy after response +	 */ +	if (!(cmd->resp_type & MMC_RSP_PRESENT)) +		flags = 0; +	else if (cmd->resp_type & MMC_RSP_136) +		flags = (1 << 0); +	else if (cmd->resp_type & MMC_RSP_BUSY) +		flags = (3 << 0); +	else +		flags = (2 << 0); + +	if (cmd->resp_type & MMC_RSP_CRC) +		flags |= (1 << 3); +	if (cmd->resp_type & MMC_RSP_OPCODE) +		flags |= (1 << 4); +	if (data) +		flags |= (1 << 5); + +	dbg("cmd: %d\n", cmd->cmdidx); + +	writew((cmd->cmdidx << 8) | flags, &host->reg->cmdreg); + +	for (i = 0; i < retry; i++) { +		mask = readl(&host->reg->norintsts); +		/* Command Complete */ +		if (mask & (1 << 0)) { +			if (!data) +				writel(mask, &host->reg->norintsts); +			break; +		} +	} + +	if (i == retry) { +		printf("%s: waiting for status update\n", __func__); +		return TIMEOUT; +	} + +	if (mask & (1 << 16)) { +		/* Timeout Error */ +		dbg("timeout: %08x cmd %d\n", mask, cmd->cmdidx); +		return TIMEOUT; +	} else if (mask & (1 << 15)) { +		/* Error Interrupt */ +		dbg("error: %08x cmd %d\n", mask, cmd->cmdidx); +		return -1; +	} + +	if (cmd->resp_type & MMC_RSP_PRESENT) { +		if (cmd->resp_type & MMC_RSP_136) { +			/* CRC is stripped so we need to do some shifting. */ +			for (i = 0; i < 4; i++) { +				unsigned int offset = +					(unsigned int)(&host->reg->rspreg3 - i); +				cmd->response[i] = readl(offset) << 8; + +				if (i != 3) { +					cmd->response[i] |= +						readb(offset - 1); +				} +				dbg("cmd->resp[%d]: %08x\n", +						i, cmd->response[i]); +			} +		} else if (cmd->resp_type & MMC_RSP_BUSY) { +			for (i = 0; i < retry; i++) { +				/* PRNTDATA[23:20] : DAT[3:0] Line Signal */ +				if (readl(&host->reg->prnsts) +					& (1 << 20))	/* DAT[0] */ +					break; +			} + +			if (i == retry) { +				printf("%s: card is still busy\n", __func__); +				return TIMEOUT; +			} + +			cmd->response[0] = readl(&host->reg->rspreg0); +			dbg("cmd->resp[0]: %08x\n", cmd->response[0]); +		} else { +			cmd->response[0] = readl(&host->reg->rspreg0); +			dbg("cmd->resp[0]: %08x\n", cmd->response[0]); +		} +	} + +	if (data) { +		while (1) { +			mask = readl(&host->reg->norintsts); + +			if (mask & (1 << 15)) { +				/* Error Interrupt */ +				writel(mask, &host->reg->norintsts); +				printf("%s: error during transfer: 0x%08x\n", +						__func__, mask); +				return -1; +			} else if (mask & (1 << 3)) { +				/* DMA Interrupt */ +				dbg("DMA end\n"); +				break; +			} else if (mask & (1 << 1)) { +				/* Transfer Complete */ +				dbg("r/w is done\n"); +				break; +			} +		} +		writel(mask, &host->reg->norintsts); +	} + +	udelay(1000); +	return 0; +} + +static void mmc_change_clock(struct mmc_host *host, uint clock) +{ +	int div; +	unsigned short clk; +	unsigned long timeout; +	unsigned long ctrl2; + +	/* +	 * SELBASECLK[5:4] +	 * 00/01 = HCLK +	 * 10 = EPLL +	 * 11 = XTI or XEXTCLK +	 */ +	ctrl2 = readl(&host->reg->control2); +	ctrl2 &= ~(3 << 4); +	ctrl2 |= (2 << 4); +	writel(ctrl2, &host->reg->control2); + +	writew(0, &host->reg->clkcon); + +	/* XXX: we assume that clock is between 40MHz and 50MHz */ +	if (clock == 0) +		goto out; +	else if (clock <= 400000) +		div = 0x100; +	else if (clock <= 20000000) +		div = 4; +	else if (clock <= 26000000) +		div = 2; +	else +		div = 1; +	dbg("div: %d\n", div); + +	div >>= 1; +	/* +	 * CLKCON +	 * SELFREQ[15:8]	: base clock divied by value +	 * ENSDCLK[2]		: SD Clock Enable +	 * STBLINTCLK[1]	: Internal Clock Stable +	 * ENINTCLK[0]		: Internal Clock Enable +	 */ +	clk = (div << 8) | (1 << 0); +	writew(clk, &host->reg->clkcon); + +	/* Wait max 10 ms */ +	timeout = 10; +	while (!(readw(&host->reg->clkcon) & (1 << 1))) { +		if (timeout == 0) { +			printf("%s: timeout error\n", __func__); +			return; +		} +		timeout--; +		udelay(1000); +	} + +	clk |= (1 << 2); +	writew(clk, &host->reg->clkcon); + +out: +	host->clock = clock; +} + +static void mmc_set_ios(struct mmc *mmc) +{ +	struct mmc_host *host = mmc->priv; +	unsigned char ctrl; +	unsigned long val; + +	dbg("set_ios: bus_width: %x, clock: %d\n", mmc->bus_width, mmc->clock); + +	/* +	 * SELCLKPADDS[17:16] +	 * 00 = 2mA +	 * 01 = 4mA +	 * 10 = 7mA +	 * 11 = 9mA +	 */ +	writel(0x3 << 16, &host->reg->control4); + +	val = readl(&host->reg->control2); +	val &= (0x3 << 4); + +	val |=	(1 << 31) |	/* write status clear async mode enable */ +		(1 << 30) |	/* command conflict mask enable */ +		(1 << 14) |	/* Feedback Clock Enable for Rx Clock */ +		(1 << 8);	/* SDCLK hold enable */ + +	writel(val, &host->reg->control2); + +	/* +	 * FCSEL1[15] FCSEL0[7] +	 * FCSel[1:0] : Rx Feedback Clock Delay Control +	 *	Inverter delay means10ns delay if SDCLK 50MHz setting +	 *	01 = Delay1 (basic delay) +	 *	11 = Delay2 (basic delay + 2ns) +	 *	00 = Delay3 (inverter delay) +	 *	10 = Delay4 (inverter delay + 2ns) +	 */ +	writel(0x8080, &host->reg->control3); + +	mmc_change_clock(host, mmc->clock); + +	ctrl = readb(&host->reg->hostctl); + +	/* +	 * WIDE4[1] +	 * 1 = 4-bit mode +	 * 0 = 1-bit mode +	 */ +	if (mmc->bus_width == 4) +		ctrl |= (1 << 1); +	else +		ctrl &= ~(1 << 1); + +	/* +	 * OUTEDGEINV[2] +	 * 1 = Riging edge output +	 * 0 = Falling edge output +	 */ +	ctrl &= ~(1 << 2); + +	writeb(ctrl, &host->reg->hostctl); +} + +static void mmc_reset(struct mmc_host *host) +{ +	unsigned int timeout; + +	/* +	 * RSTALL[0] : Software reset for all +	 * 1 = reset +	 * 0 = work +	 */ +	writeb((1 << 0), &host->reg->swrst); + +	host->clock = 0; + +	/* Wait max 100 ms */ +	timeout = 100; + +	/* hw clears the bit when it's done */ +	while (readb(&host->reg->swrst) & (1 << 0)) { +		if (timeout == 0) { +			printf("%s: timeout error\n", __func__); +			return; +		} +		timeout--; +		udelay(1000); +	} +} + +static int mmc_core_init(struct mmc *mmc) +{ +	struct mmc_host *host = (struct mmc_host *)mmc->priv; +	unsigned int mask; + +	mmc_reset(host); + +	host->version = readw(&host->reg->hcver); + +	/* mask all */ +	writel(0xffffffff, &host->reg->norintstsen); +	writel(0xffffffff, &host->reg->norintsigen); + +	writeb(0xe, &host->reg->timeoutcon);	/* TMCLK * 2^27 */ + +	/* +	 * NORMAL Interrupt Status Enable Register init +	 * [5] ENSTABUFRDRDY : Buffer Read Ready Status Enable +	 * [4] ENSTABUFWTRDY : Buffer write Ready Status Enable +	 * [1] ENSTASTANSCMPLT : Transfre Complete Status Enable +	 * [0] ENSTACMDCMPLT : Command Complete Status Enable +	*/ +	mask = readl(&host->reg->norintstsen); +	mask &= ~(0xffff); +	mask |= (1 << 5) | (1 << 4) | (1 << 1) | (1 << 0); +	writel(mask, &host->reg->norintstsen); + +	/* +	 * NORMAL Interrupt Signal Enable Register init +	 * [1] ENSTACMDCMPLT : Transfer Complete Signal Enable +	 */ +	mask = readl(&host->reg->norintsigen); +	mask &= ~(0xffff); +	mask |= (1 << 1); +	writel(mask, &host->reg->norintsigen); + +	return 0; +} + +static int s5p_mmc_initialize(int dev_index) +{ +	struct mmc *mmc; + +	mmc = &mmc_dev[dev_index]; + +	sprintf(mmc->name, "SAMSUNG SD/MMC"); +	mmc->priv = &mmc_host[dev_index]; +	mmc->send_cmd = mmc_send_cmd; +	mmc->set_ios = mmc_set_ios; +	mmc->init = mmc_core_init; + +	mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195; +	mmc->host_caps = MMC_MODE_4BIT | MMC_MODE_HS_52MHz | MMC_MODE_HS; + +	mmc->f_min = 400000; +	mmc->f_max = 52000000; + +	mmc_host[dev_index].clock = 0; +	mmc_host[dev_index].reg = s5p_get_base_mmc(dev_index); +	mmc_register(mmc); + +	return 0; +} + +int s5p_mmc_init(int dev_index) +{ +	return s5p_mmc_initialize(dev_index); +} diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index 9747db372..e0d4e8004 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -133,7 +133,7 @@ int serial_getc_dev(const int dev_index)  			return 0;  	} -	return (int)(readl(&uart->urxh) & 0xff); +	return (int)(readb(&uart->urxh) & 0xff);  }  /* @@ -149,7 +149,7 @@ void serial_putc_dev(const char c, const int dev_index)  			return;  	} -	writel(c, &uart->utxh); +	writeb(c, &uart->utxh);  	/* If \n, also do \r */  	if (c == '\n') diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index ff0dbd3c2..c8ea8fda8 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -67,6 +67,11 @@  #define CONFIG_SERIAL_MULTI		1  #define CONFIG_BAUDRATE			115200 +/* MMC */ +#define CONFIG_GENERIC_MMC		1 +#define CONFIG_MMC			1 +#define CONFIG_S5P_MMC			1 +  /* It should define before config_cmd_default.h */  #define CONFIG_SYS_NO_FLASH		1 @@ -82,6 +87,7 @@  #define CONFIG_CMD_REGINFO  #define CONFIG_CMD_ONENAND  #define CONFIG_CMD_MTDPARTS +#define CONFIG_CMD_MMC  #define CONFIG_BOOTDELAY		1  #define CONFIG_ZERO_BOOTDELAY_CHECK |