Commit 44d8fb30 authored by Jonas Gorski's avatar Jonas Gorski Committed by Mark Brown
Browse files

spi/bcm63xx: move register definitions into the driver 



Move all register definitions and structs into the driver. This allows
us dropping the platform_data struct and drop any arch specific
includes. Make use of different device names to identify the version of
the block we have.

Since we now have full control over the message width, we can drop the
size check, which was broken anyway, since it never set ret to any error
code.

Also since we now have no arch depedendent resources, we can now allow
compiling it for any arch, hidden behind COMPILE_TEST.

Signed-off-by: default avatarJonas Gorski <jogo@openwrt.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f13a5e8a

arch/mips/bcm63xx/dev-spi.c

+6 −28
Original line number Diff line number Diff line
@@ -18,29 +18,6 @@ 
#include <bcm63xx_dev_spi.h>

#include <bcm63xx_regs.h>



/*

 * register offsets

 */

static const unsigned long bcm6348_regs_spi[] = {

	__GEN_SPI_REGS_TABLE(6348)

};



static const unsigned long bcm6358_regs_spi[] = {

	__GEN_SPI_REGS_TABLE(6358)

};



const unsigned long *bcm63xx_regs_spi;

EXPORT_SYMBOL(bcm63xx_regs_spi);



static __init void bcm63xx_spi_regs_init(void)

{

	if (BCMCPU_IS_6338() || BCMCPU_IS_6348())

		bcm63xx_regs_spi = bcm6348_regs_spi;

	if (BCMCPU_IS_3368() || BCMCPU_IS_6358() ||

		BCMCPU_IS_6362() || BCMCPU_IS_6368())

		bcm63xx_regs_spi = bcm6358_regs_spi;

}



static struct resource spi_resources[] = {

	{

		.start		= -1, /* filled at runtime */
@@ -54,7 +31,6 @@ static struct resource spi_resources[] = { 
};



static struct platform_device bcm63xx_spi_device = {

	.name		= "bcm63xx-spi",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(spi_resources),

	.resource	= spi_resources,
@@ -69,14 +45,16 @@ int __init bcm63xx_spi_register(void) 
	spi_resources[0].end = spi_resources[0].start;

	spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI);



	if (BCMCPU_IS_6338() || BCMCPU_IS_6348())

	if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) {

		bcm63xx_spi_device.name = "bcm6348-spi",

		spi_resources[0].end += BCM_6348_RSET_SPI_SIZE - 1;

	}



	if (BCMCPU_IS_3368() || BCMCPU_IS_6358() || BCMCPU_IS_6362() ||

		BCMCPU_IS_6368())

		BCMCPU_IS_6368()) {

		bcm63xx_spi_device.name = "bcm6358-spi",

		spi_resources[0].end += BCM_6358_RSET_SPI_SIZE - 1;



	bcm63xx_spi_regs_init();

	}



	return platform_device_register(&bcm63xx_spi_device);

}

arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h

+0 −42
Original line number Diff line number Diff line
@@ -7,46 +7,4 @@ 


int __init bcm63xx_spi_register(void);



enum bcm63xx_regs_spi {

	SPI_CMD,

	SPI_INT_STATUS,

	SPI_INT_MASK_ST,

	SPI_INT_MASK,

	SPI_ST,

	SPI_CLK_CFG,

	SPI_FILL_BYTE,

	SPI_MSG_TAIL,

	SPI_RX_TAIL,

	SPI_MSG_CTL,

	SPI_MSG_DATA,

	SPI_RX_DATA,

	SPI_MSG_TYPE_SHIFT,

	SPI_MSG_CTL_WIDTH,

	SPI_MSG_DATA_SIZE,

};



#define __GEN_SPI_REGS_TABLE(__cpu)					\

	[SPI_CMD]		= SPI_## __cpu ##_CMD,			\

	[SPI_INT_STATUS]	= SPI_## __cpu ##_INT_STATUS,		\

	[SPI_INT_MASK_ST]	= SPI_## __cpu ##_INT_MASK_ST,		\

	[SPI_INT_MASK]		= SPI_## __cpu ##_INT_MASK,		\

	[SPI_ST]		= SPI_## __cpu ##_ST,			\

	[SPI_CLK_CFG]		= SPI_## __cpu ##_CLK_CFG,		\

	[SPI_FILL_BYTE]		= SPI_## __cpu ##_FILL_BYTE,		\

	[SPI_MSG_TAIL]		= SPI_## __cpu ##_MSG_TAIL,		\

	[SPI_RX_TAIL]		= SPI_## __cpu ##_RX_TAIL,		\

	[SPI_MSG_CTL]		= SPI_## __cpu ##_MSG_CTL,		\

	[SPI_MSG_DATA]		= SPI_## __cpu ##_MSG_DATA,		\

	[SPI_RX_DATA]		= SPI_## __cpu ##_RX_DATA,		\

	[SPI_MSG_TYPE_SHIFT]	= SPI_## __cpu ##_MSG_TYPE_SHIFT,	\

	[SPI_MSG_CTL_WIDTH]	= SPI_## __cpu ##_MSG_CTL_WIDTH,	\

	[SPI_MSG_DATA_SIZE]	= SPI_## __cpu ##_MSG_DATA_SIZE,



