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

Commit a553a31d authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Mark Brown
Browse files

spi: tegra20-sflash: use u32 for 32-bit register values 



Previously used “unsigned long” may lead to confusion should the code
be compiled for 64-bit machine.

Signed-off-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6ce4eac1

drivers/spi/spi-tegra20-sflash.c

+10 −12
Original line number Original line Diff line number Diff line
@@ -148,14 +148,14 @@ struct tegra_sflash_data { 
static int tegra_sflash_runtime_suspend(struct device *dev);

static int tegra_sflash_runtime_suspend(struct device *dev);

static int tegra_sflash_runtime_resume(struct device *dev);

static int tegra_sflash_runtime_resume(struct device *dev);





static inline unsigned long tegra_sflash_readl(struct tegra_sflash_data *tsd,

static inline u32 tegra_sflash_readl(struct tegra_sflash_data *tsd,

		unsigned long reg)

		unsigned long reg)

{

{

	return readl(tsd->base + reg);

	return readl(tsd->base + reg);

}

}





static inline void tegra_sflash_writel(struct tegra_sflash_data *tsd,

static inline void tegra_sflash_writel(struct tegra_sflash_data *tsd,

		unsigned long val, unsigned long reg)

		u32 val, unsigned long reg)

{

{

	writel(val, tsd->base + reg);

	writel(val, tsd->base + reg);

}

}
@@ -185,7 +185,7 @@ static unsigned tegra_sflash_fill_tx_fifo_from_client_txbuf( 
	struct tegra_sflash_data *tsd, struct spi_transfer *t)

	struct tegra_sflash_data *tsd, struct spi_transfer *t)

{

{

	unsigned nbytes;

	unsigned nbytes;

	unsigned long status;

	u32 status;

	unsigned max_n_32bit = tsd->curr_xfer_words;

	unsigned max_n_32bit = tsd->curr_xfer_words;

	u8 *tx_buf = (u8 *)t->tx_buf + tsd->cur_tx_pos;

	u8 *tx_buf = (u8 *)t->tx_buf + tsd->cur_tx_pos;
@@ -196,11 +196,11 @@ static unsigned tegra_sflash_fill_tx_fifo_from_client_txbuf( 
	status = tegra_sflash_readl(tsd, SPI_STATUS);

	status = tegra_sflash_readl(tsd, SPI_STATUS);

	while (!(status & SPI_TXF_FULL)) {

	while (!(status & SPI_TXF_FULL)) {

		int i;

		int i;

		unsigned int x = 0;

		u32 x = 0;





		for (i = 0; nbytes && (i < tsd->bytes_per_word);

		for (i = 0; nbytes && (i < tsd->bytes_per_word);

							i++, nbytes--)

							i++, nbytes--)

				x |= ((*tx_buf++) << i*8);

			x |= (u32)(*tx_buf++) << (i * 8);

		tegra_sflash_writel(tsd, x, SPI_TX_FIFO);

		tegra_sflash_writel(tsd, x, SPI_TX_FIFO);

		if (!nbytes)

		if (!nbytes)

			break;

			break;
@@ -214,16 +214,14 @@ static unsigned tegra_sflash_fill_tx_fifo_from_client_txbuf( 
static int tegra_sflash_read_rx_fifo_to_client_rxbuf(

static int tegra_sflash_read_rx_fifo_to_client_rxbuf(

		struct tegra_sflash_data *tsd, struct spi_transfer *t)

		struct tegra_sflash_data *tsd, struct spi_transfer *t)

{

{

	unsigned long status;

	u32 status;

	unsigned int read_words = 0;

	unsigned int read_words = 0;

	u8 *rx_buf = (u8 *)t->rx_buf + tsd->cur_rx_pos;

	u8 *rx_buf = (u8 *)t->rx_buf + tsd->cur_rx_pos;





	status = tegra_sflash_readl(tsd, SPI_STATUS);

	status = tegra_sflash_readl(tsd, SPI_STATUS);

	while (!(status & SPI_RXF_EMPTY)) {

	while (!(status & SPI_RXF_EMPTY)) {

		int i;

		int i;

		unsigned long x;

		u32 x = tegra_sflash_readl(tsd, SPI_RX_FIFO);



		x = tegra_sflash_readl(tsd, SPI_RX_FIFO);

		for (i = 0; (i < tsd->bytes_per_word); i++)

		for (i = 0; (i < tsd->bytes_per_word); i++)

			*rx_buf++ = (x >> (i*8)) & 0xFF;

			*rx_buf++ = (x >> (i*8)) & 0xFF;

		read_words++;

		read_words++;
@@ -236,7 +234,7 @@ static int tegra_sflash_read_rx_fifo_to_client_rxbuf( 
static int tegra_sflash_start_cpu_based_transfer(

static int tegra_sflash_start_cpu_based_transfer(

		struct tegra_sflash_data *tsd, struct spi_transfer *t)

		struct tegra_sflash_data *tsd, struct spi_transfer *t)

{

{

	unsigned long val = 0;

	u32 val = 0;

	unsigned cur_words;

	unsigned cur_words;





	if (tsd->cur_direction & DATA_DIR_TX)

	if (tsd->cur_direction & DATA_DIR_TX)
@@ -266,7 +264,7 @@ static int tegra_sflash_start_transfer_one(struct spi_device *spi, 
{

{

	struct tegra_sflash_data *tsd = spi_master_get_devdata(spi->master);

	struct tegra_sflash_data *tsd = spi_master_get_devdata(spi->master);

	u32 speed;

	u32 speed;

	unsigned long command;

	u32 command;





	speed = t->speed_hz;

	speed = t->speed_hz;

	if (speed != tsd->cur_speed) {

	if (speed != tsd->cur_speed) {