GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-27 17:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spi: kirkwood_spi.c: cosmetic: Fix minor coding style issues

Browse source 
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>

Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Tested-by: Luka Perkov <luka@openwrt.org>
Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
This commit is contained in:
Stefan Roese 2014-09-02 14:02:53 +02:00 • committed by Jagannadha Sutradharudu Teki
parent 0299046e5b
commit bf9b86dc47
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/spi/kirkwood_spi.c
View file

@ -46,7 +46,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
/* program spi clock prescaller using max_hz */ /* program spi clock prescaller using max_hz */
writel(KWSPI_ADRLEN_3BYTE | data, &spireg->cfg); writel(KWSPI_ADRLEN_3BYTE | data, &spireg->cfg);
debug("data = 0x%08x \n", data); debug("data = 0x%08x\n", data);
writel(KWSPI_SMEMRDIRQ, &spireg->irq_cause); writel(KWSPI_SMEMRDIRQ, &spireg->irq_cause);
writel(KWSPI_IRQMASK, &spireg->irq_mask); writel(KWSPI_IRQMASK, &spireg->irq_mask);
@ -100,7 +100,6 @@ int spi_claim_bus(struct spi_slave *slave)
/* set new spi mpp and save current mpp config */ /* set new spi mpp and save current mpp config */
kirkwood_mpp_conf(spi_mpp_config, spi_mpp_backup); kirkwood_mpp_conf(spi_mpp_config, spi_mpp_backup);
#endif #endif
return board_spi_claim_bus(slave); return board_spi_claim_bus(slave);
@ -127,7 +126,7 @@ void spi_release_bus(struct spi_slave *slave)
*/ */
int spi_cs_is_valid(unsigned int bus, unsigned int cs) int spi_cs_is_valid(unsigned int bus, unsigned int cs)
{ {
return (bus == 0 && (cs == 0 || cs == 1)); return bus == 0 && (cs == 0 || cs == 1);
} }
#endif #endif
@ -169,7 +168,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
/* Shift data so it's msb-justified */ /* Shift data so it's msb-justified */
if (dout) if (dout)
tmpdout = *(u32 *) dout & 0x0ff; tmpdout = *(u32 *)dout & 0xff;
clrbits_le32(&spireg->irq_cause, KWSPI_SMEMRDIRQ); clrbits_le32(&spireg->irq_cause, KWSPI_SMEMRDIRQ);
writel(tmpdout, &spireg->dout); /* Write the data out */ writel(tmpdout, &spireg->dout); /* Write the data out */
@ -185,12 +184,11 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
if (readl(&spireg->irq_cause) & KWSPI_SMEMRDIRQ) { if (readl(&spireg->irq_cause) & KWSPI_SMEMRDIRQ) {
isread = 1; isread = 1;
tmpdin = readl(&spireg->din); tmpdin = readl(&spireg->din);
debug debug("spi_xfer: din %p..%08x read\n",
("spi_xfer: din %p..%08x read\n", din, tmpdin);
din, tmpdin);
if (din) { if (din) {
*((u8 *) din) = (u8) tmpdin; *((u8 *)din) = (u8)tmpdin;
din += 1; din += 1;
} }
if (dout) if (dout)