static inline unsigned long bcm63xx_spireg(enum bcm63xx_regs_spi reg)

{

	extern const unsigned long *bcm63xx_regs_spi;



	return bcm63xx_regs_spi[reg];

}



#endif /* BCM63XX_DEV_SPI_H */

drivers/spi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ config SPI_BCM53XX 


config SPI_BCM63XX

	tristate "Broadcom BCM63xx SPI controller"

	depends on BCM63XX

	depends on BCM63XX || COMPILE_TEST

	help

          Enable support for the SPI controller on the Broadcom BCM63xx SoCs.

drivers/spi/spi-bcm63xx.c

+174 −23
Original line number Diff line number Diff line
@@ -27,7 +27,111 @@ 
#include <linux/err.h>

#include <linux/pm_runtime.h>



#include <bcm63xx_dev_spi.h>

/* BCM 6338/6348 SPI core */

#define SPI_6348_RSET_SIZE		64

#define SPI_6348_CMD			0x00	/* 16-bits register */

#define SPI_6348_INT_STATUS		0x02

#define SPI_6348_INT_MASK_ST		0x03

#define SPI_6348_INT_MASK		0x04

#define SPI_6348_ST			0x05

#define SPI_6348_CLK_CFG		0x06

#define SPI_6348_FILL_BYTE		0x07

#define SPI_6348_MSG_TAIL		0x09

#define SPI_6348_RX_TAIL		0x0b

#define SPI_6348_MSG_CTL		0x40	/* 8-bits register */

#define SPI_6348_MSG_CTL_WIDTH		8

#define SPI_6348_MSG_DATA		0x41

#define SPI_6348_MSG_DATA_SIZE		0x3f

#define SPI_6348_RX_DATA		0x80

#define SPI_6348_RX_DATA_SIZE		0x3f



/* BCM 3368/6358/6262/6368 SPI core */

#define SPI_6358_RSET_SIZE		1804

#define SPI_6358_MSG_CTL		0x00	/* 16-bits register */

#define SPI_6358_MSG_CTL_WIDTH		16

#define SPI_6358_MSG_DATA		0x02

#define SPI_6358_MSG_DATA_SIZE		0x21e

#define SPI_6358_RX_DATA		0x400

#define SPI_6358_RX_DATA_SIZE		0x220

#define SPI_6358_CMD			0x700	/* 16-bits register */

#define SPI_6358_INT_STATUS		0x702

#define SPI_6358_INT_MASK_ST		0x703

#define SPI_6358_INT_MASK		0x704

#define SPI_6358_ST			0x705

#define SPI_6358_CLK_CFG		0x706

#define SPI_6358_FILL_BYTE		0x707

#define SPI_6358_MSG_TAIL		0x709

#define SPI_6358_RX_TAIL		0x70B



/* Shared SPI definitions */



/* Message configuration */

#define SPI_FD_RW			0x00

#define SPI_HD_W			0x01

#define SPI_HD_R			0x02

#define SPI_BYTE_CNT_SHIFT		0

#define SPI_6348_MSG_TYPE_SHIFT		6

#define SPI_6358_MSG_TYPE_SHIFT		14



/* Command */

#define SPI_CMD_NOOP			0x00

#define SPI_CMD_SOFT_RESET		0x01

#define SPI_CMD_HARD_RESET		0x02

#define SPI_CMD_START_IMMEDIATE		0x03

#define SPI_CMD_COMMAND_SHIFT		0

#define SPI_CMD_COMMAND_MASK		0x000f

#define SPI_CMD_DEVICE_ID_SHIFT		4

#define SPI_CMD_PREPEND_BYTE_CNT_SHIFT	8

#define SPI_CMD_ONE_BYTE_SHIFT		11

#define SPI_CMD_ONE_WIRE_SHIFT		12

#define SPI_DEV_ID_0			0

#define SPI_DEV_ID_1			1

#define SPI_DEV_ID_2			2

#define SPI_DEV_ID_3			3



/* Interrupt mask */

#define SPI_INTR_CMD_DONE		0x01

#define SPI_INTR_RX_OVERFLOW		0x02

#define SPI_INTR_TX_UNDERFLOW		0x04

