spi/bcm63xx: cleanup and decouple from arch code
Subsystems (3)
v2 cover spi/bcm63xx: cleanup and decouple from arch code
This patchset decouples spi-bcm63xx from any arch code to allow building it for more than MIPS/BCM63XX as well as allow compile testing it on any arch/platform.
Since the main target of this patch is the spi driver, it should probably go through the spi tree.
Changes v1 -> v2:
* Use device name instead of register size for identifying core version.
* Since we now touch arch/mips, drop the rest as well.
* Fix big endian detection.
* Reorder the patches so the move of the register definitions is the last step.
Jonas Gorski (6):
spi/bcm63xx: remove unused rx_tail variable
spi/bcm63xx: always use a fixed number of CS
spi/bcm63xx: hardcode busnum to 0
spi/bcm63xx: replace custom io accessors with standard ones spi/bcm63xx: move message control word description to register offsets spi/bcm63xx: move register definitions into the driver
arch/mips/bcm63xx/dev-spi.c | 42 +---- .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 44 ----- drivers/spi/Kconfig | 2 +- drivers/spi/spi-bcm63xx.c | 210 ++++++++++++++++++--- 4 files changed, 188 insertions(+), 110 deletions(-)
Signature · 5 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 1/6 spi/bcm63xx: remove unused rx_tail variable
Fixes the following warning:drivers/spi/spi-bcm63xx.c:125:5: warning: unused variable 'rx_tail' [-Wunused-variable]
u8 rx_tail;
^--- drivers/spi/spi-bcm63xx.c | 1 - 1 file changed, 1 deletion(-)
drivers/spi/spi-bcm63xx.c +0 -1
@@ -122,7 +122,6 @@ static int bcm63xx_txrx_bufs(struct spi_device *spi, struct spi_transfer *first,struct bcm63xx_spi *bs =spi_master_get_devdata (spi->master);u16 msg_ctl;u16 cmd; -u8 rx_tail;unsigned int i, timeout =0 , prepend_len =0 , len =0 ;struct spi_transfer *t = first;bool do_rx = false;
Signature · 1 line
2.1.4
PATCH v2 2/6 spi/bcm63xx: always use a fixed number of CS
In reply to Jonas GorskiWe always pass 8 for the number of chip selects, so we can as well hardcode it to this number.
---
v1 -> v2
* remove the platform_data member as well.
arch/mips/bcm63xx/dev-spi.c | 1 - arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 1 - drivers/spi/spi-bcm63xx.c | 4 +++- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/mips/bcm63xx/dev-spi.c +0 -1
@@ -55,7 +55,6 @@ static struct resource spi_resources[] = {static struct bcm63xx_spi_pdata spi_pdata = { .bus_num =0 , - .num_chipselect =8 , };static struct platform_device bcm63xx_spi_device = {
arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h +0 -1
@@ -12,7 +12,6 @@ struct bcm63xx_spi_pdata {unsigned int msg_type_shift;unsigned int msg_ctl_width;int bus_num; -int num_chipselect; };enum bcm63xx_regs_spi {
drivers/spi/spi-bcm63xx.c +3 -1
@@ -31,6 +31,8 @@#define BCM63XX_SPI_MAX_PREPEND 15 +#define BCM63XX_SPI_MAX_CS 8 +struct bcm63xx_spi {struct completion done;
@@ -368,7 +370,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) } master->bus_num = pdata->bus_num; - master->num_chipselect = pdata->num_chipselect; + master->num_chipselect =BCM63XX_SPI_MAX_CS ; master->transfer_one_message = bcm63xx_spi_transfer_one; master->mode_bits =MODEBITS ; master->bits_per_word_mask =SPI_BPW_MASK (8 );
Signature · 5 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 3/6 spi/bcm63xx: hardcode busnum to 0
In reply to Jonas GorskiWe always pass 0 as the spi bus number, so we might as well hard code it.
---
v1 -> v2
* remove the platform data member as well.
arch/mips/bcm63xx/dev-spi.c | 4 +--- arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 1 - drivers/spi/spi-bcm63xx.c | 3 ++- 3 files changed, 3 insertions(+), 5 deletions(-)
arch/mips/bcm63xx/dev-spi.c +1 -3
@@ -53,9 +53,7 @@ static struct resource spi_resources[] = { }, }; -static struct bcm63xx_spi_pdata spi_pdata = { - .bus_num =0 , -}; +static struct bcm63xx_spi_pdata spi_pdata;static struct platform_device bcm63xx_spi_device = { .name ="bcm63xx-spi" ,
arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h +0 -1
@@ -11,7 +11,6 @@ struct bcm63xx_spi_pdata {unsigned int fifo_size;unsigned int msg_type_shift;unsigned int msg_ctl_width; -int bus_num; };enum bcm63xx_regs_spi {
drivers/spi/spi-bcm63xx.c +2 -1
@@ -32,6 +32,7 @@#define BCM63XX_SPI_MAX_PREPEND 15#define BCM63XX_SPI_MAX_CS 8 +#define BCM63XX_SPI_BUS_NUM 0struct bcm63xx_spi {struct completion done;
@@ -369,7 +370,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) goto out_err; } - master->bus_num = pdata->bus_num; + master->bus_num =BCM63XX_SPI_BUS_NUM ; master->num_chipselect =BCM63XX_SPI_MAX_CS ; master->transfer_one_message = bcm63xx_spi_transfer_one; master->mode_bits =MODEBITS ;
Signature · 5 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 4/6 spi/bcm63xx: replace custom io accessors with standard ones
In reply to Jonas GorskiReplace all bcm_read* with (io)read. Due to this block following system endianness, make sure we match that.
---
v1 -> v2:
* Use the right guard and io*be.
drivers/spi/spi-bcm63xx.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/spi/spi-bcm63xx.c +12 -4
@@ -56,25 +56,33 @@ struct bcm63xx_spi {static inline u8 bcm_spi_readb (struct bcm63xx_spi *bs,unsigned int offset) { -return bcm_readb (bs->regs +bcm63xx_spireg (offset)); +return readb (bs->regs +bcm63xx_spireg (offset)); }static inline u16 bcm_spi_readw (struct bcm63xx_spi *bs,unsigned int offset) { -return bcm_readw (bs->regs +bcm63xx_spireg (offset)); +#ifdef CONFIG_CPU_BIG_ENDIAN +return ioread16be (bs->regs +bcm63xx_spireg (offset)); +#else +return readw (bs->regs +bcm63xx_spireg (offset)); +#endif }static inline void bcm_spi_writeb (struct bcm63xx_spi *bs,u8 value,unsigned int offset) { -bcm_writeb (value, bs->regs +bcm63xx_spireg (offset)); +writeb (value, bs->regs +bcm63xx_spireg (offset)); }static inline void bcm_spi_writew (struct bcm63xx_spi *bs,u16 value,unsigned int offset) { -bcm_writew (value, bs->regs +bcm63xx_spireg (offset)); +#ifdef CONFIG_CPU_BIG_ENDIAN +iowrite16be (value, bs->regs +bcm63xx_spireg (offset)); +#else +writew (value, bs->regs +bcm63xx_spireg (offset)); +#endif }static const unsigned bcm63xx_spi_freq_table[SPI_CLK_MASK ][2 ] = {
Signature · 5 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 5/6 spi/bcm63xx: move message control word description to register offsets
In reply to Jonas GorskiMake the message control word parameters part of the register offsets array so we have them all in one struct.
---
v1 -> v2
* drop the platform_data struct completely.
arch/mips/bcm63xx/dev-spi.c | 17 ++--------------- arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 14 +++++++------- drivers/spi/spi-bcm63xx.c | 7 +++---- 3 files changed, 12 insertions(+), 26 deletions(-)
arch/mips/bcm63xx/dev-spi.c +2 -15
@@ -53,16 +53,11 @@ static struct resource spi_resources[] = { }, }; -static struct bcm63xx_spi_pdata spi_pdata; -static struct platform_device bcm63xx_spi_device = { .name ="bcm63xx-spi" , .id =-1 , .num_resources =ARRAY_SIZE (spi_resources), .resource = spi_resources, - .dev = { - .platform_data = &spi_pdata, - }, };int __init bcm63xx_spi_register (void )
@@ -74,20 +69,12 @@ 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 ()) spi_resources[0 ].end +=BCM_6348_RSET_SPI_SIZE -1 ; - spi_pdata.fifo_size =SPI_6348_MSG_DATA_SIZE ; - spi_pdata.msg_type_shift =SPI_6348_MSG_TYPE_SHIFT ; - spi_pdata.msg_ctl_width =SPI_6348_MSG_CTL_WIDTH ; - }if (BCMCPU_IS_3368 () ||BCMCPU_IS_6358 () ||BCMCPU_IS_6362 () || -BCMCPU_IS_6368 ()) { +BCMCPU_IS_6368 ()) spi_resources[0 ].end +=BCM_6358_RSET_SPI_SIZE -1 ; - spi_pdata.fifo_size =SPI_6358_MSG_DATA_SIZE ; - spi_pdata.msg_type_shift =SPI_6358_MSG_TYPE_SHIFT ; - spi_pdata.msg_ctl_width =SPI_6358_MSG_CTL_WIDTH ; - }bcm63xx_spi_regs_init ();
arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h +7 -7
@@ -7,12 +7,6 @@int __init bcm63xx_spi_register (void ); -struct bcm63xx_spi_pdata { -unsigned int fifo_size; -unsigned int msg_type_shift; -unsigned int msg_ctl_width; -}; -enum bcm63xx_regs_spi {SPI_CMD ,SPI_INT_STATUS ,
@@ -26,6 +20,9 @@ enum bcm63xx_regs_spi {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) \
@@ -40,7 +37,10 @@ enum bcm63xx_regs_spi { [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_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) {
drivers/spi/spi-bcm63xx.c +3 -4
@@ -329,7 +329,6 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) {struct resource *r;struct device *dev = &pdev->dev; -struct bcm63xx_spi_pdata *pdata =dev_get_platdata (&pdev->dev);int irq;struct spi_master *master;struct clk *clk;
@@ -369,7 +368,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) bs->irq = irq; bs->clk = clk; - bs->fifo_size = pdata->fifo_size; + bs->fifo_size =bcm63xx_spireg (SPI_MSG_DATA_SIZE ); ret =devm_request_irq (&pdev->dev, irq, bcm63xx_spi_interrupt,0 , pdev->name, master);
@@ -384,8 +383,8 @@ 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 = pdata->msg_type_shift; - bs->msg_ctl_width = pdata->msg_ctl_width; + 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 ));
Signature · 5 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 6/6 spi/bcm63xx: move register definitions into the driver
In reply to Jonas GorskiMove 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.
---
v1 -> v2
* Make use of device name for identification.
* Remove register helpers from arch/ code as well.
arch/mips/bcm63xx/dev-spi.c | 34 +--- .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 42 ----- drivers/spi/Kconfig | 2 +- drivers/spi/spi-bcm63xx.c | 197 ++++++++++++++++++--- 4 files changed, 181 insertions(+), 94 deletions(-)
arch/mips/bcm63xx/dev-spi.c +6 -28
@@ -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
46 lines not on this page · raw message
drivers/spi/Kconfig +1 -1
@@ -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
270 lines not on this page · raw message
Signature · 5 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1442074023-29840-7-git-send-email-jogo-p3rKhJxN3npAfugRpC6u6w@public.gmane.org
Applied "spi/bcm63xx: move register definitions into the driver" to the spi tree
The patch
spi/bcm63xx: move register definitions into the driver
has been applied to the spi tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
44d8fb30941d85800fbde0a1e3454b1fb23c5ecdMon Sep 17 00:00:00 2001
From: Jonas Gorski <[email protected]>
Date: Mon, 12 Oct 2015 12:24:23 +0200
Subject: [PATCH] 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.
--- arch/mips/bcm63xx/dev-spi.c | 34 +--- .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 42 ----- drivers/spi/Kconfig | 2 +- drivers/spi/spi-bcm63xx.c | 197 ++++++++++++++++++--- 4 files changed, 181 insertions(+), 94 deletions(-)
arch/mips/bcm63xx/dev-spi.c +6 -28
@@ -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
46 lines not on this page · raw message
drivers/spi/Kconfig +1 -1
@@ -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
270 lines not on this page · raw message
Signature · 6 lines
2.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html