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

Commit dea77ccd 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 update from Bob Liu.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin:
  Blackfin: smp: add smp_mb() to keep coherency
  Blackfin: drop irq enable in init_arch_irq()
  Blackfin: fix wrong place disabled irq
  Blackfin: update defconfig for bf609-ezkit
  Blackfin: add bf548 v0.4 revision
  Blackfin: bf60x: Add bf608 and bf609 specific perpheral MMRs
  Blackfin: cpufreq: fix dpm_state_table
  Blackfin: bfin_gpio: proc: fix return value
  Blackfin: CM-BF537E: Update SPORT support in board file.
  Blackfin: bf537: fix lq035 platform device name
  Blackfin: bf533-ezkit: enable flash drivers by default
parents de390bba 6594b982

arch/blackfin/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ config BF_REV_0_3 


config BF_REV_0_4

	bool "0.4"

	depends on (BF561 || BF533 || BF532 || BF531 || BF538 || BF539)

	depends on (BF561 || BF533 || BF532 || BF531 || BF538 || BF539 || BF54x)



config BF_REV_0_5

	bool "0.5"

arch/blackfin/configs/BF533-EZKIT_defconfig

+5 −2
Original line number Diff line number Diff line
@@ -52,10 +52,13 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
CONFIG_MTD=y

CONFIG_MTD_CHAR=m

CONFIG_MTD_BLOCK=y

CONFIG_MTD_JEDECPROBE=m

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_RAM=y

CONFIG_MTD_ROM=m

CONFIG_MTD_ROM=y

CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PLATRAM=y

CONFIG_BLK_DEV_RAM=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM is not set

arch/blackfin/configs/BF609-EZKIT_defconfig

+6 −10
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14
@@ -24,7 +25,6 @@ CONFIG_BF609=y 
CONFIG_PINT1_ASSIGN=0x01010000

CONFIG_PINT2_ASSIGN=0x07000101

CONFIG_PINT3_ASSIGN=0x02020303

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IP_CHECKSUM_L1=y

CONFIG_SYSCALL_TAB_L1=y

CONFIG_CPLB_SWITCH_TAB_L1=y
@@ -116,9 +116,6 @@ CONFIG_SND_PCM_OSS=m 
# CONFIG_SND_SPI is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=m

CONFIG_SND_BF6XX_I2S=m

CONFIG_SND_SOC_BFIN_EVAL_ADAU1X61=m

CONFIG_SND_SOC_ALL_CODECS=m

CONFIG_USB=y

CONFIG_USB_MUSB_HDRC=y

CONFIG_USB_MUSB_BLACKFIN=m
@@ -136,7 +133,6 @@ CONFIG_VFAT_FS=y 
CONFIG_JFFS2_FS=m

CONFIG_UBIFS_FS=m

CONFIG_NFS_FS=m

CONFIG_NFS_V3=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DEBUG_FS=y
@@ -149,9 +145,9 @@ CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y 
CONFIG_EARLY_PRINTK=y

CONFIG_CPLB_INFO=y

CONFIG_BFIN_PSEUDODBG_INSNS=y

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_HMAC=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=m

CONFIG_CRYPTO_ARC4=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DEV_BFIN_CRC=y
 
CONFIG_CRYPTO_DEV_BFIN_CRC=m

arch/blackfin/kernel/bfin_gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -1265,8 +1265,8 @@ static __init int gpio_register_proc(void) 
{

	struct proc_dir_entry *proc_gpio;



	proc_gpio = proc_create("gpio", S_IRUGO, NULL, &gpio_proc_ops);

	return proc_gpio != NULL;

	proc_gpio = proc_create("gpio", 0, NULL, &gpio_proc_ops);

	return proc_gpio == NULL;

}

__initcall(gpio_register_proc);

#endif

arch/blackfin/kernel/reboot.c

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ void native_machine_restart(char *cmd) 
void machine_restart(char *cmd)

{

	native_machine_restart(cmd);

	local_irq_disable();

	if (smp_processor_id())

		smp_call_function((void *)bfin_reset, 0, 1);

	else