Commit 7f388396 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (47 commits)
  Blackfin: bfin_spi.h: add MMR peripheral layout
  Blackfin: bfin_ppi.h: start a common PPI/EPPI header
  Blackfin: bfin_can.h: add missing VERSION/VERSION2 MMRs
  Blackfin: bf538: add missing SIC_RVECT define
  Blackfin: bf561: rewrite SICA_xxx to just SIC_xxx
  Blackfin: bf54x: add missing SIC_RVECT definition
  Blackfin: H8606: move 8250 irqflags to platform resources
  Blackfin: glue XIP/ROM kernel kconfigs
  Blackfin: update sparse flags for latest upstream changes
  Blackfin: coreb: update ioctl numbers
  Blackfin: coreb: add gpl module license
  Blackfin: bf518-ezkit: add ssm2603 codec resources
  Blackfin: bf51x/bf52x: fix 16/32bit SPORT MMR helpers
  Blackfin: tll6527m: new board port
  Blackfin: bf526-ezbrd/bf527-ezkit: add NAND partition for u-boot
  Blackfin: merge kernel init memory back into main memory region
  Blackfin: gpio: add peripheral group check
  Blackfin: dma: bf54x: add missing break for SPORT1 TX IRQ
  Blackfin: add new cacheflush syscall
  Blackfin: bf548-ezkit: increase u-boot partition size
  ...
parents 10f2a2b0 b9ac41e3

arch/blackfin/Kconfig

+10 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ config BF_REV_0_1 


config BF_REV_0_2

	bool "0.2"

	depends on (BF52x || BF537 || BF536 || BF534 || (BF54x && !BF54xM))

	depends on (BF51x || BF52x || BF537 || BF536 || BF534 || (BF54x && !BF54xM))



config BF_REV_0_3

	bool "0.3"
@@ -356,7 +356,7 @@ config MEM_MT48LC8M32B2B5_7 


config MEM_MT48LC32M16A2TG_75

	bool

	depends on (BFIN527_EZKIT || BFIN527_EZKIT_V2 || BFIN532_IP0X || BLACKSTAMP)

	depends on (BFIN527_EZKIT || BFIN527_EZKIT_V2 || BFIN532_IP0X || BLACKSTAMP || BFIN527_AD7160EVAL)

	default y



config MEM_MT48H32M16LFCJ_75
@@ -426,6 +426,7 @@ config CLKIN_HZ 
	default "25000000" # most people use this

	default "27000000" if BFIN533_EZKIT

	default "30000000" if BFIN561_EZKIT

	default "24000000" if BFIN527_AD7160EVAL

	help

	  The frequency of CLKIN crystal oscillator on the board in Hz.

	  Warning: This value should match the crystal on the board. Otherwise,
@@ -463,6 +464,7 @@ config VCO_MULT 
	default "20" if (BFIN537_BLUETECHNIX_CM_E || BFIN537_BLUETECHNIX_CM_U || BFIN527_BLUETECHNIX_CM || BFIN561_BLUETECHNIX_CM)

	default "20" if BFIN561_EZKIT

	default "16" if (H8606_HVSISTEMAS || BLACKSTAMP || BFIN526_EZBRD || BFIN518F_EZBRD)

	default "25" if BFIN527_AD7160EVAL

	help

	  This controls the frequency of the on-chip PLL. This can be between 1 and 64.

	  PLL Frequency = (Crystal Frequency) * (this setting)
@@ -926,6 +928,12 @@ config ROMKERNEL 


endchoice



# Common code uses "ROMKERNEL" or "XIP_KERNEL", so define both

config XIP_KERNEL

	bool

	default y

	depends on ROMKERNEL



source "mm/Kconfig"



config BFIN_GPTIMERS

arch/blackfin/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -101,9 +101,8 @@ KBUILD_CFLAGS += -mcpu=$(cpu-y)-$(rev-y) 
KBUILD_AFLAGS += -mcpu=$(cpu-y)-$(rev-y)



