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

Commit c0a3e080 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: core: Move erase/trim/discard defines from public core.h to mmc.h 



As the public mmc.h header already contains similar defines for other mmc
commands and arguments, let's move those for erase/trim/discard into here
as well.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
parent 9e1bbc72

include/linux/mmc/core.h

+0 −10
Original line number Diff line number Diff line
@@ -164,16 +164,6 @@ extern struct mmc_async_req *mmc_start_req(struct mmc_host *, 
extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *);

extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);



#define MMC_ERASE_ARG		0x00000000

#define MMC_SECURE_ERASE_ARG	0x80000000

#define MMC_TRIM_ARG		0x00000001

#define MMC_DISCARD_ARG		0x00000003

#define MMC_SECURE_TRIM1_ARG	0x80000001

#define MMC_SECURE_TRIM2_ARG	0x80008000



#define MMC_SECURE_ARGS		0x80000000

#define MMC_TRIM_ARGS		0x00008001



extern int mmc_hw_reset(struct mmc_host *host);

extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *);

include/linux/mmc/mmc.h

+12 −1
Original line number Diff line number Diff line
@@ -462,12 +462,23 @@ struct _mmc_csd { 
/*

 * MMC_SWITCH access modes

 */



#define MMC_SWITCH_MODE_CMD_SET		0x00	/* Change the command set */

#define MMC_SWITCH_MODE_SET_BITS	0x01	/* Set bits which are 1 in value */

#define MMC_SWITCH_MODE_CLEAR_BITS	0x02	/* Clear bits which are 1 in value */

#define MMC_SWITCH_MODE_WRITE_BYTE	0x03	/* Set target to value */



/*

 * Erase/trim/discard

 */

#define MMC_ERASE_ARG			0x00000000

#define MMC_SECURE_ERASE_ARG		0x80000000

#define MMC_TRIM_ARG			0x00000001

#define MMC_DISCARD_ARG			0x00000003

#define MMC_SECURE_TRIM1_ARG		0x80000001

#define MMC_SECURE_TRIM2_ARG		0x80008000

#define MMC_SECURE_ARGS			0x80000000

#define MMC_TRIM_ARGS			0x00008001



#define mmc_driver_type_mask(n)		(1 << (n))



#endif /* LINUX_MMC_MMC_H */