Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realm...

Pull blackfin updates from Steven Miao:
 "blackfin updates for Linux 3.11"

* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
  smp: refine bf561 smpboot code
  bf609: stmmac: fix build after stmmac_mdio_bus_data changed
  bf609: add cpu revision 0.1
  bf609: rename bfin6xx_spi to bfin_spi3
  kgdb: blackfin: include irq_regs.h in kgdb.c

diff --combined arch/blackfin/Kconfig
index 08c7ac6,32226e5..3b6abc5
--- 1/arch/blackfin/Kconfig
--- 2/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@@ -41,7 -41,6 +41,7 @@@ config BLACKFI
        select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
 +      select HAVE_DEBUG_STACKOVERFLOW
  
  config GENERIC_CSUM
        def_bool y
@@@ -254,7 -253,7 +254,7 @@@ config NR_CPU
  
  config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
 -      depends on SMP && HOTPLUG
 +      depends on SMP
        default y
  
  config BF_REV_MIN
@@@ -283,7 -282,7 +283,7 @@@ config BF_REV_0_
  
  config BF_REV_0_1
        bool "0.1"
-       depends on (BF51x || BF52x || (BF54x && !BF54xM))
+       depends on (BF51x || BF52x || (BF54x && !BF54xM) || BF60x)
  
  config BF_REV_0_2
        bool "0.2"

diff --combined arch/blackfin/mach-bf609/boards/ezkit.c
index bba40ae,a5dca18..0bc4723
--- 1/arch/blackfin/mach-bf609/boards/ezkit.c
--- 2/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@@ -17,7 -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>
@@@ -108,7 -108,6 +108,6 @@@ static struct platform_device bfin_rota
  static unsigned short pins[] = P_RMII0;
  
  static struct stmmac_mdio_bus_data phy_private_data = {
-       .bus_id = 0,
        .phy_mask = 1,
  };
  
@@@ -745,13 -744,13 +744,13 @@@ static struct flash_platform_data bfin_
        .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
@@@ -821,7 -820,7 +820,7 @@@ static struct platform_device bfin_i2s 
  #if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
                || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
  static const char * const ad1836_link[] = {
 -      "bfin-tdm.0",
 +      "bfin-i2s.0",
        "spi0.76",
  };
  static struct platform_device bfin_ad1836_machine = {
@@@ -1296,7 -1295,7 +1295,7 @@@ static struct spi_board_info bfin_spi_b
        },
  #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 -1336,13 +1336,13 @@@ static struct resource bfin_spi1_resour
  };
  
  /* 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 -1351,13 +1351,13 @@@
        },
  };
  
- 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 -1533,7 +1533,7 @@@ static struct platform_device *ezkit_de
        &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