#define SPI_INTR_TX_OVERFLOW		0x08

#define SPI_INTR_RX_UNDERFLOW		0x10

#define SPI_INTR_CLEAR_ALL		0x1f



/* Status */

#define SPI_RX_EMPTY			0x02

#define SPI_CMD_BUSY			0x04

#define SPI_SERIAL_BUSY			0x08



/* Clock configuration */

#define SPI_CLK_20MHZ			0x00

#define SPI_CLK_0_391MHZ		0x01

#define SPI_CLK_0_781MHZ		0x02	/* default */

#define SPI_CLK_1_563MHZ		0x03

#define SPI_CLK_3_125MHZ		0x04

#define SPI_CLK_6_250MHZ		0x05

#define SPI_CLK_12_50MHZ		0x06

#define SPI_CLK_MASK			0x07

#define SPI_SSOFFTIME_MASK		0x38

#define SPI_SSOFFTIME_SHIFT		3

#define SPI_BYTE_SWAP			0x80



enum bcm63xx_regs_spi {

	SPI_CMD,

	SPI_INT_STATUS,

	SPI_INT_MASK_ST,

	SPI_INT_MASK,

	SPI_ST,

	SPI_CLK_CFG,

	SPI_FILL_BYTE,

	SPI_MSG_TAIL,

	SPI_RX_TAIL,

	SPI_MSG_CTL,

	SPI_MSG_DATA,

	SPI_RX_DATA,

	SPI_MSG_TYPE_SHIFT,

	SPI_MSG_CTL_WIDTH,

	SPI_MSG_DATA_SIZE,

};



#define BCM63XX_SPI_MAX_PREPEND		15
@@ -41,6 +145,7 @@ struct bcm63xx_spi { 
	int			irq;



	/* Platform data */

	const unsigned long	*reg_offsets;

	unsigned		fifo_size;

	unsigned int		msg_type_shift;

	unsigned int		msg_ctl_width;
@@ -56,32 +161,32 @@ struct bcm63xx_spi { 
static inline u8 bcm_spi_readb(struct bcm63xx_spi *bs,

			       unsigned int offset)

{

	return readb(bs->regs + bcm63xx_spireg(offset));

	return readb(bs->regs + bs->reg_offsets[offset]);

}



static inline u16 bcm_spi_readw(struct bcm63xx_spi *bs,

				unsigned int offset)

{

#ifdef CONFIG_CPU_BIG_ENDIAN

	return ioread16be(bs->regs + bcm63xx_spireg(offset));

	return ioread16be(bs->regs + bs->reg_offsets[offset]);

#else

	return readw(bs->regs + bcm63xx_spireg(offset));

	return readw(bs->regs + bs->reg_offsets[offset]);

#endif

}



static inline void bcm_spi_writeb(struct bcm63xx_spi *bs,

				  u8 value, unsigned int offset)

{

	writeb(value, bs->regs + bcm63xx_spireg(offset));

	writeb(value, bs->regs + bs->reg_offsets[offset]);

}



static inline void bcm_spi_writew(struct bcm63xx_spi *bs,

				  u16 value, unsigned int offset)

{

#ifdef CONFIG_CPU_BIG_ENDIAN

	iowrite16be(value, bs->regs + bcm63xx_spireg(offset));

	iowrite16be(value, bs->regs + bs->reg_offsets[offset]);

#else

	writew(value, bs->regs + bcm63xx_spireg(offset));

	writew(value, bs->regs + bs->reg_offsets[offset]);

#endif

}
@@ -324,10 +429,59 @@ static irqreturn_t bcm63xx_spi_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static const unsigned long bcm6348_spi_reg_offsets[] = {

	[SPI_CMD]		= SPI_6348_CMD,

	[SPI_INT_STATUS]	= SPI_6348_INT_STATUS,

	[SPI_INT_MASK_ST]	= SPI_6348_INT_MASK_ST,

	[SPI_INT_MASK]		= SPI_6348_INT_MASK,

	[SPI_ST]		= SPI_6348_ST,

	[SPI_CLK_CFG]		= SPI_6348_CLK_CFG,

	[SPI_FILL_BYTE]		= SPI_6348_FILL_BYTE,

	[SPI_MSG_TAIL]		= SPI_6348_MSG_TAIL,

	[SPI_RX_TAIL]		= SPI_6348_RX_TAIL,

	[SPI_MSG_CTL]		= SPI_6348_MSG_CTL,

	[SPI_MSG_DATA]		= SPI_6348_MSG_DATA,

	[SPI_RX_DATA]		= SPI_6348_RX_DATA,

	[SPI_MSG_TYPE_SHIFT]	= SPI_6348_MSG_TYPE_SHIFT,

	[SPI_MSG_CTL_WIDTH]	= SPI_6348_MSG_CTL_WIDTH,

	[SPI_MSG_DATA_SIZE]	= SPI_6348_MSG_DATA_SIZE,

};



static const unsigned long bcm6358_spi_reg_offsets[] = {

	[SPI_CMD]		= SPI_6358_CMD,

	[SPI_INT_STATUS]	= SPI_6358_INT_STATUS,

	[SPI_INT_MASK_ST]	= SPI_6358_INT_MASK_ST,

	[SPI_INT_MASK]		= SPI_6358_INT_MASK,

	[SPI_ST]		= SPI_6358_ST,

	[SPI_CLK_CFG]		= SPI_6358_CLK_CFG,

	[SPI_FILL_BYTE]		= SPI_6358_FILL_BYTE,

	[SPI_MSG_TAIL]		= SPI_6358_MSG_TAIL,

	[SPI_RX_TAIL]		= SPI_6358_RX_TAIL,

	[SPI_MSG_CTL]		= SPI_6358_MSG_CTL,

	[SPI_MSG_DATA]		= SPI_6358_MSG_DATA,

	[SPI_RX_DATA]		= SPI_6358_RX_DATA,

	[SPI_MSG_TYPE_SHIFT]	= SPI_6358_MSG_TYPE_SHIFT,

	[SPI_MSG_CTL_WIDTH]	= SPI_6358_MSG_CTL_WIDTH,

	[SPI_MSG_DATA_SIZE]	= SPI_6358_MSG_DATA_SIZE,

};



static const struct platform_device_id bcm63xx_spi_dev_match[] = {

	{

		.name = "bcm6348-spi",

		.driver_data = (unsigned long)bcm6348_spi_reg_offsets,

	},

	{

		.name = "bcm6358-spi",

		.driver_data = (unsigned long)bcm6358_spi_reg_offsets,

	},

	{

	},

};



static int bcm63xx_spi_probe(struct platform_device *pdev)

{

	struct resource *r;

	const unsigned long *bcm63xx_spireg;

	struct device *dev = &pdev->dev;

	int irq;

	struct spi_master *master;
@@ -335,6 +489,11 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) 
	struct bcm63xx_spi *bs;

	int ret;



	if (!pdev->id_entry->driver_data)

		return -EINVAL;



	bcm63xx_spireg = (const unsigned long *)pdev->id_entry->driver_data;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "no irq\n");
@@ -368,7 +527,8 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) 


	bs->irq = irq;

	bs->clk = clk;

	bs->fifo_size = bcm63xx_spireg(SPI_MSG_DATA_SIZE);

	bs->reg_offsets = bcm63xx_spireg;

	bs->fifo_size = bs->reg_offsets[SPI_MSG_DATA_SIZE];



	ret = devm_request_irq(&pdev->dev, irq, bcm63xx_spi_interrupt, 0,

							pdev->name, master);