# - we utilize the silicon rev from the toolchain, so move it over to the checkflags

# - the l1_text attribute is Blackfin specific, so fake it out as used to kill warnings

CHECKFLAGS_SILICON = $(shell echo "" | $(CPP) $(KBUILD_CFLAGS) -dD - 2>/dev/null | awk '$$2 == "__SILICON_REVISION__" { print $$3 }')

CHECKFLAGS += -D__SILICON_REVISION__=$(CHECKFLAGS_SILICON) -Dl1_text=__used__

CHECKFLAGS += -D__SILICON_REVISION__=$(CHECKFLAGS_SILICON) -D__bfin__



head-y   := arch/$(ARCH)/kernel/init_task.o

arch/blackfin/configs/BF527-AD7160-EVAL_defconfig

0 → 100644
+105 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EMBEDDED=y

# CONFIG_ELF_CORE is not set

# CONFIG_AIO is not set

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_PREEMPT=y

CONFIG_BF527=y

CONFIG_BF_REV_0_2=y

CONFIG_IRQ_TWI=7

CONFIG_IRQ_PORTH_INTA=7

CONFIG_IRQ_PORTH_INTB=7

CONFIG_BFIN527_AD7160EVAL=y

CONFIG_BF527_SPORT0_PORTF=y

CONFIG_BF527_UART1_PORTG=y

CONFIG_IRQ_USB_INT0=11

CONFIG_IRQ_USB_INT1=11

CONFIG_IRQ_USB_INT2=11

CONFIG_IRQ_USB_DMA=11

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="bootargs=root=/dev/mtdblock0 rw clkin_hz=24000000 earlyprintk=serial,uart0,57600 console=tty0 console=ttyBF0,57600"

CONFIG_CLKIN_HZ=24000000

CONFIG_HZ_300=y

# CONFIG_CYCLES_CLOCKSOURCE is not set

CONFIG_IP_CHECKSUM_L1=y

CONFIG_SYSCALL_TAB_L1=y

CONFIG_CPLB_SWITCH_TAB_L1=y

CONFIG_BFIN_GPTIMERS=y

CONFIG_C_CDPRIO=y

CONFIG_BANK_1=0x5554

CONFIG_BANK_3=0xFFC0

CONFIG_BINFMT_FLAT=y

CONFIG_BINFMT_ZFLAT=y

CONFIG_NET=y

CONFIG_UNIX=y

# CONFIG_WIRELESS is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_MISC_DEVICES is not set

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_AD7160=y

CONFIG_TOUCHSCREEN_AD7160_FW=y

# CONFIG_SERIO is not set

# CONFIG_BFIN_DMA_INTERFACE is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_BFIN=y

CONFIG_SERIAL_BFIN_CONSOLE=y

CONFIG_SERIAL_BFIN_UART0=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_BFIN_OTP is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_ALGOBIT=y

CONFIG_I2C_BLACKFIN_TWI=y

CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=400

CONFIG_SPI=y

CONFIG_SPI_BFIN=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

# CONFIG_LOGO_BLACKFIN_VGA16 is not set

# CONFIG_HID_SUPPORT is not set

CONFIG_USB_MUSB_HDRC=y

CONFIG_USB_GADGET_MUSB_HDRC=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_G_SERIAL=y

CONFIG_MMC=y

CONFIG_MMC_SPI=y

CONFIG_EXT2_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set

CONFIG_EARLY_PRINTK=y

CONFIG_CPLB_INFO=y

CONFIG_SECURITY=y

CONFIG_CRC_CCITT=m

arch/blackfin/configs/BF527-TLL6527M_defconfig

0 → 100644
+180 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_LOCALVERSION="DEV_0-1_pre2010"

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EMBEDDED=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_ELF_CORE is not set

# CONFIG_FUTEX is not set

# CONFIG_SIGNALFD is not set

# CONFIG_TIMERFD is not set

# CONFIG_EVENTFD is not set

# CONFIG_AIO is not set

CONFIG_SLAB=y

