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

Commit 5e50175b authored by Scott Jiang's avatar Scott Jiang Committed by Steven Miao
Browse files

bf609: rename bfin6xx_spi to bfin_spi3 



Signed-off-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: default avatarSteven Miao <realmz6@gmail.com>
parent 259c9b17

arch/blackfin/include/asm/bfin6xx_spi.h→arch/blackfin/include/asm/bfin_spi3.h

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ struct bfin_spi_regs { 
#define MAX_CTRL_CS          8  /* cs in spi controller */



/* device.platform_data for SSP controller devices */

struct bfin6xx_spi_master {

struct bfin_spi3_master {

	u16 num_chipselect;

	u16 pin_req[7];

};
@@ -248,7 +248,7 @@ struct bfin6xx_spi_master { 
/* spi_board_info.controller_data for SPI slave devices,

 * copied to spi_device.platform_data ... mostly for dma tuning

 */

struct bfin6xx_spi_chip {

struct bfin_spi3_chip {

	u32 control;

	u16 cs_chg_udelay; /* Some devices require 16-bit delays */

	u32 tx_dummy_val; /* tx value for rx only transfer */

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

+9 −9
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/i2c.h>

#include <linux/interrupt.h>

#include <linux/usb/musb.h>

#include <asm/bfin6xx_spi.h>

#include <asm/bfin_spi3.h>

#include <asm/dma.h>

#include <asm/gpio.h>

#include <asm/nand.h>
@@ -745,13 +745,13 @@ static struct flash_platform_data bfin_spi_flash_data = { 
	.type = "w25q32",

};



static struct bfin6xx_spi_chip spi_flash_chip_info = {

static struct bfin_spi3_chip spi_flash_chip_info = {

	.enable_dma = true,         /* use dma transfer with this chip*/

};

#endif



#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)

static struct bfin6xx_spi_chip spidev_chip_info = {

static struct bfin_spi3_chip spidev_chip_info = {

	.enable_dma = true,

};

#endif
@@ -1296,7 +1296,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	},

#endif

};

#if defined(CONFIG_SPI_BFIN6XX) || defined(CONFIG_SPI_BFIN6XX_MODULE)

#if IS_ENABLED(CONFIG_SPI_BFIN_V3)

/* SPI (0) */

static struct resource bfin_spi0_resource[] = {

	{
@@ -1337,13 +1337,13 @@ static struct resource bfin_spi1_resource[] = { 
};



/* SPI controller data */

static struct bfin6xx_spi_master bf60x_spi_master_info0 = {

static struct bfin_spi3_master bf60x_spi_master_info0 = {

	.num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,

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

};



static struct platform_device bf60x_spi_master0 = {

	.name = "bfin-spi",

	.name = "bfin-spi3",

	.id = 0, /* Bus number */

	.num_resources = ARRAY_SIZE(bfin_spi0_resource),

	.resource = bfin_spi0_resource,
@@ -1352,13 +1352,13 @@ static struct platform_device bf60x_spi_master0 = { 
	},

};



static struct bfin6xx_spi_master bf60x_spi_master_info1 = {

static struct bfin_spi3_master bf60x_spi_master_info1 = {

	.num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,

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

};



static struct platform_device bf60x_spi_master1 = {

	.name = "bfin-spi",

	.name = "bfin-spi3",

	.id = 1, /* Bus number */

	.num_resources = ARRAY_SIZE(bfin_spi1_resource),

	.resource = bfin_spi1_resource,
@@ -1534,7 +1534,7 @@ static struct platform_device *ezkit_devices[] __initdata = { 
	&bfin_sdh_device,

#endif



#if defined(CONFIG_SPI_BFIN6XX) || defined(CONFIG_SPI_BFIN6XX_MODULE)

#if IS_ENABLED(CONFIG_SPI_BFIN_V3)

	&bf60x_spi_master0,

	&bf60x_spi_master1,

#endif