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

Commit 32e6e5c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'blackfin-3.16-fixes' of... 

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

Pull blackfin fixes from Steven Miao:
 "smc nor flash PM fix, pinctrl group fix, update defconfig, and build
  fixes"

* tag 'blackfin-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
  blackfin: vmlinux.lds.S: reserve 32 bytes space at the end of data section for XIP kernel
  defconfig: BF609: update spi config name
  irq: blackfin sec: drop duplicated sec priority set
  blackfin: bind different groups of one pinmux function to different state name
  blackfin: fix some bf5xx boards build for missing <linux/gpio.h>
  pm: bf609: cleanup smc nor flash
parents 0e6103e5 b76f9823

arch/blackfin/configs/BF609-EZKIT_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_BLACKFIN_TWI=y

CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100

CONFIG_SPI=y

CONFIG_SPI_BFIN_V3=y

CONFIG_SPI_ADI_V3=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

arch/blackfin/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ SECTIONS 


	.text_l1 L1_CODE_START : AT(LOADADDR(.exit.data) + SIZEOF(.exit.data))

#else

	.init.data : AT(__data_lma + __data_len)

	.init.data : AT(__data_lma + __data_len + 32)

	{

		__sinitdata = .;

		INIT_DATA

arch/blackfin/mach-bf533/boards/blackstamp.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/flash.h>

#include <linux/irq.h>

#include <linux/gpio.h>

#include <linux/i2c.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>

arch/blackfin/mach-bf537/boards/cm_bf537e.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#endif

#include <linux/ata_platform.h>

#include <linux/irq.h>

#include <linux/gpio.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>

#include <asm/portmux.h>

arch/blackfin/mach-bf537/boards/cm_bf537u.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#endif

#include <linux/ata_platform.h>

#include <linux/irq.h>

#include <linux/gpio.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>

#include <asm/portmux.h>