diff options
Diffstat (limited to 'arch/blackfin/mach-bf537')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/generic_board.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/minotaur.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/include/mach/portmux.h | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c index dd6e6bfb98ea..d12ddf155102 100644 --- a/arch/blackfin/mach-bf537/boards/generic_board.c +++ b/arch/blackfin/mach-bf537/boards/generic_board.c | |||
@@ -726,7 +726,7 @@ void native_machine_restart(char *cmd) | |||
726 | { | 726 | { |
727 | /* workaround reboot hang when booting from SPI */ | 727 | /* workaround reboot hang when booting from SPI */ |
728 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | 728 | if ((bfin_read_SYSCR() & 0x7) == 0x3) |
729 | bfin_gpio_reset_spi0_ssel1(); | 729 | bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); |
730 | } | 730 | } |
731 | 731 | ||
732 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 732 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c index bb795341cb17..8f36d260aee2 100644 --- a/arch/blackfin/mach-bf537/boards/minotaur.c +++ b/arch/blackfin/mach-bf537/boards/minotaur.c | |||
@@ -377,5 +377,5 @@ void native_machine_restart(char *cmd) | |||
377 | { | 377 | { |
378 | /* workaround reboot hang when booting from SPI */ | 378 | /* workaround reboot hang when booting from SPI */ |
379 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | 379 | if ((bfin_read_SYSCR() & 0x7) == 0x3) |
380 | bfin_gpio_reset_spi0_ssel1(); | 380 | bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); |
381 | } | 381 | } |
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index d812e2514a2f..447d6d40361b 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -1307,7 +1307,7 @@ void native_machine_restart(char *cmd) | |||
1307 | { | 1307 | { |
1308 | /* workaround reboot hang when booting from SPI */ | 1308 | /* workaround reboot hang when booting from SPI */ |
1309 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | 1309 | if ((bfin_read_SYSCR() & 0x7) == 0x3) |
1310 | bfin_gpio_reset_spi0_ssel1(); | 1310 | bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); |
1311 | } | 1311 | } |
1312 | 1312 | ||
1313 | /* | 1313 | /* |
diff --git a/arch/blackfin/mach-bf537/include/mach/portmux.h b/arch/blackfin/mach-bf537/include/mach/portmux.h index 78fee6e0f237..87285e75e903 100644 --- a/arch/blackfin/mach-bf537/include/mach/portmux.h +++ b/arch/blackfin/mach-bf537/include/mach/portmux.h | |||
@@ -31,6 +31,7 @@ | |||
31 | #define P_PPI0_FS1 (P_DEFINED | P_IDENT(GPIO_PF9) | P_FUNCT(1)) | 31 | #define P_PPI0_FS1 (P_DEFINED | P_IDENT(GPIO_PF9) | P_FUNCT(1)) |
32 | #define P_TACLK0 (P_DEFINED | P_IDENT(GPIO_PF14) | P_FUNCT(1)) | 32 | #define P_TACLK0 (P_DEFINED | P_IDENT(GPIO_PF14) | P_FUNCT(1)) |
33 | #define P_TMRCLK (P_DEFINED | P_IDENT(GPIO_PF15) | P_FUNCT(1)) | 33 | #define P_TMRCLK (P_DEFINED | P_IDENT(GPIO_PF15) | P_FUNCT(1)) |
34 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1 | ||
34 | 35 | ||
35 | #define P_PPI0_D0 (P_DEFINED | P_IDENT(GPIO_PG0) | P_FUNCT(0)) | 36 | #define P_PPI0_D0 (P_DEFINED | P_IDENT(GPIO_PG0) | P_FUNCT(0)) |
36 | #define P_PPI0_D1 (P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(0)) | 37 | #define P_PPI0_D1 (P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(0)) |