CONFIG_MMAP_ALLOW_UNINITIALIZED=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_BF527=y

CONFIG_BF_REV_0_2=y

CONFIG_BFIN527_TLL6527M=y

CONFIG_BF527_UART1_PORTG=y

CONFIG_IRQ_USB_INT0=11

CONFIG_IRQ_USB_INT1=11

CONFIG_IRQ_USB_INT2=11

CONFIG_IRQ_USB_DMA=11

CONFIG_BOOT_LOAD=0x400000

# CONFIG_CYCLES_CLOCKSOURCE is not set

# CONFIG_SCHEDULE_L1 is not set

# CONFIG_MEMSET_L1 is not set

# CONFIG_MEMCPY_L1 is not set

# CONFIG_SYS_BFIN_SPINLOCK_L1 is not set

CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0

CONFIG_BFIN_GPTIMERS=y

CONFIG_DMA_UNCACHED_2M=y

CONFIG_C_CDPRIO=y

CONFIG_BANK_0=0xFFC2

CONFIG_BANK_1=0xFFC2

CONFIG_BANK_2=0xFFC2

CONFIG_BANK_3=0xFFC2

CONFIG_BINFMT_FLAT=y

CONFIG_BINFMT_ZFLAT=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_IRDA=m

CONFIG_IRLAN=m

CONFIG_IRCOMM=m

CONFIG_IRTTY_SIR=m

CONFIG_BFIN_SIR=m

CONFIG_BFIN_SIR0=y

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_RAM=y

CONFIG_MTD_ROM=y

CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_GPIO_ADDR=y

CONFIG_BLK_DEV_RAM=y

CONFIG_SCSI=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=m

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_BFIN_MAC=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_AD7879=m

CONFIG_INPUT_MISC=y

CONFIG_INPUT_AD714X=y

CONFIG_INPUT_ADXL34X=y

# CONFIG_SERIO is not set

CONFIG_BFIN_PPI=m

CONFIG_BFIN_SIMPLE_TIMER=m

CONFIG_BFIN_SPORT=m

# CONFIG_CONSOLE_TRANSLATIONS is not set

# CONFIG_DEVKMEM is not set

CONFIG_BFIN_JTAG_COMM=m

CONFIG_SERIAL_BFIN=y

CONFIG_SERIAL_BFIN_CONSOLE=y

CONFIG_SERIAL_BFIN_UART1=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C_CHARDEV=y

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_SMBUS=y

CONFIG_I2C_BLACKFIN_TWI=y

CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_BFIN_WDT=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

# CONFIG_MEDIA_TUNER_CUSTOMISE is not set

CONFIG_VIDEO_HELPER_CHIPS_AUTO=y

CONFIG_VIDEO_BLACKFIN_CAM=m

CONFIG_OV9655=y

CONFIG_FB=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

CONFIG_FONT_6x11=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

# CONFIG_LOGO_BLACKFIN_VGA16 is not set

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_MIXER_OSS=y

CONFIG_SND_PCM_OSS=y

CONFIG_SND_SOC=y

CONFIG_SND_BF5XX_I2S=y

CONFIG_SND_BF5XX_SOC_SSM2602=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=m

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_BFIN=y

CONFIG_EXT2_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_ISO9660_FS=m

CONFIG_JOLIET=y

CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=m

CONFIG_NFS_V3=y

# CONFIG_RPCSEC_GSS_KRB5 is not set

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_CODEPAGE_936=m

CONFIG_NLS_ISO8859_1=m

CONFIG_NLS_UTF8=m

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_MMRS=y

CONFIG_DEBUG_HWERR=y

CONFIG_EXACT_HWERR=y

CONFIG_DEBUG_DOUBLEFAULT=y

CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y

CONFIG_EARLY_PRINTK=y

CONFIG_CPLB_INFO=y

CONFIG_SECURITY=y

CONFIG_CRYPTO=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC7=m

arch/blackfin/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y += bfin_sport.h

header-y += cachectl.h

header-y += fixed_code.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE