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

Commit c5af5451 authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: boards: fix num_chipselect values for on-chip SPI buses 



The num_chipselect field for on-chip Blackfin SPI buses is supposed to
be 1 larger than the number of actual CSs available.  This is because
the hardware starts counting at 1 and not 0.  There is a field for "CS0",
but it is marked as "reserved" everywhere.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 8effc4a6

arch/blackfin/mach-bf518/boards/ezbrd.c

+2 −2
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

/* SPI (0) */

static struct bfin5xx_spi_master bfin_spi0_info = {

	.num_chipselect = 5,

	.num_chipselect = 6,

	.enable_dma = 1,  /* master has the ability to do dma transfer */

	.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},

};
@@ -347,7 +347,7 @@ static struct platform_device bfin_spi0_device = { 


/* SPI (1) */

static struct bfin5xx_spi_master bfin_spi1_info = {

	.num_chipselect = 5,

	.num_chipselect = 6,

	.enable_dma = 1,  /* master has the ability to do dma transfer */

	.pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0},

};

arch/blackfin/mach-bf518/boards/tcm-bf518.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static struct platform_device bfin_spi0_device = { 


/* SPI (1) */

static struct bfin5xx_spi_master bfin_spi1_info = {

	.num_chipselect = 5,

	.num_chipselect = 6,

	.enable_dma = 1,  /* master has the ability to do dma transfer */

	.pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0},

};

arch/blackfin/mach-bf538/boards/ezkit.c

+2 −2
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static struct platform_device bf538_spi_master0 = { 
};



static struct bfin5xx_spi_master bf538_spi_master_info1 = {

	.num_chipselect = 8,

	.num_chipselect = 2,

	.enable_dma = 1,  /* master has the ability to do dma transfer */

	.pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0},

};
@@ -711,7 +711,7 @@ static struct platform_device bf538_spi_master1 = { 
};



static struct bfin5xx_spi_master bf538_spi_master_info2 = {

	.num_chipselect = 8,

	.num_chipselect = 2,

	.enable_dma = 1,  /* master has the ability to do dma transfer */

	.pin_req = {P_SPI2_SCK, P_SPI2_MISO, P_SPI2_MOSI, 0},

};

arch/blackfin/mach-bf548/boards/cm_bf548.c

+2 −2
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static struct resource bfin_spi1_resource[] = { 


/* SPI controller data */

static struct bfin5xx_spi_master bf54x_spi_master_info0 = {

	.num_chipselect = 3,

	.num_chipselect = 4,

	.enable_dma = 1,  /* master has the ability to do dma transfer */

	.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},

};
@@ -982,7 +982,7 @@ static struct platform_device bf54x_spi_master0 = { 
};



static struct bfin5xx_spi_master bf54x_spi_master_info1 = {

	.num_chipselect = 3,

	.num_chipselect = 4,

	.enable_dma = 1,  /* master has the ability to do dma transfer */

	.pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0},

};

arch/blackfin/mach-bf548/boards/ezkit.c

+2 −2
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ static struct resource bfin_spi1_resource[] = { 


/* SPI controller data */

static struct bfin5xx_spi_master bf54x_spi_master_info0 = {

	.num_chipselect = 3,

	.num_chipselect = 4,

	.enable_dma = 1,  /* master has the ability to do dma transfer */

	.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},

};
@@ -1123,7 +1123,7 @@ static struct platform_device bf54x_spi_master0 = { 
};



static struct bfin5xx_spi_master bf54x_spi_master_info1 = {

	.num_chipselect = 3,

	.num_chipselect = 4,

	.enable_dma = 1,  /* master has the ability to do dma transfer */

	.pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0},

};