No subject
Quoted 1 line
+ response[resp_indx] =3D SDIO_REG_READ16(SDIO_RSP(resp_indx)=
);
Review
Quoted 8 lines
(quoted diff) +8
-0+ + /* Copy the response to the response buffer */ + if (cmd->resp_type & MMC_RSP_PRESENT) { + cmd->response[0] =3D ((response[2] & 0x3f) << (8 - 8)) | + ((response[1] & 0xffff) << (14 - 8)) | + ((response[0] & 0x3ff) << (30 - 8)); + if (cmd->resp_type & MMC_RSP_136) { + cmd->response[3] =3D ((response[7] & 0x3fff) << 8) =
|
Review
Quoted 2 lines
(quoted diff) +2
-0+ ((response[6] & 0x3ff) << 22); + cmd->response[2] =3D ((response[6] & 0xfc00) >> 10)=
|
Review
Quoted 3 lines
(quoted diff) +3
-0+ ((response[5] & 0xffff) << 6) | + ((response[4] & 0x3ff) << 22); + cmd->response[1] =3D ((response[4] & 0xfc00) >> 10)=
|
Review
Quoted 3 lines
(quoted diff) +3
-0+ ((response[3] & 0xffff) << 6) | + ((response[2] & 0x3ff) << 22); + cmd->response[0] =3D ((response[2] & 0xfc00) >> 10)=
|
Quoted 12 lines
(quoted diff) +12
-0+ ((response[1] & 0xffff) << 6) | + ((response[0] & 0x3ff) << 22); + } + } + +#ifdef DEBUG + printf("resp index[0x%x] ", response[0] >> 10); + printf("[0x%x] ", cmd->response[0]); + printf("[0x%x] ", cmd->response[1]); + printf("[0x%x] ", cmd->response[2]); + printf("[0x%x] ", cmd->response[3]); + printf("\n");
Review
Quoted 10 lines
(quoted diff) +10
-0+#endif + + return 0; +} + +static void mrvl_mmc_set_clk(unsigned long clk) +{ + unsigned int m; + + m =3D MRVL_MMC_BASE_FAST_CLOCK/(2*clk) - 1;
Provide some reference for this calculation?
Review
Quoted 5 lines
(quoted diff) +5
-0+#ifdef DEBUG + printf("mrvl_mmc_set_clk: dividor =3D 0x%x clock=3D%d\n", m, clk); +#endif + SDIO_REG_WRITE32(SDIO_CLK_DIV, m & 0x7ff); + udelay(10*1000);
Instead of delays, may you check certain status bit?
Quoted 11 lines
(quoted diff) +11
-0+} + +static void mrvl_mmc_set_bus(unsigned int bus) +{ + ushort reg; + +#ifdef DEBUG + printf("mrvl_mmc_set_bus: bus =3D 0x%d\n", bus); +#endif + reg =3D SDIO_REG_READ16(SDIO_HOST_CTRL); + reg &=3D ~(1 << 9);
Review
Quoted 10 lines
(quoted diff) +10
-0+ switch (bus) { + case 4: + reg |=3D SDIO_HOST_CTRL_DATA_WIDTH_4_BITS; + break; + case 1: + default: + reg |=3D SDIO_HOST_CTRL_DATA_WIDTH_1_BIT; + } + SDIO_REG_WRITE16(SDIO_HOST_CTRL, reg); + udelay(10*1000);
Ditto
Quoted 1 line
+}
Insert a line here
Quoted 12 lines
(quoted diff) +12
-0+static void mrvl_mmc_set_ios(struct mmc *mmc) +{ +#ifdef DEBUG + printf("bus[%d] clock[%d]\n", mmc->bus_width, mmc->clock); +#endif + mrvl_mmc_set_bus(mmc->bus_width); + mrvl_mmc_set_clk(mmc->clock); +} + +static int mrvl_mmc_init(struct mmc *mmc) +{ +#ifdef DEBUG
Review
Quoted 10 lines
(quoted diff) +10
-0+ printf("mrvl_mmc_init\n"); +#endif + + /* Setting host parameters */ + SDIO_REG_WRITE16(SDIO_HOST_CTRL, + SDIO_HOST_CTRL_TMOUT(0xf) | + SDIO_HOST_CTRL_DATA_WIDTH_4_BITS | + SDIO_HOST_CTRL_BIG_ENDIAN | + SDIO_HOST_CTRL_PUSH_PULL_EN | + SDIO_HOST_CTRL_CARD_TYPE_MEM_ONLY )=
;
Quoted 76 lines
(quoted diff) +39
-0+ SDIO_REG_WRITE16(SDIO_CLK_CTRL, 0); + + /* enable status */ + SDIO_REG_WRITE16(SDIO_NOR_STATUS_EN, 0xffff); + SDIO_REG_WRITE16(SDIO_ERR_STATUS_EN, 0xffff); + + /* disable interrupts */ + SDIO_REG_WRITE16(SDIO_NOR_INTR_EN, 0); + SDIO_REG_WRITE16(SDIO_ERR_INTR_EN, 0); + + /* SW reset */ + SDIO_REG_WRITE16(SDIO_SW_RESET,0x100); + udelay(10000); + return 0; +} + +int mrvl_mmc_initialize(bd_t *bis) +{ + struct mmc *mmc =3D NULL; + + mmc =3D malloc(sizeof(struct mmc)); + if (!mmc) + return -1; + + sprintf(mmc->name, "MRVL_MMC"); + mmc->send_cmd =3D mrvl_mmc_send_cmd; + mmc->set_ios =3D mrvl_mmc_set_ios; + mmc->init =3D mrvl_mmc_init; + + mmc->host_caps =3D MMC_MODE_4BIT | MMC_MODE_HS; + mmc->voltages =3D MMC_VDD_32_33 | MMC_VDD_33_34; + mmc->f_max =3D MRVL_MMC_CLOCKRATE_MAX; + mmc->f_min =3D MRVL_MMC_CLOCKRATE_MIN; + mmc->block_dev.part_type =3D PART_TYPE_DOS; + + mmc_register(mmc); + + return 0; +}include/mrvl_mmc.h new file +28
-0@@ -0,0 +1,191 @@ +/* +* (C) Copyright 2012 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Lior Amsalem <[email protected]> +* See file CREDITS for list of people who contributed to this +* project. +* +* 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 __MRVL_MMC_H__ +#define __MRVL_MMC_H__ + +/* General definitions */ +#define P (x) (CONFIG_SYS_MMC_BASE + (x)) +#define SDIO_REG_WRITE32 (addr,val) (*(volatile unsignedlong*)(P(addr)) =3D val)
+#defineSDIO_REG_WRITE16(addr,val)(*(volatile unsigned short*)(P(addr)) =3D val)
include/mrvl_mmc.h
Quoted 5 lines
include/mrvl_mmc.h new file +5
-0+#define SDIO_REG_READ16 (addr) (*(volatile unsigned short*)(P(addr))) +#define SDIO_REG_READ32 (addr) (*(volatile unsigned long*)(P(addr))) + +//#define MVSDMMC_DMA_SIZE 65536 +//#define MVSDMMC_CMD_TIMEOUT 2 /* 100 usec*/
Don't use c++ style of comments
include/mrvl_mmc.h
Quoted 4 lines
include/mrvl_mmc.h new file +4
-0+ +/* The base MMC clock rate */ +#define MRVL_MMC_CLOCKRATE_MIN 250000 +#define MRVL_MMC_CLOCKRATE_MAX 50000000
Make this configurable if not defined then use default values
include/mrvl_mmc.h
Quoted 3 lines
include/mrvl_mmc.h new file +3
-0+#define MRVL_MMC_BASE_FAST_CLOCK 200000000//100000000 + +/* SDIO register */
NACK, please use c-struct for register definition
Ref: line 30 arch/arm/include/arch-kirkwood/spi.h, create similar mmc.h ins= tead of include/Kirkwood_mmc.h
Quoted 34 lines
include/mrvl_mmc.h new file +34
-0+#define SDIO_SYS_ADDR_LOW 0x000 +#define SDIO_SYS_ADDR_HI 0x004 +#define SDIO_BLK_SIZE 0x008 +#define SDIO_BLK_COUNT 0x00c +#define SDIO_ARG_LOW 0x010 +#define SDIO_ARG_HI 0x014 +#define SDIO_XFER_MODE 0x018 +#define SDIO_CMD 0x01c +#define SDIO_RSP (i) (0x020 + ((i)<<2)) +#define SDIO_RSP0 0x020 +#define SDIO_RSP1 0x024 +#define SDIO_RSP2 0x028 +#define SDIO_RSP3 0x02c +#define SDIO_RSP4 0x030 +#define SDIO_RSP5 0x034 +#define SDIO_RSP6 0x038 +#define SDIO_RSP7 0x03c +#define SDIO_BUF_DATA_PORT 0x040 +#define SDIO_RSVED 0x044 +#define SDIO_PRESENT_STATE0 0x048 +#define SDIO_PRESENT_STATE1 0x04c +#define SDIO_HOST_CTRL 0x050 +#define SDIO_BLK_GAP_CTRL 0x054 +#define SDIO_CLK_CTRL 0x058 +#define SDIO_SW_RESET 0x05c +#define SDIO_NOR_INTR_STATUS 0x060 +#define SDIO_ERR_INTR_STATUS 0x064 +#define SDIO_NOR_STATUS_EN 0x068 +#define SDIO_ERR_STATUS_EN 0x06c +#define SDIO_NOR_INTR_EN 0x070 +#define SDIO_ERR_INTR_EN 0x074 +#define SDIO_AUTOCMD12_ERR_STATUS 0x078 +#define SDIO_CURR_BYTE_LEFT 0x07c +#define SDIO_CURR_BLK_LEFT 0x080
include/mrvl_mmc.h
Quoted 10 lines
include/mrvl_mmc.h new file +10
-0+#define SDIO_AUTOCMD12_ARG_LOW 0x084 +#define SDIO_AUTOCMD12_ARG_HI 0x088 +#define SDIO_AUTOCMD12_INDEX 0x08c +#define SDIO_AUTO_RSP (i) (0x090 + ((i)<<2)) +#define SDIO_AUTO_RSP0 0x090 +#define SDIO_AUTO_RSP1 0x094 +#define SDIO_AUTO_RSP2 0x098 +#define SDIO_CLK_DIV 0x128 + +#define WINDOW_CTRL (i) (0x108 + ((i) << 3)=
)
Quoted 1 line
+#define
WINDOW_BASE(i)(0x10c+ ((i) << 3)=
)
include/mrvl_mmc.h
Quoted 9 lines
include/mrvl_mmc.h new file +9
-0+ +/* SDIO_PRESENT_STATE */ +#define CARD_BUSY (1 << 1) +#define CMD_INHIBIT (1 << 0) +#define CMD_TXACTIVE (1 << 8) +#define CMD_RXACTIVE (1 << 9) +#define CMD_AUTOCMD12ACTIVE (1 << 14) +#define CMD_BUS_BUSY (CMD_AUTOCMD12ACTIVE | \ + CMD_RXACTIV=
E | \
Quoted 1 line
+ CMD_TXACTIV=
E | \
Quoted 1 line
+ CMD_INHIBIT=
| \
Quoted 66 lines
include/mrvl_mmc.h new file +64
-0+ CARD_BUSY) + +/* SDIO_CMD */ +#define SDIO_CMD_RSP_NONE (0 << 0) +#define SDIO_CMD_RSP_136 (1 << 0) +#define SDIO_CMD_RSP_48 (2 << 0) +#define SDIO_CMD_RSP_48BUSY (3 << 0) +#define SDIO_CMD_CHECK_DATACRC16 (1 << 2) +#define SDIO_CMD_CHECK_CMDCRC (1 << 3) +#define SDIO_CMD_INDX_CHECK (1 << 4) +#define SDIO_CMD_DATA_PRESENT (1 << 5) +#define SDIO_UNEXPECTED_RESP (1 << 7) + +/* SDIO_XFER_MODE */ +#define SDIO_XFER_MODE_STOP_CLK (1 << 5) +#define SDIO_XFER_MODE_HW_WR_DATA_EN (1 << 1) +#define SDIO_XFER_MODE_AUTO_CMD12 (1 << 2) +#define SDIO_XFER_MODE_INT_CHK_EN (1 << 3) +#define SDIO_XFER_MODE_TO_HOST (1 << 4) +#define SDIO_XFER_MODE_DMA (0 << 6) + +/* SDIO_HOST_CTRL */ +#define SDIO_HOST_CTRL_PUSH_PULL_EN (1 << 0) +#define SDIO_HOST_CTRL_CARD_TYPE_MEM_ONLY (0 << 1) +#define SDIO_HOST_CTRL_CARD_TYPE_IO_ONLY (1 << 1) +#define SDIO_HOST_CTRL_CARD_TYPE_IO_MEM_COMBO (2 << 1) +#define SDIO_HOST_CTRL_CARD_TYPE_MMC (3 << 1) +#define SDIO_HOST_CTRL_CARD_TYPE_MASK (3 << 1) +#define SDIO_HOST_CTRL_BIG_ENDIAN (1 << 3) +#define SDIO_HOST_CTRL_LSB_FIRST (1 << 4) +#define SDIO_HOST_CTRL_ID_MODE_LOW_FREQ (1 << 5) +#define SDIO_HOST_CTRL_HALF_SPEED (1 << 6) +#define SDIO_HOST_CTRL_DATA_WIDTH_1_BIT (0 << 9) +#define SDIO_HOST_CTRL_DATA_WIDTH_4_BITS (1 << 9) +#define SDIO_HOST_CTRL_HI_SPEED_EN (1 << 10) +#define SDIO_HOST_CTRL_TMOUT_MASK (0xf << 11) +#define SDIO_HOST_CTRL_TMOUT_MAX (0xf << 11) +#define SDIO_HOST_CTRL_TMOUT (x) ((x) << 11) +#define SDIO_HOST_CTRL_TMOUT_EN (1 << 15) +#define SDIO_HOST_CTRL_DFAULT_OPEN_DRAIN (SDIO_HOST_CTRL_TMOUT(x)(0xf)) +#define SDIO_HOST_CTRL_DFAULT_PUSH_PULL (SDIO_HOST_CTRL_TMOUT (x)(0xf ) |SDIO_HOST_CTRL_PUSH_PULL_EN ) + +/* NOR status bits */ +#define SDIO_NOR_ERROR (1 << 15) +#define SDIO_NOR_UNEXP_RSP (1 << 14) +#define SDIO_NOR_AUTOCMD12_DONE (1 << 13) +#define SDIO_NOR_SUSPEND_ON (1 << 12) +#define SDIO_NOR_LMB_FF_8W_AVAIL (1 << 11) +#define SDIO_NOR_LMB_FF_8W_FILLED (1 << 10) +#define SDIO_NOR_READ_WAIT_ON (1 << 9) +#define SDIO_NOR_CARD_INT (1 << 8) +#define SDIO_NOR_READ_READY (1 << 5) +#define SDIO_NOR_WRITE_READY (1 << 4) +#define SDIO_NOR_DMA_INI (1 << 3) +#define SDIO_NOR_BLK_GAP_EVT (1 << 2) +#define SDIO_NOR_XFER_DONE (1 << 1) +#define SDIO_NOR_CMD_DONE (1 << 0) + +/* ERR status bits */ +#define SDIO_ERR_CRC_STATUS (1 << 14) +#define SDIO_ERR_CRC_STARTBIT (1 << 13) +#define SDIO_ERR_CRC_ENDBIT (1 << 12) +#define SDIO_ERR_RESP_TBIT (1 << 11) +#define SDIO_ERR_SIZE (1 << 10)
include/mrvl_mmc.h
Quoted 10 lines
include/mrvl_mmc.h new file +10
-0+#define SDIO_ERR_CMD_STARTBIT (1 << 9) +#define SDIO_ERR_AUTOCMD12 (1 << 8) +#define SDIO_ERR_DATA_ENDBIT (1 << 6) +#define SDIO_ERR_DATA_CRC (1 << 5) +#define SDIO_ERR_DATA_TIMEOUT (1 << 4) +#define SDIO_ERR_CMD_INDEX (1 << 3) +#define SDIO_ERR_CMD_ENDBIT (1 << 2) +#define SDIO_ERR_CMD_CRC (1 << 1) +#define SDIO_ERR_CMD_TIMEOUT (1 << 0) +#define SDIO_POLL_MASK 0xffff/* enable al=
l for polling
Quoted 11 lines
*/
include/mrvl_mmc.h new file +10
-0+ +/* MMC commands */ +#define MMC_BLOCK_SIZE 512 +#define MMC_CMD_RESET 0 +#define MMC_CMD_SEND_OP_COND 1 +#define MMC_CMD_ALL_SEND_CID 2 +#define MMC_CMD_SET_RCA 3 +#define MMC_CMD_SELECT_CARD 7 +#define MMC_CMD_SEND_CSD 9 +#define MMC_CMD_SEND_CID 10
include/mrvl_mmc.h
Quoted 10 lines
include/mrvl_mmc.h new file +10
-0+#define MMC_CMD_SEND_STATUS 13 +#define MMC_CMD_SET_BLOCKLEN 16 +#define MMC_CMD_READ_BLOCK 17 +#define MMC_CMD_RD_BLK_MULTI 18 +#define MMC_CMD_WRITE_BLOCK 24 +#define MMC_MAX_BLOCK_SIZE 512 + +#endif /* __MRVL_MMC_H__ */ + +int mrvl_mmc_initialize (bd_t *bis);
No need to define this, use mmc_initialize() directly
Ref: line 390 arch/arm/.../kirkwood/cpu.c
Regards...
Prafulla . . .