Skip to contentSkip to conversation

ARM: pxa: Remove unused clock_enable field from struct pxa2xx_spi_master

PATCH Applied Jarkko Nikula 3 participants 4 messages Sep 18, 2015 – Sep 26, 2015

Subsystems (4)
Arm (32-bit) Arm sub-architectures SPI PXA2xx/PXA3xx support
lore
Share & tools
lore

Jarkko Nikula

author
#0 lore raw

PATCH 1/1 ARM: pxa: Remove unused clock_enable field from struct pxa2xx_spi_master

Use for struct pxa2xx_spi_master clock_enable field was removed years ago from the pxa2xx-spi driver by the commit 2f1a74e5a2de ("[ARM] pxa: make pxa2xx_spi driver use ssp_request()/ssp_free()").

Therefore remove it from structure definition, documentation and from couple affected board files.

Signed-off-by Jarkko Nikula <jarkko.nikula-VuQAYsv1563Yd54FQh9/[email protected]>

---
I propose this to be merged via ARM tree. I don't see we would need to do other SPI related changes to struct pxa2xx_spi_master in near future (knock on wood).

---
 Documentation/spi/pxa2xx       | 6 ------
 arch/arm/mach-pxa/hx4700.c     | 1 -
 arch/arm/mach-pxa/icontrol.c   | 2 --
 arch/arm/mach-pxa/z2.c         | 2 --
 include/linux/spi/pxa2xx_spi.h | 1 -
 5 files changed, 12 deletions(-)
Documentation/spi/pxa2xx +0 -6
index 3352f97430e4..13a0b7fb192f 100644
@@ -22,15 +22,10 @@ Typically a SPI master is defined in the arch/.../mach-*/board-*.c as a
 found in include/linux/spi/pxa2xx_spi.h:
 
 struct pxa2xx_spi_master {
-	u32 clock_enable;
 	u16 num_chipselect;
 	u8 enable_dma;
 };
 
-The "pxa2xx_spi_master.clock_enable" field is used to enable/disable the
-corresponding SSP peripheral block in the "Clock Enable Register (CKEN"). See
-the "PXA2xx Developer Manual" section "Clocks and Power Management".
-
 The "pxa2xx_spi_master.num_chipselect" field is used to determine the number of
 slave device (chips) attached to this SPI master.
 

@@ -57,7 +52,6 @@ static struct resource pxa_spi_nssp_resources[] = {
 };
 
 static struct pxa2xx_spi_master pxa_nssp_master_info = {
-	.clock_enable = CKEN_NSSP, /* NSSP Peripheral clock */
 	.num_chipselect = 1, /* Matches the number of chips attached to NSSP */
 	.enable_dma = 1, /* Enables NSSP DMA */
 };
arch/arm/mach-pxa/hx4700.c +0 -1
index 5fb41ad6e3bc..1e0301a0dbbb 100644
@@ -630,7 +630,6 @@ static struct spi_board_info tsc2046_board_info[] __initdata = {
 
 static struct pxa2xx_spi_master pxa_ssp2_master_info = {
 	.num_chipselect = 1,
-	.clock_enable   = CKEN_SSP2,
 	.enable_dma     = 1,
 };
arch/arm/mach-pxa/icontrol.c +0 -2
index 9b0eb0252af6..a1869f9b6219 100644
@@ -116,13 +116,11 @@ static struct spi_board_info mcp251x_board_info[] = {
 };
 
 static struct pxa2xx_spi_master pxa_ssp3_spi_master_info = {
-	.clock_enable   = CKEN_SSP3,
 	.num_chipselect = 2,
 	.enable_dma     = 1
 };
 
 static struct pxa2xx_spi_master pxa_ssp4_spi_master_info = {
-	.clock_enable   = CKEN_SSP4,
 	.num_chipselect = 2,
 	.enable_dma     = 1
 };
arch/arm/mach-pxa/z2.c +0 -2
index e1a121b36cfa..3deeca7bbe41 100644
@@ -595,13 +595,11 @@ static struct spi_board_info spi_board_info[] __initdata = {
 };
 
 static struct pxa2xx_spi_master pxa_ssp1_master_info = {
-	.clock_enable	= CKEN_SSP,
 	.num_chipselect	= 1,
 	.enable_dma	= 1,
 };
 
 static struct pxa2xx_spi_master pxa_ssp2_master_info = {
-	.clock_enable	= CKEN_SSP2,
 	.num_chipselect	= 1,
 };
include/linux/spi/pxa2xx_spi.h +0 -1
index 6d36dacec4ba..9ec4c147abbc 100644
@@ -23,7 +23,6 @@ struct dma_chan;
 
 /* device.platform_data for SSP controller devices */
 struct pxa2xx_spi_master {
-	u32 clock_enable;
 	u16 num_chipselect;
 	u8 enable_dma;
Signature · 6 lines
2.5.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
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Jarkko Nikula

Use for struct pxa2xx_spi_master clock_enable field was removed years ago from the pxa2xx-spi driver by the commit 2f1a74e5a2de ("[ARM] pxa: make pxa2xx_spi driver use ssp_request()/ssp_free()").

Acked-by Mark Brown <[email protected]>
maintainer
#2 lore raw
In reply to Jarkko Nikula
Quoted 4 lines · Jarkko Nikula

Use for struct pxa2xx_spi_master clock_enable field was removed years ago from the pxa2xx-spi driver by the commit 2f1a74e5a2de ("[ARM] pxa: make pxa2xx_spi driver use ssp_request()/ssp_free()").

Quoted 8 lines

Therefore remove it from structure definition, documentation and from couple affected board files.

Signed-off-by Jarkko Nikula <[email protected]>

---
I propose this to be merged via ARM tree. I don't see we would need to do other SPI related changes to struct pxa2xx_spi_master in near future (knock on wood).

I'll take that through the pxa/for-next tree in a couple of days, thanks.

Cheers.

--
Robert

maintainer Applied
#3 lore raw
Quoted 9 lines · Robert Jarzmik
Quoted 7 lines · Jarkko Nikula

Use for struct pxa2xx_spi_master clock_enable field was removed years ago from the pxa2xx-spi driver by the commit 2f1a74e5a2de ("[ARM] pxa: make pxa2xx_spi driver use ssp_request()/ssp_free()").

Therefore remove it from structure definition, documentation and from couple affected board files.

Quoted 6 lines
Quoted 5 lines
Signed-off-by Jarkko Nikula <[email protected]>

---
I propose this to be merged via ARM tree. I don't see we would need to do other SPI related changes to struct pxa2xx_spi_master in near future (knock on wood).

I'll take that through the pxa/for-next tree in a couple of days, thanks.

Queued in pxa/for-next, thanks.

Cheers.

Signature · 1 line
Robert