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

Commit 50f8fec2 authored by Leilk Liu's avatar Leilk Liu Committed by Mark Brown
Browse files

spi: mediatek: replace int with u32, delete TAB and define MTK_SPI_PAUSE_INT_STATUS marco 



this patch replaces int with u32, deletes TAB, and defines
MTK_SPI_PAUSE_INT_STATUS marco.

Signed-off-by: default avatarLeilk Liu <leilk.liu@mediatek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent dd69a0a6

drivers/spi/spi-mt65xx.c

+10 −8
Original line number Original line Diff line number Diff line
@@ -67,6 +67,8 @@ 




#define MT8173_SPI_MAX_PAD_SEL 3

#define MT8173_SPI_MAX_PAD_SEL 3





#define MTK_SPI_PAUSE_INT_STATUS 0x2



#define MTK_SPI_IDLE 0

#define MTK_SPI_IDLE 0

#define MTK_SPI_PAUSED 1

#define MTK_SPI_PAUSED 1
@@ -179,7 +181,7 @@ static int mtk_spi_prepare_hardware(struct spi_master *master) 




	trans = list_first_entry(&msg->transfers, struct spi_transfer,

	trans = list_first_entry(&msg->transfers, struct spi_transfer,

				 transfer_list);

				 transfer_list);

	if (trans->cs_change == 0) {

	if (!trans->cs_change) {

		mdata->state = MTK_SPI_IDLE;

		mdata->state = MTK_SPI_IDLE;

		mtk_spi_reset(mdata);

		mtk_spi_reset(mdata);

	}

	}
@@ -269,11 +271,11 @@ static void mtk_spi_setup_packet(struct spi_master *master) 
	u32 packet_size, packet_loop, reg_val;

	u32 packet_size, packet_loop, reg_val;

	struct mtk_spi *mdata = spi_master_get_devdata(master);

	struct mtk_spi *mdata = spi_master_get_devdata(master);





	packet_size = min_t(unsigned, mdata->xfer_len, MTK_SPI_PACKET_SIZE);

	packet_size = min_t(u32, mdata->xfer_len, MTK_SPI_PACKET_SIZE);

	packet_loop = mdata->xfer_len / packet_size;

	packet_loop = mdata->xfer_len / packet_size;





	reg_val = readl(mdata->base + SPI_CFG1_REG);

	reg_val = readl(mdata->base + SPI_CFG1_REG);

	reg_val &= ~(SPI_CFG1_PACKET_LENGTH_MASK + SPI_CFG1_PACKET_LOOP_MASK);

	reg_val &= ~(SPI_CFG1_PACKET_LENGTH_MASK | SPI_CFG1_PACKET_LOOP_MASK);

	reg_val |= (packet_size - 1) << SPI_CFG1_PACKET_LENGTH_OFFSET;

	reg_val |= (packet_size - 1) << SPI_CFG1_PACKET_LENGTH_OFFSET;

	reg_val |= (packet_loop - 1) << SPI_CFG1_PACKET_LOOP_OFFSET;

	reg_val |= (packet_loop - 1) << SPI_CFG1_PACKET_LOOP_OFFSET;

	writel(reg_val, mdata->base + SPI_CFG1_REG);

	writel(reg_val, mdata->base + SPI_CFG1_REG);
@@ -281,7 +283,7 @@ static void mtk_spi_setup_packet(struct spi_master *master) 




static void mtk_spi_enable_transfer(struct spi_master *master)

static void mtk_spi_enable_transfer(struct spi_master *master)

{

{

	int cmd;

	u32 cmd;

	struct mtk_spi *mdata = spi_master_get_devdata(master);

	struct mtk_spi *mdata = spi_master_get_devdata(master);





	cmd = readl(mdata->base + SPI_CMD_REG);

	cmd = readl(mdata->base + SPI_CMD_REG);
@@ -292,9 +294,9 @@ static void mtk_spi_enable_transfer(struct spi_master *master) 
	writel(cmd, mdata->base + SPI_CMD_REG);

	writel(cmd, mdata->base + SPI_CMD_REG);

}

}





static int mtk_spi_get_mult_delta(int xfer_len)

static int mtk_spi_get_mult_delta(u32 xfer_len)

{

{

	int mult_delta;

	u32 mult_delta;





	if (xfer_len > MTK_SPI_PACKET_SIZE)

	if (xfer_len > MTK_SPI_PACKET_SIZE)

		mult_delta = xfer_len % MTK_SPI_PACKET_SIZE;

		mult_delta = xfer_len % MTK_SPI_PACKET_SIZE;
@@ -435,7 +437,7 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id) 
	struct spi_transfer *trans = mdata->cur_transfer;

	struct spi_transfer *trans = mdata->cur_transfer;





	reg_val = readl(mdata->base + SPI_STATUS0_REG);

	reg_val = readl(mdata->base + SPI_STATUS0_REG);

	if (reg_val & 0x2)

	if (reg_val & MTK_SPI_PAUSE_INT_STATUS)

		mdata->state = MTK_SPI_PAUSED;

		mdata->state = MTK_SPI_PAUSED;

	else

	else

		mdata->state = MTK_SPI_IDLE;

		mdata->state = MTK_SPI_IDLE;