Commit 759e2a25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull blackfin changes from Bob Liu:
 "The big changes are adding PM and HDMI support for bf60x, other
  patches are various bug fix and code cleanup."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin: (48 commits)
  bf60x: fix build warning
  PM: add BF60x flash suspend and resume support
  blackfin: twi: read twi mmr via bfin_read macro
  dpm: deepsleep: reserve stack
  bf60x: cpufreq: fix anomaly 05000273
  bf609: add adv7511 display support
  blackfin: cplb-nompu: fix ROM cplb size for bf609-ezkit
  bf60x: Add double fault, hardware error and NMI SEC handler
  bf60x: update anomaly id in serial and twi driver headers.
  bf60x: vs6624 pin update
  bf60x: add default anomaly setting.
  bf60x: update bf60x anomaly list.
  bf60x: sec: Enable sec interrupt source priority configuration.
  bf60x: sec: Clean up interrupt initialization code for SEC.
  bf609: reuse bf5xx-i2s-pcm.c as i2s pcm driver
  bf561: add capabilities in adv7183_inputs
  bf609: convert vs6624 blank_clocks to black_pixels
  blackfin: fix musb macro name
  cleanup: sec and linkport only built on bf60x
  bfin: pint: add pint suspend and resume
  ...
parents 90e66dd9 719154c6

arch/blackfin/Kconfig

+14 −2
Original line number Diff line number Diff line
@@ -352,6 +352,11 @@ config MEM_MT48H32M16LFCJ_75 
	depends on (BFIN526_EZBRD)

	default y



config MEM_MT47H64M16

	bool

	depends on (BFIN609_EZKIT)

	default y



source "arch/blackfin/mach-bf518/Kconfig"

source "arch/blackfin/mach-bf527/Kconfig"

source "arch/blackfin/mach-bf533/Kconfig"
@@ -399,8 +404,9 @@ config ROM_BASE 
	hex "Kernel ROM Base"

	depends on ROMKERNEL

	default "0x20040040"

	range 0x20000000 0x20400000 if !(BF54x || BF561)

	range 0x20000000 0x20400000 if !(BF54x || BF561 || BF60x)

	range 0x20000000 0x30000000 if (BF54x || BF561)

	range 0xB0000000 0xC0000000 if (BF60x)

	help

	  Make sure your ROM base does not include any file-header

	  information that is prepended to the kernel.
@@ -1009,6 +1015,12 @@ config HAVE_PWM 
choice

	prompt "Uncached DMA region"

	default DMA_UNCACHED_1M

config DMA_UNCACHED_32M

	bool "Enable 32M DMA region"

config DMA_UNCACHED_16M

	bool "Enable 16M DMA region"

config DMA_UNCACHED_8M

	bool "Enable 8M DMA region"

config DMA_UNCACHED_4M

	bool "Enable 4M DMA region"

config DMA_UNCACHED_2M
@@ -1038,7 +1050,7 @@ config BFIN_EXTMEM_ICACHEABLE 
config BFIN_L2_ICACHEABLE

	bool "Enable ICACHE for L2 SRAM"

	depends on BFIN_ICACHE

	depends on BF54x || BF561

	depends on (BF54x || BF561 || BF60x) && !SMP

	default n



config BFIN_DCACHE

arch/blackfin/configs/BF609-EZKIT_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ CONFIG_INPUT_BFIN_ROTARY=y 
# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_BFIN_SIMPLE_TIMER=m

# CONFIG_BFIN_CRC is not set

CONFIG_BFIN_LINKPORT=y

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_BFIN=y
@@ -153,3 +154,4 @@ CONFIG_CRYPTO_MD4=y 
CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_ARC4=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DEV_BFIN_CRC=y

arch/blackfin/include/asm/bfin-global.h

+7 −1
Original line number Diff line number Diff line
@@ -14,7 +14,13 @@ 
#include <linux/linkage.h>

#include <linux/types.h>



#if defined(CONFIG_DMA_UNCACHED_4M)

#if defined(CONFIG_DMA_UNCACHED_32M)

# define DMA_UNCACHED_REGION (32 * 1024 * 1024)

#elif defined(CONFIG_DMA_UNCACHED_16M)

# define DMA_UNCACHED_REGION (16 * 1024 * 1024)

#elif defined(CONFIG_DMA_UNCACHED_8M)

# define DMA_UNCACHED_REGION (8 * 1024 * 1024)

#elif defined(CONFIG_DMA_UNCACHED_4M)

# define DMA_UNCACHED_REGION (4 * 1024 * 1024)

#elif defined(CONFIG_DMA_UNCACHED_2M)

# define DMA_UNCACHED_REGION (2 * 1024 * 1024)

arch/blackfin/include/asm/bfin_crc.h

+0 −14
Original line number Diff line number Diff line
@@ -79,20 +79,6 @@ struct crc_register { 
	u32 revid;

};



struct bfin_crc {

	struct miscdevice mdev;

	struct list_head list;

	int irq;

	int dma_ch_src;

	int dma_ch_dest;

	volatile struct crc_register *regs;

	struct crc_info *info;

	struct mutex mutex;

	struct completion c;

	unsigned short opmode;

	char name[20];

};



/* CRC_STATUS Masks */

#define CMPERR			0x00000002	/* Compare error */

#define DCNTEXP			0x00000010	/* datacnt register expired */

arch/blackfin/include/asm/bfin_serial.h

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ struct bfin_uart_regs { 
#define UART_GET_GCTL(p)      UART_GET_CTL(p)

#define UART_GET_LCR(p)       UART_GET_CTL(p)

#define UART_GET_MCR(p)       UART_GET_CTL(p)

#if ANOMALY_05001001

#if ANOMALY_16000030

#define UART_GET_STAT(p) \

({ \

	u32 __ret; \

CRA Git | Maintained and supported by SUSTech CRA and CCSE