@@ -383,20 +543,10 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) 
	master->mode_bits = MODEBITS;

	master->bits_per_word_mask = SPI_BPW_MASK(8);

	master->auto_runtime_pm = true;

	bs->msg_type_shift = bcm63xx_spireg(SPI_MSG_TYPE_SHIFT);

	bs->msg_ctl_width = bcm63xx_spireg(SPI_MSG_CTL_WIDTH);

	bs->tx_io = (u8 *)(bs->regs + bcm63xx_spireg(SPI_MSG_DATA));

	bs->rx_io = (const u8 *)(bs->regs + bcm63xx_spireg(SPI_RX_DATA));



	switch (bs->msg_ctl_width) {

	case 8:

	case 16:

		break;

	default:

		dev_err(dev, "unsupported MSG_CTL width: %d\n",

			 bs->msg_ctl_width);

		goto out_err;

	}

	bs->msg_type_shift = bs->reg_offsets[SPI_MSG_TYPE_SHIFT];

	bs->msg_ctl_width = bs->reg_offsets[SPI_MSG_CTL_WIDTH];

	bs->tx_io = (u8 *)(bs->regs + bs->reg_offsets[SPI_MSG_DATA]);

	bs->rx_io = (const u8 *)(bs->regs + bs->reg_offsets[SPI_RX_DATA]);



	/* Initialize hardware */

	ret = clk_prepare_enable(bs->clk);
@@ -476,6 +626,7 @@ static struct platform_driver bcm63xx_spi_driver = { 
		.name	= "bcm63xx-spi",

		.pm	= &bcm63xx_spi_pm_ops,

	},

	.id_table	= bcm63xx_spi_dev_match,

	.probe		= bcm63xx_spi_probe,

	.remove		= bcm63xx_spi_remove,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE