Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cfc5220 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Robert Jarzmik
Browse files

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 2f1a74e5 ("[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: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
parent 6ff33f39

Documentation/spi/pxa2xx

+0 −6
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;