diff options
-rw-r--r-- | drivers/staging/rts5208/ms.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/rts5208/ms.c b/drivers/staging/rts5208/ms.c index 9fc64da07fb2..f27df0b4cb44 100644 --- a/drivers/staging/rts5208/ms.c +++ b/drivers/staging/rts5208/ms.c | |||
@@ -63,12 +63,12 @@ static int ms_transfer_tpc(struct rtsx_chip *chip, u8 trans_mode, | |||
63 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_BYTE_CNT, 0xFF, cnt); | 63 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_BYTE_CNT, 0xFF, cnt); |
64 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, cfg); | 64 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, cfg); |
65 | rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, | 65 | rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, |
66 | 0x01, PINGPONG_BUFFER); | 66 | 0x01, PINGPONG_BUFFER); |
67 | 67 | ||
68 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, | 68 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, |
69 | 0xFF, MS_TRANSFER_START | trans_mode); | 69 | 0xFF, MS_TRANSFER_START | trans_mode); |
70 | rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER, | 70 | rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER, |
71 | MS_TRANSFER_END, MS_TRANSFER_END); | 71 | MS_TRANSFER_END, MS_TRANSFER_END); |
72 | 72 | ||
73 | rtsx_add_cmd(chip, READ_REG_CMD, MS_TRANS_CFG, 0, 0); | 73 | rtsx_add_cmd(chip, READ_REG_CMD, MS_TRANS_CFG, 0, 0); |
74 | 74 | ||
@@ -109,8 +109,8 @@ static int ms_transfer_tpc(struct rtsx_chip *chip, u8 trans_mode, | |||
109 | } | 109 | } |
110 | 110 | ||
111 | static int ms_transfer_data(struct rtsx_chip *chip, u8 trans_mode, | 111 | static int ms_transfer_data(struct rtsx_chip *chip, u8 trans_mode, |
112 | u8 tpc, u16 sec_cnt, u8 cfg, bool mode_2k, | 112 | u8 tpc, u16 sec_cnt, u8 cfg, bool mode_2k, |
113 | int use_sg, void *buf, int buf_len) | 113 | int use_sg, void *buf, int buf_len) |
114 | { | 114 | { |
115 | int retval; | 115 | int retval; |
116 | u8 val, err_code = 0; | 116 | u8 val, err_code = 0; |
@@ -206,7 +206,7 @@ static int ms_write_bytes(struct rtsx_chip *chip, | |||
206 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_BYTE_CNT, 0xFF, cnt); | 206 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_BYTE_CNT, 0xFF, cnt); |
207 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, cfg); | 207 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, cfg); |
208 | rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, | 208 | rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, |
209 | 0x01, PINGPONG_BUFFER); | 209 | 0x01, PINGPONG_BUFFER); |
210 | 210 | ||
211 | rtsx_add_cmd(chip, WRITE_REG_CMD, | 211 | rtsx_add_cmd(chip, WRITE_REG_CMD, |
212 | MS_TRANSFER, 0xFF, MS_TRANSFER_START | MS_TM_WRITE_BYTES); | 212 | MS_TRANSFER, 0xFF, MS_TRANSFER_START | MS_TM_WRITE_BYTES); |
@@ -253,7 +253,7 @@ static int ms_write_bytes(struct rtsx_chip *chip, | |||
253 | } | 253 | } |
254 | 254 | ||
255 | static int ms_read_bytes(struct rtsx_chip *chip, | 255 | static int ms_read_bytes(struct rtsx_chip *chip, |
256 | u8 tpc, u8 cnt, u8 cfg, u8 *data, int data_len) | 256 | u8 tpc, u8 cnt, u8 cfg, u8 *data, int data_len) |
257 | { | 257 | { |
258 | struct ms_info *ms_card = &chip->ms_card; | 258 | struct ms_info *ms_card = &chip->ms_card; |
259 | int retval, i; | 259 | int retval, i; |
@@ -270,12 +270,12 @@ static int ms_read_bytes(struct rtsx_chip *chip, | |||
270 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_BYTE_CNT, 0xFF, cnt); | 270 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_BYTE_CNT, 0xFF, cnt); |
271 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, cfg); | 271 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANS_CFG, 0xFF, cfg); |
272 | rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, | 272 | rtsx_add_cmd(chip, WRITE_REG_CMD, CARD_DATA_SOURCE, |
273 | 0x01, PINGPONG_BUFFER); | 273 | 0x01, PINGPONG_BUFFER); |
274 | 274 | ||
275 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF, | 275 | rtsx_add_cmd(chip, WRITE_REG_CMD, MS_TRANSFER, 0xFF, |
276 | MS_TRANSFER_START | MS_TM_READ_BYTES); | 276 | MS_TRANSFER_START | MS_TM_READ_BYTES); |
277 | rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER, | 277 | rtsx_add_cmd(chip, CHECK_REG_CMD, MS_TRANSFER, |
278 | MS_TRANSFER_END, MS_TRANSFER_END); | 278 | MS_TRANSFER_END, MS_TRANSFER_END); |
279 | 279 | ||
280 | for (i = 0; i < data_len - 1; i++) | 280 | for (i = 0; i < data_len - 1; i++) |
281 | rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + i, 0, 0); | 281 | rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + i, 0, 0); |
@@ -284,7 +284,7 @@ static int ms_read_bytes(struct rtsx_chip *chip, | |||
284 | rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + data_len, 0, 0); | 284 | rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + data_len, 0, 0); |
285 | else | 285 | else |
286 | rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + data_len - 1, | 286 | rtsx_add_cmd(chip, READ_REG_CMD, PPBUF_BASE2 + data_len - 1, |
287 | 0, 0); | 287 | 0, 0); |
288 | 288 | ||
289 | retval = rtsx_send_cmd(chip, MS_CARD, 5000); | 289 | retval = rtsx_send_cmd(chip, MS_CARD, 5000); |
290 | if (retval < 0) { | 290 | if (retval < 0) { |
@@ -334,8 +334,8 @@ static int ms_read_bytes(struct rtsx_chip *chip, | |||
334 | return STATUS_SUCCESS; | 334 | return STATUS_SUCCESS; |
335 | } | 335 | } |
336 | 336 | ||
337 | static int ms_set_rw_reg_addr(struct rtsx_chip *chip, | 337 | static int ms_set_rw_reg_addr(struct rtsx_chip *chip, u8 read_start, |
338 | u8 read_start, u8 read_cnt, u8 write_start, u8 write_cnt) | 338 | u8 read_cnt, u8 write_start, u8 write_cnt) |
339 | { | 339 | { |
340 | int retval, i; | 340 | int retval, i; |
341 | u8 data[4]; | 341 | u8 data[4]; |