Commit 04cdbbfa authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: core: Make tuning block patterns static 



Since previous patches removed the need for the tuning block patterns
to be exported, let's move them close to the mmc_send_tuning() API.

Those are now intended to be used only by the mmc core.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Acked-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
parent 6c2c6506

drivers/mmc/core/mmc.c

+0 −32
Original line number Diff line number Diff line
@@ -1155,38 +1155,6 @@ bus_speed: 
	return err;

}



const u8 tuning_blk_pattern_4bit[MMC_TUNING_BLK_PATTERN_4BIT_SIZE] = {

	0xff, 0x0f, 0xff, 0x00, 0xff, 0xcc, 0xc3, 0xcc,

	0xc3, 0x3c, 0xcc, 0xff, 0xfe, 0xff, 0xfe, 0xef,

	0xff, 0xdf, 0xff, 0xdd, 0xff, 0xfb, 0xff, 0xfb,

	0xbf, 0xff, 0x7f, 0xff, 0x77, 0xf7, 0xbd, 0xef,

	0xff, 0xf0, 0xff, 0xf0, 0x0f, 0xfc, 0xcc, 0x3c,

	0xcc, 0x33, 0xcc, 0xcf, 0xff, 0xef, 0xff, 0xee,

	0xff, 0xfd, 0xff, 0xfd, 0xdf, 0xff, 0xbf, 0xff,

	0xbb, 0xff, 0xf7, 0xff, 0xf7, 0x7f, 0x7b, 0xde,

};

EXPORT_SYMBOL(tuning_blk_pattern_4bit);



const u8 tuning_blk_pattern_8bit[MMC_TUNING_BLK_PATTERN_8BIT_SIZE] = {

	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00,

	0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc, 0xcc,

	0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff, 0xff,

	0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee, 0xff,

	0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xdd,

	0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xbb,

	0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff, 0xff,

	0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee, 0xff,

	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00,

	0x00, 0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc,

	0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff,

	0xff, 0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee,

	0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd,

	0xdd, 0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff,

	0xbb, 0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff,

	0xff, 0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee,

};

EXPORT_SYMBOL(tuning_blk_pattern_8bit);



/*

 * Execute tuning sequence to seek the proper bus operating

 * conditions for HS200 and HS400, which sends CMD21 to the device.

drivers/mmc/core/mmc_ops.c

+30 −0
Original line number Diff line number Diff line
@@ -23,6 +23,36 @@ 


#define MMC_OPS_TIMEOUT_MS	(10 * 60 * 1000) /* 10 minute timeout */



static const u8 tuning_blk_pattern_4bit[] = {

	0xff, 0x0f, 0xff, 0x00, 0xff, 0xcc, 0xc3, 0xcc,

	0xc3, 0x3c, 0xcc, 0xff, 0xfe, 0xff, 0xfe, 0xef,

	0xff, 0xdf, 0xff, 0xdd, 0xff, 0xfb, 0xff, 0xfb,

	0xbf, 0xff, 0x7f, 0xff, 0x77, 0xf7, 0xbd, 0xef,

	0xff, 0xf0, 0xff, 0xf0, 0x0f, 0xfc, 0xcc, 0x3c,

	0xcc, 0x33, 0xcc, 0xcf, 0xff, 0xef, 0xff, 0xee,

	0xff, 0xfd, 0xff, 0xfd, 0xdf, 0xff, 0xbf, 0xff,

	0xbb, 0xff, 0xf7, 0xff, 0xf7, 0x7f, 0x7b, 0xde,

};



static const u8 tuning_blk_pattern_8bit[] = {

	0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00,

	0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc, 0xcc,

	0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff, 0xff,

	0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee, 0xff,

	0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xdd,

	0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xbb,

	0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff, 0xff,

	0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee, 0xff,

	0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00,

	0x00, 0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc,

	0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff,

	0xff, 0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee,

	0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd,

	0xdd, 0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff,

	0xbb, 0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff,

	0xff, 0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee,

};



static inline int __mmc_send_status(struct mmc_card *card, u32 *status,

				    bool ignore_crc)

{

include/linux/mmc/mmc.h

+0 −5
Original line number Diff line number Diff line
@@ -53,11 +53,6 @@ 
#define MMC_SEND_TUNING_BLOCK    19   /* adtc                    R1  */

#define MMC_SEND_TUNING_BLOCK_HS200	21	/* adtc R1  */



#define MMC_TUNING_BLK_PATTERN_4BIT_SIZE	 64

#define MMC_TUNING_BLK_PATTERN_8BIT_SIZE	128

extern const u8 tuning_blk_pattern_4bit[MMC_TUNING_BLK_PATTERN_4BIT_SIZE];

extern const u8 tuning_blk_pattern_8bit[MMC_TUNING_BLK_PATTERN_8BIT_SIZE];



  /* class 3 */

#define MMC_WRITE_DAT_UNTIL_STOP 20   /* adtc [31:0] data addr   R1  */

CRA Git | Maintained and supported by SUSTech CRA and CCSE