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

Commit 49283f60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'blackfin-for-linus' of... 

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

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
parents 8f041e6c 150382a5

arch/blackfin/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ config BF_REV_0_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"

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/kernel/kgdb.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/ptrace.h>		/* for linux pt_regs struct */

#include <linux/kgdb.h>

#include <linux/uaccess.h>

#include <asm/irq_regs.h>



void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)

{

arch/blackfin/mach-bf561/smp.c

+3 −4
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ void __cpuinit platform_secondary_init(unsigned int cpu) 
	SSYNC();



	/* We are done with local CPU inits, unblock the boot CPU. */

	set_cpu_online(cpu, true);

	spin_lock(&boot_lock);

	spin_unlock(&boot_lock);

}
@@ -91,7 +90,9 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle 
		SSYNC();

	}



	timeout = jiffies + 1 * HZ;

	timeout = jiffies + HZ;

	/* release the lock and let coreb run */

	spin_unlock(&boot_lock);

	while (time_before(jiffies, timeout)) {

		if (cpu_online(cpu))

			break;
@@ -100,8 +101,6 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle 
	}



	if (cpu_online(cpu)) {

		/* release the lock and let coreb run */

		spin_unlock(&boot_lock);

		return 0;

	} else

		panic("CPU%u: processor failed to boot\n", cpu);

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

+9 −10
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>
@@ -108,7 +108,6 @@ static struct platform_device bfin_rotary_device = { 
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 @@ 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 +1295,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 +1336,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 +1351,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 +1533,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