diff options
Diffstat (limited to 'arch/blackfin/mach-bf609')
-rw-r--r-- | arch/blackfin/mach-bf609/boards/ezkit.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c index bba40aed4273..0bc47231540b 100644 --- a/arch/blackfin/mach-bf609/boards/ezkit.c +++ b/arch/blackfin/mach-bf609/boards/ezkit.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/i2c.h> | 17 | #include <linux/i2c.h> |
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/usb/musb.h> | 19 | #include <linux/usb/musb.h> |
20 | #include <asm/bfin6xx_spi.h> | 20 | #include <asm/bfin_spi3.h> |
21 | #include <asm/dma.h> | 21 | #include <asm/dma.h> |
22 | #include <asm/gpio.h> | 22 | #include <asm/gpio.h> |
23 | #include <asm/nand.h> | 23 | #include <asm/nand.h> |
@@ -108,7 +108,6 @@ static struct platform_device bfin_rotary_device = { | |||
108 | static unsigned short pins[] = P_RMII0; | 108 | static unsigned short pins[] = P_RMII0; |
109 | 109 | ||
110 | static struct stmmac_mdio_bus_data phy_private_data = { | 110 | static struct stmmac_mdio_bus_data phy_private_data = { |
111 | .bus_id = 0, | ||
112 | .phy_mask = 1, | 111 | .phy_mask = 1, |
113 | }; | 112 | }; |
114 | 113 | ||
@@ -745,13 +744,13 @@ static struct flash_platform_data bfin_spi_flash_data = { | |||
745 | .type = "w25q32", | 744 | .type = "w25q32", |
746 | }; | 745 | }; |
747 | 746 | ||
748 | static struct bfin6xx_spi_chip spi_flash_chip_info = { | 747 | static struct bfin_spi3_chip spi_flash_chip_info = { |
749 | .enable_dma = true, /* use dma transfer with this chip*/ | 748 | .enable_dma = true, /* use dma transfer with this chip*/ |
750 | }; | 749 | }; |
751 | #endif | 750 | #endif |
752 | 751 | ||
753 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) | 752 | #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE) |
754 | static struct bfin6xx_spi_chip spidev_chip_info = { | 753 | static struct bfin_spi3_chip spidev_chip_info = { |
755 | .enable_dma = true, | 754 | .enable_dma = true, |
756 | }; | 755 | }; |
757 | #endif | 756 | #endif |
@@ -1296,7 +1295,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
1296 | }, | 1295 | }, |
1297 | #endif | 1296 | #endif |
1298 | }; | 1297 | }; |
1299 | #if defined(CONFIG_SPI_BFIN6XX) || defined(CONFIG_SPI_BFIN6XX_MODULE) | 1298 | #if IS_ENABLED(CONFIG_SPI_BFIN_V3) |
1300 | /* SPI (0) */ | 1299 | /* SPI (0) */ |
1301 | static struct resource bfin_spi0_resource[] = { | 1300 | static struct resource bfin_spi0_resource[] = { |
1302 | { | 1301 | { |
@@ -1337,13 +1336,13 @@ static struct resource bfin_spi1_resource[] = { | |||
1337 | }; | 1336 | }; |
1338 | 1337 | ||
1339 | /* SPI controller data */ | 1338 | /* SPI controller data */ |
1340 | static struct bfin6xx_spi_master bf60x_spi_master_info0 = { | 1339 | static struct bfin_spi3_master bf60x_spi_master_info0 = { |
1341 | .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS, | 1340 | .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS, |
1342 | .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0}, | 1341 | .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0}, |
1343 | }; | 1342 | }; |
1344 | 1343 | ||
1345 | static struct platform_device bf60x_spi_master0 = { | 1344 | static struct platform_device bf60x_spi_master0 = { |
1346 | .name = "bfin-spi", | 1345 | .name = "bfin-spi3", |
1347 | .id = 0, /* Bus number */ | 1346 | .id = 0, /* Bus number */ |
1348 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), | 1347 | .num_resources = ARRAY_SIZE(bfin_spi0_resource), |
1349 | .resource = bfin_spi0_resource, | 1348 | .resource = bfin_spi0_resource, |
@@ -1352,13 +1351,13 @@ static struct platform_device bf60x_spi_master0 = { | |||
1352 | }, | 1351 | }, |
1353 | }; | 1352 | }; |
1354 | 1353 | ||
1355 | static struct bfin6xx_spi_master bf60x_spi_master_info1 = { | 1354 | static struct bfin_spi3_master bf60x_spi_master_info1 = { |
1356 | .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS, | 1355 | .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS, |
1357 | .pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0}, | 1356 | .pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0}, |
1358 | }; | 1357 | }; |
1359 | 1358 | ||
1360 | static struct platform_device bf60x_spi_master1 = { | 1359 | static struct platform_device bf60x_spi_master1 = { |
1361 | .name = "bfin-spi", | 1360 | .name = "bfin-spi3", |
1362 | .id = 1, /* Bus number */ | 1361 | .id = 1, /* Bus number */ |
1363 | .num_resources = ARRAY_SIZE(bfin_spi1_resource), | 1362 | .num_resources = ARRAY_SIZE(bfin_spi1_resource), |
1364 | .resource = bfin_spi1_resource, | 1363 | .resource = bfin_spi1_resource, |
@@ -1534,7 +1533,7 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
1534 | &bfin_sdh_device, | 1533 | &bfin_sdh_device, |
1535 | #endif | 1534 | #endif |
1536 | 1535 | ||
1537 | #if defined(CONFIG_SPI_BFIN6XX) || defined(CONFIG_SPI_BFIN6XX_MODULE) | 1536 | #if IS_ENABLED(CONFIG_SPI_BFIN_V3) |
1538 | &bf60x_spi_master0, | 1537 | &bf60x_spi_master0, |
1539 | &bf60x_spi_master1, | 1538 | &bf60x_spi_master1, |
1540 | #endif | 1539 | #endif |