Skip to content

Commit 5cfc522

Browse files
jhnikularjarzmik
authored andcommittedSep 20, 2015
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 2f1a74e ("[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 <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Robert Jarzmik <[email protected]>
1 parent 6ff33f3 commit 5cfc522

File tree

5 files changed

+0
-12
lines changed

5 files changed

+0
-12
lines changed
 

‎Documentation/spi/pxa2xx

-6
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,10 @@ Typically a SPI master is defined in the arch/.../mach-*/board-*.c as a
2222
found in include/linux/spi/pxa2xx_spi.h:
2323

2424
struct pxa2xx_spi_master {
25-
u32 clock_enable;
2625
u16 num_chipselect;
2726
u8 enable_dma;
2827
};
2928

30-
The "pxa2xx_spi_master.clock_enable" field is used to enable/disable the
31-
corresponding SSP peripheral block in the "Clock Enable Register (CKEN"). See
32-
the "PXA2xx Developer Manual" section "Clocks and Power Management".
33-
3429
The "pxa2xx_spi_master.num_chipselect" field is used to determine the number of
3530
slave device (chips) attached to this SPI master.
3631

@@ -57,7 +52,6 @@ static struct resource pxa_spi_nssp_resources[] = {
5752
};
5853

5954
static struct pxa2xx_spi_master pxa_nssp_master_info = {
60-
.clock_enable = CKEN_NSSP, /* NSSP Peripheral clock */
6155
.num_chipselect = 1, /* Matches the number of chips attached to NSSP */
6256
.enable_dma = 1, /* Enables NSSP DMA */
6357
};

‎arch/arm/mach-pxa/hx4700.c

-1
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,6 @@ static struct spi_board_info tsc2046_board_info[] __initdata = {
630630

631631
static struct pxa2xx_spi_master pxa_ssp2_master_info = {
632632
.num_chipselect = 1,
633-
.clock_enable = CKEN_SSP2,
634633
.enable_dma = 1,
635634
};
636635

‎arch/arm/mach-pxa/icontrol.c

-2
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,11 @@ static struct spi_board_info mcp251x_board_info[] = {
116116
};
117117

118118
static struct pxa2xx_spi_master pxa_ssp3_spi_master_info = {
119-
.clock_enable = CKEN_SSP3,
120119
.num_chipselect = 2,
121120
.enable_dma = 1
122121
};
123122

124123
static struct pxa2xx_spi_master pxa_ssp4_spi_master_info = {
125-
.clock_enable = CKEN_SSP4,
126124
.num_chipselect = 2,
127125
.enable_dma = 1
128126
};

‎arch/arm/mach-pxa/z2.c

-2
Original file line numberDiff line numberDiff line change
@@ -595,13 +595,11 @@ static struct spi_board_info spi_board_info[] __initdata = {
595595
};
596596

597597
static struct pxa2xx_spi_master pxa_ssp1_master_info = {
598-
.clock_enable = CKEN_SSP,
599598
.num_chipselect = 1,
600599
.enable_dma = 1,
601600
};
602601

603602
static struct pxa2xx_spi_master pxa_ssp2_master_info = {
604-
.clock_enable = CKEN_SSP2,
605603
.num_chipselect = 1,
606604
};
607605

‎include/linux/spi/pxa2xx_spi.h

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ struct dma_chan;
2323

2424
/* device.platform_data for SSP controller devices */
2525
struct pxa2xx_spi_master {
26-
u32 clock_enable;
2726
u16 num_chipselect;
2827
u8 enable_dma;
2928

0 commit comments

Comments
 (0)