Skip to content

L
linux-davinci
Commit b5faa4b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (56 commits)
  Blackfin arch: fix bug when enable uart1 with uart0 disabled => no initial console
  Blackfin arch: split apart dump_bfin_regs and merge/remove show_regs from process.c, which was largely duplicated
  Blackfin arch: use common __INIT/__FINIT defines rather than setting the .section ourselves to .init.text
  Blackfin arch: fix bug when sending signals with the wrong PC, cause gdb get confused
  Blackfin arch: Ensure we printk out strings with the proper loglevel
  Blackfin arch: Need to specify ax with the .init.text section,
  Blackfin arch: Update Kconfig to latest Blackfin silicon datasheets
  Blackfin arch: update defconfig files
  Blackfin arch: Fix typo, and add ENDPROC - no functional changes
  Blackfin arch: convert READY to DMA_READY as it causes build errors in common sound code otherwise
  Blackfin arch: add defines for the on-chip L1 ROM of BF54x
  Blackfin arch: cplb and map header file cleanup
  Blackfin arch: cleanup the cplb declares
  Blackfin arch: fix broken on BF52x, remove silly checks on processors for L1_SCRATCH defines
  Blackfin arch: add support for working around anomaly 05000312
  Blackfin arch: cleanup BF54x header file and add BF547 definition
  Blackfin arch: fix building for BF542 processors which only have 1 TWI
  Blackfin arch: rename _return_from_exception to _bfin_return_from_exception and export it
  Blackfin arch: move EXPORT_SYMBOL() to C files where the symbol is actually defined
  Blackfin arch: fix bug NOR Flash MTD mount fail
  ...
parents a039767f 233b28a9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2325 additions and 1410 deletions
arch/blackfin/Kconfig
View file @ b5faa4b8
This diff is collapsed.
arch/blackfin/Kconfig.debug 0 → 100644
View file @ b5faa4b8
menu "Kernel hacking"
source "lib/Kconfig.debug"
config DEBUG_MMRS
bool "Generate Blackfin MMR tree"
select DEBUG_FS
help
Create a tree of Blackfin MMRs via the debugfs tree. If
you enable this, you will find all MMRs laid out in the
/sys/kernel/debug/blackfin/ directory where you can read/write
MMRs directly from userspace. This is obviously just a debug
feature.
config DEBUG_HWERR
bool "Hardware error interrupt debugging"
depends on DEBUG_KERNEL
help
When enabled, the hardware error interrupt is never disabled, and
will happen immediately when an error condition occurs. This comes
at a slight cost in code size, but is necessary if you are getting
hardware error interrupts and need to know where they are coming
from.
config DEBUG_ICACHE_CHECK
bool "Check Instruction cache coherency"
depends on DEBUG_KERNEL
depends on DEBUG_HWERR
help
Say Y here if you are getting weird unexplained errors. This will
ensure that icache is what SDRAM says it should be by doing a
byte wise comparison between SDRAM and instruction cache. This
also relocates the irq_panic() function to L1 memory, (which is
un-cached).
config DEBUG_HUNT_FOR_ZERO
bool "Catch NULL pointer reads/writes"
default y
help
Say Y here to catch reads/writes to anywhere in the memory range
from 0x0000 - 0x0FFF (the first 4k) of memory. This is useful in
catching common programming errors such as NULL pointer dereferences.
Misbehaving applications will be killed (generate a SEGV) while the
kernel will trigger a panic.
Enabling this option will take up an extra entry in CPLB table.
Otherwise, there is no extra overhead.
config DEBUG_BFIN_HWTRACE_ON
bool "Turn on Blackfin's Hardware Trace"
default y
help
All Blackfins include a Trace Unit which stores a history of the last
16 changes in program flow taken by the program sequencer. The history
allows the user to recreate the program sequencer’s recent path. This
can be handy when an application dies - we print out the execution
path of how it got to the offending instruction.
By turning this off, you may save a tiny amount of power.
choice
prompt "Omit loop Tracing"
default DEBUG_BFIN_HWTRACE_COMPRESSION_OFF
depends on DEBUG_BFIN_HWTRACE_ON
help
The trace buffer can be configured to omit recording of changes in
program flow that match either the last entry or one of the last
two entries. Omitting one of these entries from the record prevents
the trace buffer from overflowing because of any sort of loop (for, do
while, etc) in the program.
Because zero-overhead Hardware loops are not recorded in the trace buffer,
this feature can be used to prevent trace overflow from loops that
are nested four deep.
config DEBUG_BFIN_HWTRACE_COMPRESSION_OFF
bool "Trace all Loops"
help
The trace buffer records all changes of flow
config DEBUG_BFIN_HWTRACE_COMPRESSION_ONE
bool "Compress single-level loops"
help
The trace buffer does not record single loops - helpful if trace
is spinning on a while or do loop.
config DEBUG_BFIN_HWTRACE_COMPRESSION_TWO
bool "Compress two-level loops"
help
The trace buffer does not record loops two levels deep. Helpful if
the trace is spinning in a nested loop
endchoice
config DEBUG_BFIN_HWTRACE_COMPRESSION
int
depends on DEBUG_BFIN_HWTRACE_ON
default 0 if DEBUG_BFIN_HWTRACE_COMPRESSION_OFF
default 1 if DEBUG_BFIN_HWTRACE_COMPRESSION_ONE
default 2 if DEBUG_BFIN_HWTRACE_COMPRESSION_TWO
config DEBUG_BFIN_HWTRACE_EXPAND
bool "Expand Trace Buffer greater than 16 entries"
depends on DEBUG_BFIN_HWTRACE_ON
default n
help
By selecting this option, every time the 16 hardware entries in
the Blackfin's HW Trace buffer are full, the kernel will move them
into a software buffer, for dumping when there is an issue. This
has a great impact on performance, (an interrupt every 16 change of
flows) and should normally be turned off, except in those nasty
debugging sessions
config DEBUG_BFIN_HWTRACE_EXPAND_LEN
int "Size of Trace buffer (in power of 2k)"
range 0 4
depends on DEBUG_BFIN_HWTRACE_EXPAND
default 1
help
This sets the size of the software buffer that the trace information
is kept in.
0 for (2^0) 1k, or 256 entries,
1 for (2^1) 2k, or 512 entries,
2 for (2^2) 4k, or 1024 entries,
3 for (2^3) 8k, or 2048 entries,
4 for (2^4) 16k, or 4096 entries
config DEBUG_BFIN_NO_KERN_HWTRACE
bool "Trace user apps (turn off hwtrace in kernel)"
depends on DEBUG_BFIN_HWTRACE_ON
default n
help
Some pieces of the kernel contain a lot of flow changes which can
quickly fill up the hardware trace buffer. When debugging crashes,
the hardware trace may indicate that the problem lies in kernel
space when in reality an application is buggy.
Say Y here to disable hardware tracing in some known "jumpy" pieces
of code so that the trace buffer will extend further back.
config EARLY_PRINTK
bool "Early printk"
default n
help
This option enables special console drivers which allow the kernel
to print messages very early in the bootup process.
This is useful for kernel debugging when your machine crashes very
early before the console code is initialized. After enabling this
feature, you must add "earlyprintk=serial,uart0,57600" to the
command line (bootargs). It is safe to say Y here in all cases, as
all of this lives in the init section and is thrown away after the
kernel boots completely.
config DUAL_CORE_TEST_MODULE
tristate "Dual Core Test Module"
depends on (BF561)
default n
help
Say Y here to build-in dual core test module for dual core test.
config CPLB_INFO
bool "Display the CPLB information"
help
Display the CPLB information.
config ACCESS_CHECK
bool "Check the user pointer address"
default y
help
Usually the pointer transfer from user space is checked to see if its
address is in the kernel space.
Say N here to disable that check to improve the performance.
endmenu
arch/blackfin/Makefile
View file @ b5faa4b8
...@@ -31,6 +31,7 @@ machine-$(CONFIG_BF536) := bf537 ...@@ -31,6 +31,7 @@ machine-$(CONFIG_BF536) := bf537
machine-$(CONFIG_BF537) := bf537 machine-$(CONFIG_BF537) := bf537
machine-$(CONFIG_BF542) := bf548 machine-$(CONFIG_BF542) := bf548
machine-$(CONFIG_BF544) := bf548 machine-$(CONFIG_BF544) := bf548
machine-$(CONFIG_BF547) := bf548
machine-$(CONFIG_BF548) := bf548 machine-$(CONFIG_BF548) := bf548
machine-$(CONFIG_BF549) := bf548 machine-$(CONFIG_BF549) := bf548
machine-$(CONFIG_BF561) := bf561 machine-$(CONFIG_BF561) := bf561
...@@ -48,6 +49,7 @@ cpu-$(CONFIG_BF536) := bf536 ...@@ -48,6 +49,7 @@ cpu-$(CONFIG_BF536) := bf536
cpu-$(CONFIG_BF537) := bf537 cpu-$(CONFIG_BF537) := bf537
cpu-$(CONFIG_BF542) := bf542 cpu-$(CONFIG_BF542) := bf542
cpu-$(CONFIG_BF544) := bf544 cpu-$(CONFIG_BF544) := bf544
cpu-$(CONFIG_BF547) := bf547
cpu-$(CONFIG_BF548) := bf548 cpu-$(CONFIG_BF548) := bf548
cpu-$(CONFIG_BF549) := bf549 cpu-$(CONFIG_BF549) := bf549
cpu-$(CONFIG_BF561) := bf561 cpu-$(CONFIG_BF561) := bf561
......
arch/blackfin/configs/BF527-EZKIT_defconfig
View file @ b5faa4b8
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.9 # Linux kernel version: 2.6.22.12
# #
# CONFIG_MMU is not set # CONFIG_MMU is not set
# CONFIG_FPU is not set # CONFIG_FPU is not set
...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y ...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_ZONE_DMA=y CONFIG_ZONE_DMA=y
CONFIG_BFIN=y
CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_HWEIGHT=y
...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y ...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_GPIO=y
CONFIG_FORCE_MAX_ZONEORDER=14 CONFIG_FORCE_MAX_ZONEORDER=14
CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_IRQCHIP_DEMUX_GPIO=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# #
...@@ -127,6 +125,7 @@ CONFIG_BF527=y ...@@ -127,6 +125,7 @@ CONFIG_BF527=y
# CONFIG_BF537 is not set # CONFIG_BF537 is not set
# CONFIG_BF542 is not set # CONFIG_BF542 is not set
# CONFIG_BF544 is not set # CONFIG_BF544 is not set
# CONFIG_BF547 is not set
# CONFIG_BF548 is not set # CONFIG_BF548 is not set
# CONFIG_BF549 is not set # CONFIG_BF549 is not set
# CONFIG_BF561 is not set # CONFIG_BF561 is not set
...@@ -140,19 +139,8 @@ CONFIG_BF_REV_0_0=y ...@@ -140,19 +139,8 @@ CONFIG_BF_REV_0_0=y
# CONFIG_BF_REV_NONE is not set # CONFIG_BF_REV_NONE is not set
CONFIG_BF52x=y CONFIG_BF52x=y
CONFIG_BFIN_SINGLE_CORE=y CONFIG_BFIN_SINGLE_CORE=y
CONFIG_BFIN527_EZKIT=y
# CONFIG_BFIN533_EZKIT is not set
# CONFIG_BFIN533_STAMP is not set
# CONFIG_BFIN537_STAMP is not set
# CONFIG_BFIN533_BLUETECHNIX_CM is not set
# CONFIG_BFIN537_BLUETECHNIX_CM is not set
# CONFIG_BFIN548_EZKIT is not set
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
# CONFIG_BFIN561_EZKIT is not set
# CONFIG_BFIN561_TEPLA is not set
# CONFIG_PNAV10 is not set
# CONFIG_GENERIC_BOARD is not set
CONFIG_MEM_MT48LC32M16A2TG_75=y CONFIG_MEM_MT48LC32M16A2TG_75=y
CONFIG_BFIN527_EZKIT=y
# #
# BF527 Specific Configuration # BF527 Specific Configuration
...@@ -244,7 +232,7 @@ CONFIG_CLKIN_HZ=25000000 ...@@ -244,7 +232,7 @@ CONFIG_CLKIN_HZ=25000000
# CONFIG_BFIN_KERNEL_CLOCK is not set # CONFIG_BFIN_KERNEL_CLOCK is not set
CONFIG_MAX_VCO_HZ=600000000 CONFIG_MAX_VCO_HZ=600000000
CONFIG_MIN_VCO_HZ=50000000 CONFIG_MIN_VCO_HZ=50000000
CONFIG_MAX_SCLK_HZ=133333333 CONFIG_MAX_SCLK_HZ=133000000
CONFIG_MIN_SCLK_HZ=27000000 CONFIG_MIN_SCLK_HZ=27000000
# #
...@@ -301,6 +289,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 ...@@ -301,6 +289,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set # CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1 CONFIG_ZONE_DMA_FLAG=1
CONFIG_LARGE_ALLOCS=y CONFIG_LARGE_ALLOCS=y
# CONFIG_BFIN_GPTIMERS is not set
CONFIG_BFIN_DMA_5XX=y CONFIG_BFIN_DMA_5XX=y
# CONFIG_DMA_UNCACHED_2M is not set # CONFIG_DMA_UNCACHED_2M is not set
CONFIG_DMA_UNCACHED_1M=y CONFIG_DMA_UNCACHED_1M=y
...@@ -322,7 +311,7 @@ CONFIG_L1_MAX_PIECE=16 ...@@ -322,7 +311,7 @@ CONFIG_L1_MAX_PIECE=16
# #
# #
# EBIU_AMBCTL Global Control # EBIU_AMGCTL Global Control
# #
CONFIG_C_AMCKEN=y CONFIG_C_AMCKEN=y
CONFIG_C_CDPRIO=y CONFIG_C_CDPRIO=y
...@@ -548,6 +537,7 @@ CONFIG_BFIN_NAND_CLE=2 ...@@ -548,6 +537,7 @@ CONFIG_BFIN_NAND_CLE=2
CONFIG_BFIN_NAND_ALE=1 CONFIG_BFIN_NAND_ALE=1
CONFIG_BFIN_NAND_READY=3 CONFIG_BFIN_NAND_READY=3
CONFIG_MTD_NAND_IDS=m CONFIG_MTD_NAND_IDS=m
# CONFIG_MTD_NAND_BF5XX is not set
# CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_NANDSIM is not set
# CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_NAND_PLATFORM is not set
...@@ -637,6 +627,7 @@ CONFIG_BFIN_MAC_RMII=y ...@@ -637,6 +627,7 @@ CONFIG_BFIN_MAC_RMII=y
# CONFIG_DM9000 is not set # CONFIG_DM9000 is not set
CONFIG_NETDEV_1000=y CONFIG_NETDEV_1000=y
CONFIG_NETDEV_10000=y CONFIG_NETDEV_10000=y
# CONFIG_AX88180 is not set
# #
# Wireless LAN # Wireless LAN
...@@ -708,7 +699,7 @@ CONFIG_INPUT_MISC=y ...@@ -708,7 +699,7 @@ CONFIG_INPUT_MISC=y
# CONFIG_SPI_ADC_BF533 is not set # CONFIG_SPI_ADC_BF533 is not set
# CONFIG_BF5xx_PFLAGS is not set # CONFIG_BF5xx_PFLAGS is not set
# CONFIG_BF5xx_PPIFCD is not set # CONFIG_BF5xx_PPIFCD is not set
# CONFIG_BF5xx_TIMERS is not set # CONFIG_BFIN_SIMPLE_TIMER is not set
# CONFIG_BF5xx_PPI is not set # CONFIG_BF5xx_PPI is not set
# CONFIG_BFIN_SPORT is not set # CONFIG_BFIN_SPORT is not set
# CONFIG_BFIN_TIMER_LATENCY is not set # CONFIG_BFIN_TIMER_LATENCY is not set
......
arch/blackfin/configs/BF533-EZKIT_defconfig
View file @ b5faa4b8
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.6 # Linux kernel version: 2.6.22.12
# #
# CONFIG_MMU is not set # CONFIG_MMU is not set
# CONFIG_FPU is not set # CONFIG_FPU is not set
...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y ...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_ZONE_DMA=y CONFIG_ZONE_DMA=y
CONFIG_BFIN=y
CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_HWEIGHT=y
...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y ...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_GPIO=y
CONFIG_FORCE_MAX_ZONEORDER=14 CONFIG_FORCE_MAX_ZONEORDER=14
CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_IRQCHIP_DEMUX_GPIO=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# #
...@@ -64,7 +62,6 @@ CONFIG_FUTEX=y ...@@ -64,7 +62,6 @@ CONFIG_FUTEX=y
CONFIG_ANON_INODES=y CONFIG_ANON_INODES=y
CONFIG_EPOLL=y CONFIG_EPOLL=y
CONFIG_SIGNALFD=y CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y CONFIG_EVENTFD=y
CONFIG_VM_EVENT_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y
CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
...@@ -117,6 +114,9 @@ CONFIG_PREEMPT_VOLUNTARY=y ...@@ -117,6 +114,9 @@ CONFIG_PREEMPT_VOLUNTARY=y
# #
# Processor and Board Settings # Processor and Board Settings
# #
# CONFIG_BF522 is not set
# CONFIG_BF525 is not set
# CONFIG_BF527 is not set
# CONFIG_BF531 is not set # CONFIG_BF531 is not set
# CONFIG_BF532 is not set # CONFIG_BF532 is not set
CONFIG_BF533=y CONFIG_BF533=y
...@@ -125,10 +125,12 @@ CONFIG_BF533=y ...@@ -125,10 +125,12 @@ CONFIG_BF533=y
# CONFIG_BF537 is not set # CONFIG_BF537 is not set
# CONFIG_BF542 is not set # CONFIG_BF542 is not set
# CONFIG_BF544 is not set # CONFIG_BF544 is not set
# CONFIG_BF547 is not set
# CONFIG_BF548 is not set # CONFIG_BF548 is not set
# CONFIG_BF549 is not set # CONFIG_BF549 is not set
# CONFIG_BF561 is not set # CONFIG_BF561 is not set
# CONFIG_BF_REV_0_0 is not set # CONFIG_BF_REV_0_0 is not set
# CONFIG_BF_REV_0_1 is not set
# CONFIG_BF_REV_0_2 is not set # CONFIG_BF_REV_0_2 is not set
CONFIG_BF_REV_0_3=y CONFIG_BF_REV_0_3=y
# CONFIG_BF_REV_0_4 is not set # CONFIG_BF_REV_0_4 is not set
...@@ -137,18 +139,12 @@ CONFIG_BF_REV_0_3=y ...@@ -137,18 +139,12 @@ CONFIG_BF_REV_0_3=y
# CONFIG_BF_REV_NONE is not set # CONFIG_BF_REV_NONE is not set
CONFIG_BF53x=y CONFIG_BF53x=y
CONFIG_BFIN_SINGLE_CORE=y CONFIG_BFIN_SINGLE_CORE=y
CONFIG_MEM_MT48LC16M16A2TG_75=y
CONFIG_BFIN533_EZKIT=y CONFIG_BFIN533_EZKIT=y
# CONFIG_BFIN533_STAMP is not set # CONFIG_BFIN533_STAMP is not set
# CONFIG_BFIN537_STAMP is not set
# CONFIG_BFIN533_BLUETECHNIX_CM is not set # CONFIG_BFIN533_BLUETECHNIX_CM is not set
# CONFIG_BFIN537_BLUETECHNIX_CM is not set # CONFIG_H8606_HVSISTEMAS is not set
# CONFIG_BFIN548_EZKIT is not set # CONFIG_GENERIC_BF533_BOARD is not set
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
# CONFIG_BFIN561_EZKIT is not set
# CONFIG_BFIN561_TEPLA is not set
# CONFIG_PNAV10 is not set
# CONFIG_GENERIC_BOARD is not set
CONFIG_MEM_MT48LC16M16A2TG_75=y
# #
# BF533/2/1 Specific Configuration # BF533/2/1 Specific Configuration
...@@ -198,7 +194,7 @@ CONFIG_CLKIN_HZ=27000000 ...@@ -198,7 +194,7 @@ CONFIG_CLKIN_HZ=27000000
# CONFIG_BFIN_KERNEL_CLOCK is not set # CONFIG_BFIN_KERNEL_CLOCK is not set
CONFIG_MAX_VCO_HZ=750000000 CONFIG_MAX_VCO_HZ=750000000
CONFIG_MIN_VCO_HZ=50000000 CONFIG_MIN_VCO_HZ=50000000
CONFIG_MAX_SCLK_HZ=133333333 CONFIG_MAX_SCLK_HZ=133000000
CONFIG_MIN_SCLK_HZ=27000000 CONFIG_MIN_SCLK_HZ=27000000
# #
...@@ -255,6 +251,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 ...@@ -255,6 +251,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set # CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1 CONFIG_ZONE_DMA_FLAG=1
CONFIG_LARGE_ALLOCS=y CONFIG_LARGE_ALLOCS=y
# CONFIG_BFIN_GPTIMERS is not set
CONFIG_BFIN_DMA_5XX=y CONFIG_BFIN_DMA_5XX=y
# CONFIG_DMA_UNCACHED_2M is not set # CONFIG_DMA_UNCACHED_2M is not set
CONFIG_DMA_UNCACHED_1M=y CONFIG_DMA_UNCACHED_1M=y
...@@ -276,7 +273,7 @@ CONFIG_L1_MAX_PIECE=16 ...@@ -276,7 +273,7 @@ CONFIG_L1_MAX_PIECE=16
# #
# #
# EBIU_AMBCTL Global Control # EBIU_AMGCTL Global Control
# #
CONFIG_C_AMCKEN=y CONFIG_C_AMCKEN=y
CONFIG_C_CDPRIO=y CONFIG_C_CDPRIO=y
...@@ -526,14 +523,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y ...@@ -526,14 +523,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_BF5xx=m CONFIG_MTD_BF5xx=m
CONFIG_BFIN_FLASH_SIZE=0x400000 CONFIG_BFIN_FLASH_SIZE=0x400000
CONFIG_EBIU_FLASH_BASE=0x20000000 CONFIG_EBIU_FLASH_BASE=0x20000000
#
# FLASH_EBIU_AMBCTL Control
#
CONFIG_BFIN_FLASH_BANK_0=0x7BB0
CONFIG_BFIN_FLASH_BANK_1=0x7BB0
CONFIG_BFIN_FLASH_BANK_2=0x7BB0
CONFIG_BFIN_FLASH_BANK_3=0x7BB0
# CONFIG_MTD_UCLINUX is not set # CONFIG_MTD_UCLINUX is not set
# CONFIG_MTD_PLATRAM is not set # CONFIG_MTD_PLATRAM is not set
...@@ -622,6 +611,7 @@ CONFIG_SMC91X=y ...@@ -622,6 +611,7 @@ CONFIG_SMC91X=y
# CONFIG_DM9000 is not set # CONFIG_DM9000 is not set
CONFIG_NETDEV_1000=y CONFIG_NETDEV_1000=y
CONFIG_NETDEV_10000=y CONFIG_NETDEV_10000=y
# CONFIG_AX88180 is not set
# #
# Wireless LAN # Wireless LAN
...@@ -683,9 +673,9 @@ CONFIG_INPUT_EVDEV=m ...@@ -683,9 +673,9 @@ CONFIG_INPUT_EVDEV=m
# #
# CONFIG_AD9960 is not set # CONFIG_AD9960 is not set
# CONFIG_SPI_ADC_BF533 is not set # CONFIG_SPI_ADC_BF533 is not set
# CONFIG_BFIN_PFLAGS is not set # CONFIG_BF5xx_PFLAGS is not set
# CONFIG_BF5xx_PPIFCD is not set # CONFIG_BF5xx_PPIFCD is not set
# CONFIG_BF5xx_TIMERS is not set # CONFIG_BFIN_SIMPLE_TIMER is not set
# CONFIG_BF5xx_PPI is not set # CONFIG_BF5xx_PPI is not set
CONFIG_BFIN_SPORT=y CONFIG_BFIN_SPORT=y
# CONFIG_BFIN_TIMER_LATENCY is not set # CONFIG_BFIN_TIMER_LATENCY is not set
...@@ -708,6 +698,7 @@ CONFIG_SERIAL_BFIN_DMA=y ...@@ -708,6 +698,7 @@ CONFIG_SERIAL_BFIN_DMA=y
# CONFIG_SERIAL_BFIN_PIO is not set # CONFIG_SERIAL_BFIN_PIO is not set
CONFIG_SERIAL_BFIN_UART0=y CONFIG_SERIAL_BFIN_UART0=y
# CONFIG_BFIN_UART0_CTSRTS is not set # CONFIG_BFIN_UART0_CTSRTS is not set
# CONFIG_SERIAL_BFIN_UART1 is not set
CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_BFIN_SPORT is not set # CONFIG_SERIAL_BFIN_SPORT is not set
......
arch/blackfin/configs/BF533-STAMP_defconfig
View file @ b5faa4b8
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.6 # Linux kernel version: 2.6.22.12
# #
# CONFIG_MMU is not set # CONFIG_MMU is not set
# CONFIG_FPU is not set # CONFIG_FPU is not set
...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y ...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_ZONE_DMA=y CONFIG_ZONE_DMA=y
CONFIG_BFIN=y
CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_HWEIGHT=y
...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y ...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_GPIO=y
CONFIG_FORCE_MAX_ZONEORDER=14 CONFIG_FORCE_MAX_ZONEORDER=14
CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_IRQCHIP_DEMUX_GPIO=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# #
...@@ -64,7 +62,6 @@ CONFIG_FUTEX=y ...@@ -64,7 +62,6 @@ CONFIG_FUTEX=y
CONFIG_ANON_INODES=y CONFIG_ANON_INODES=y
CONFIG_EPOLL=y CONFIG_EPOLL=y
CONFIG_SIGNALFD=y CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y CONFIG_EVENTFD=y
CONFIG_VM_EVENT_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y
CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
...@@ -117,6 +114,9 @@ CONFIG_PREEMPT_VOLUNTARY=y ...@@ -117,6 +114,9 @@ CONFIG_PREEMPT_VOLUNTARY=y
# #
# Processor and Board Settings # Processor and Board Settings
# #
# CONFIG_BF522 is not set
# CONFIG_BF525 is not set
# CONFIG_BF527 is not set
# CONFIG_BF531 is not set # CONFIG_BF531 is not set
# CONFIG_BF532 is not set # CONFIG_BF532 is not set
CONFIG_BF533=y CONFIG_BF533=y
...@@ -125,10 +125,12 @@ CONFIG_BF533=y ...@@ -125,10 +125,12 @@ CONFIG_BF533=y
# CONFIG_BF537 is not set # CONFIG_BF537 is not set
# CONFIG_BF542 is not set # CONFIG_BF542 is not set
# CONFIG_BF544 is not set # CONFIG_BF544 is not set
# CONFIG_BF547 is not set
# CONFIG_BF548 is not set # CONFIG_BF548 is not set
# CONFIG_BF549 is not set # CONFIG_BF549 is not set
# CONFIG_BF561 is not set # CONFIG_BF561 is not set
# CONFIG_BF_REV_0_0 is not set # CONFIG_BF_REV_0_0 is not set
# CONFIG_BF_REV_0_1 is not set
# CONFIG_BF_REV_0_2 is not set # CONFIG_BF_REV_0_2 is not set
CONFIG_BF_REV_0_3=y CONFIG_BF_REV_0_3=y
# CONFIG_BF_REV_0_4 is not set # CONFIG_BF_REV_0_4 is not set
...@@ -137,19 +139,13 @@ CONFIG_BF_REV_0_3=y ...@@ -137,19 +139,13 @@ CONFIG_BF_REV_0_3=y
# CONFIG_BF_REV_NONE is not set # CONFIG_BF_REV_NONE is not set
CONFIG_BF53x=y CONFIG_BF53x=y
CONFIG_BFIN_SINGLE_CORE=y CONFIG_BFIN_SINGLE_CORE=y
CONFIG_MEM_MT48LC64M4A2FB_7E=y
CONFIG_BFIN_SHARED_FLASH_ENET=y
# CONFIG_BFIN533_EZKIT is not set # CONFIG_BFIN533_EZKIT is not set
CONFIG_BFIN533_STAMP=y CONFIG_BFIN533_STAMP=y
# CONFIG_BFIN537_STAMP is not set
# CONFIG_BFIN533_BLUETECHNIX_CM is not set # CONFIG_BFIN533_BLUETECHNIX_CM is not set
# CONFIG_BFIN537_BLUETECHNIX_CM is not set # CONFIG_H8606_HVSISTEMAS is not set
# CONFIG_BFIN548_EZKIT is not set # CONFIG_GENERIC_BF533_BOARD is not set
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
# CONFIG_BFIN561_EZKIT is not set
# CONFIG_BFIN561_TEPLA is not set
# CONFIG_PNAV10 is not set
# CONFIG_GENERIC_BOARD is not set
CONFIG_MEM_MT48LC64M4A2FB_7E=y
CONFIG_BFIN_SHARED_FLASH_ENET=y
# #
# BF533/2/1 Specific Configuration # BF533/2/1 Specific Configuration
...@@ -199,7 +195,7 @@ CONFIG_CLKIN_HZ=11059200 ...@@ -199,7 +195,7 @@ CONFIG_CLKIN_HZ=11059200
# CONFIG_BFIN_KERNEL_CLOCK is not set # CONFIG_BFIN_KERNEL_CLOCK is not set
CONFIG_MAX_VCO_HZ=750000000 CONFIG_MAX_VCO_HZ=750000000
CONFIG_MIN_VCO_HZ=50000000 CONFIG_MIN_VCO_HZ=50000000
CONFIG_MAX_SCLK_HZ=133333333 CONFIG_MAX_SCLK_HZ=133000000
CONFIG_MIN_SCLK_HZ=27000000 CONFIG_MIN_SCLK_HZ=27000000
# #
...@@ -267,6 +263,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 ...@@ -267,6 +263,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set # CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1 CONFIG_ZONE_DMA_FLAG=1
CONFIG_LARGE_ALLOCS=y CONFIG_LARGE_ALLOCS=y
# CONFIG_BFIN_GPTIMERS is not set
CONFIG_BFIN_DMA_5XX=y CONFIG_BFIN_DMA_5XX=y
# CONFIG_DMA_UNCACHED_2M is not set # CONFIG_DMA_UNCACHED_2M is not set
CONFIG_DMA_UNCACHED_1M=y CONFIG_DMA_UNCACHED_1M=y
...@@ -288,7 +285,7 @@ CONFIG_L1_MAX_PIECE=16 ...@@ -288,7 +285,7 @@ CONFIG_L1_MAX_PIECE=16
# #
# #
# EBIU_AMBCTL Global Control # EBIU_AMGCTL Global Control
# #
CONFIG_C_AMCKEN=y CONFIG_C_AMCKEN=y
CONFIG_C_CDPRIO=y CONFIG_C_CDPRIO=y
...@@ -634,6 +631,7 @@ CONFIG_SMC91X=y ...@@ -634,6 +631,7 @@ CONFIG_SMC91X=y
# CONFIG_DM9000 is not set # CONFIG_DM9000 is not set
CONFIG_NETDEV_1000=y CONFIG_NETDEV_1000=y
CONFIG_NETDEV_10000=y CONFIG_NETDEV_10000=y
# CONFIG_AX88180 is not set
# #
# Wireless LAN # Wireless LAN
...@@ -704,9 +702,9 @@ CONFIG_BFIN_TWIKEYPAD_IRQ_PFX=39 ...@@ -704,9 +702,9 @@ CONFIG_BFIN_TWIKEYPAD_IRQ_PFX=39
# #
# CONFIG_AD9960 is not set # CONFIG_AD9960 is not set
# CONFIG_SPI_ADC_BF533 is not set # CONFIG_SPI_ADC_BF533 is not set
# CONFIG_BFIN_PFLAGS is not set # CONFIG_BF5xx_PFLAGS is not set
# CONFIG_BF5xx_PPIFCD is not set # CONFIG_BF5xx_PPIFCD is not set
# CONFIG_BF5xx_TIMERS is not set # CONFIG_BFIN_SIMPLE_TIMER is not set
# CONFIG_BF5xx_PPI is not set # CONFIG_BF5xx_PPI is not set
CONFIG_BFIN_SPORT=y CONFIG_BFIN_SPORT=y
# CONFIG_BFIN_TIMER_LATENCY is not set # CONFIG_BFIN_TIMER_LATENCY is not set
...@@ -732,6 +730,7 @@ CONFIG_SERIAL_BFIN_DMA=y ...@@ -732,6 +730,7 @@ CONFIG_SERIAL_BFIN_DMA=y
# CONFIG_SERIAL_BFIN_PIO is not set # CONFIG_SERIAL_BFIN_PIO is not set
CONFIG_SERIAL_BFIN_UART0=y CONFIG_SERIAL_BFIN_UART0=y
# CONFIG_BFIN_UART0_CTSRTS is not set # CONFIG_BFIN_UART0_CTSRTS is not set
# CONFIG_SERIAL_BFIN_UART1 is not set
CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_BFIN_SPORT is not set # CONFIG_SERIAL_BFIN_SPORT is not set
...@@ -925,6 +924,7 @@ CONFIG_NTSC=y ...@@ -925,6 +924,7 @@ CONFIG_NTSC=y
# CONFIG_PAL_YCBCR is not set # CONFIG_PAL_YCBCR is not set
CONFIG_ADV7393_1XMEM=y CONFIG_ADV7393_1XMEM=y
# CONFIG_ADV7393_2XMEM is not set # CONFIG_ADV7393_2XMEM is not set
# CONFIG_FB_BFIN_T350MCQB is not set
# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VIRTUAL is not set
# CONFIG_LOGO is not set # CONFIG_LOGO is not set
...@@ -978,11 +978,6 @@ CONFIG_SND_BFIN_AD73311_SE=4 ...@@ -978,11 +978,6 @@ CONFIG_SND_BFIN_AD73311_SE=4
# #
# CONFIG_SND_SOC is not set # CONFIG_SND_SOC is not set
#
# SoC Audio for the ADI Blackfin
#
# CONFIG_SND_BF5XX_HAVE_COLD_RESET is not set
# #
# Open Sound System # Open Sound System
# #
......
arch/blackfin/configs/BF537-STAMP_defconfig
View file @ b5faa4b8
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.6 # Linux kernel version: 2.6.22.12
# #
# CONFIG_MMU is not set # CONFIG_MMU is not set
# CONFIG_FPU is not set # CONFIG_FPU is not set
...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y ...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_ZONE_DMA=y CONFIG_ZONE_DMA=y
CONFIG_BFIN=y
CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_HWEIGHT=y
...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y ...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_GPIO=y
CONFIG_FORCE_MAX_ZONEORDER=14 CONFIG_FORCE_MAX_ZONEORDER=14
CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_IRQCHIP_DEMUX_GPIO=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# #
...@@ -64,7 +62,6 @@ CONFIG_FUTEX=y ...@@ -64,7 +62,6 @@ CONFIG_FUTEX=y
CONFIG_ANON_INODES=y CONFIG_ANON_INODES=y
CONFIG_EPOLL=y CONFIG_EPOLL=y
CONFIG_SIGNALFD=y CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y CONFIG_EVENTFD=y
CONFIG_VM_EVENT_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y
CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
...@@ -117,6 +114,9 @@ CONFIG_PREEMPT_VOLUNTARY=y ...@@ -117,6 +114,9 @@ CONFIG_PREEMPT_VOLUNTARY=y
# #
# Processor and Board Settings # Processor and Board Settings
# #
# CONFIG_BF522 is not set
# CONFIG_BF525 is not set
# CONFIG_BF527 is not set
# CONFIG_BF531 is not set # CONFIG_BF531 is not set
# CONFIG_BF532 is not set # CONFIG_BF532 is not set
# CONFIG_BF533 is not set # CONFIG_BF533 is not set
...@@ -125,10 +125,12 @@ CONFIG_PREEMPT_VOLUNTARY=y ...@@ -125,10 +125,12 @@ CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_BF537=y CONFIG_BF537=y
# CONFIG_BF542 is not set # CONFIG_BF542 is not set
# CONFIG_BF544 is not set # CONFIG_BF544 is not set
# CONFIG_BF547 is not set
# CONFIG_BF548 is not set # CONFIG_BF548 is not set
# CONFIG_BF549 is not set # CONFIG_BF549 is not set
# CONFIG_BF561 is not set # CONFIG_BF561 is not set
# CONFIG_BF_REV_0_0 is not set # CONFIG_BF_REV_0_0 is not set
# CONFIG_BF_REV_0_1 is not set
CONFIG_BF_REV_0_2=y CONFIG_BF_REV_0_2=y
# CONFIG_BF_REV_0_3 is not set # CONFIG_BF_REV_0_3 is not set
# CONFIG_BF_REV_0_4 is not set # CONFIG_BF_REV_0_4 is not set
...@@ -137,33 +139,8 @@ CONFIG_BF_REV_0_2=y ...@@ -137,33 +139,8 @@ CONFIG_BF_REV_0_2=y
# CONFIG_BF_REV_NONE is not set # CONFIG_BF_REV_NONE is not set
CONFIG_BF53x=y CONFIG_BF53x=y
CONFIG_BFIN_SINGLE_CORE=y CONFIG_BFIN_SINGLE_CORE=y
# CONFIG_BFIN533_EZKIT is not set
# CONFIG_BFIN533_STAMP is not set
CONFIG_BFIN537_STAMP=y
# CONFIG_BFIN533_BLUETECHNIX_CM is not set
# CONFIG_BFIN537_BLUETECHNIX_CM is not set
# CONFIG_BFIN548_EZKIT is not set
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
# CONFIG_BFIN561_EZKIT is not set
# CONFIG_BFIN561_TEPLA is not set
# CONFIG_PNAV10 is not set
# CONFIG_GENERIC_BOARD is not set
CONFIG_MEM_MT48LC32M8A2_75=y CONFIG_MEM_MT48LC32M8A2_75=y
CONFIG_IRQ_PLL_WAKEUP=7 CONFIG_IRQ_PLL_WAKEUP=7
#
# BF537 Specific Configuration
#
#
# Interrupt Priority Assignment
#
#
# Priority
#
CONFIG_IRQ_DMA_ERROR=7
CONFIG_IRQ_ERROR=7
CONFIG_IRQ_RTC=8 CONFIG_IRQ_RTC=8
CONFIG_IRQ_PPI=8 CONFIG_IRQ_PPI=8
CONFIG_IRQ_SPORT0_RX=9 CONFIG_IRQ_SPORT0_RX=9
...@@ -176,8 +153,6 @@ CONFIG_IRQ_UART0_RX=10 ...@@ -176,8 +153,6 @@ CONFIG_IRQ_UART0_RX=10
CONFIG_IRQ_UART0_TX=10 CONFIG_IRQ_UART0_TX=10
CONFIG_IRQ_UART1_RX=10 CONFIG_IRQ_UART1_RX=10
CONFIG_IRQ_UART1_TX=10 CONFIG_IRQ_UART1_TX=10
CONFIG_IRQ_CAN_RX=11
CONFIG_IRQ_CAN_TX=11
CONFIG_IRQ_MAC_RX=11 CONFIG_IRQ_MAC_RX=11
CONFIG_IRQ_MAC_TX=11 CONFIG_IRQ_MAC_TX=11
CONFIG_IRQ_TMR0=12 CONFIG_IRQ_TMR0=12
...@@ -188,11 +163,31 @@ CONFIG_IRQ_TMR4=12 ...@@ -188,11 +163,31 @@ CONFIG_IRQ_TMR4=12
CONFIG_IRQ_TMR5=12 CONFIG_IRQ_TMR5=12
CONFIG_IRQ_TMR6=12 CONFIG_IRQ_TMR6=12
CONFIG_IRQ_TMR7=12 CONFIG_IRQ_TMR7=12
CONFIG_IRQ_PROG_INTA=12
CONFIG_IRQ_PORTG_INTB=12 CONFIG_IRQ_PORTG_INTB=12
CONFIG_IRQ_MEM_DMA0=13 CONFIG_IRQ_MEM_DMA0=13
CONFIG_IRQ_MEM_DMA1=13 CONFIG_IRQ_MEM_DMA1=13
CONFIG_IRQ_WATCH=13 CONFIG_IRQ_WATCH=13
CONFIG_BFIN537_STAMP=y
# CONFIG_BFIN537_BLUETECHNIX_CM is not set
# CONFIG_PNAV10 is not set
# CONFIG_GENERIC_BF537_BOARD is not set
#
# BF537 Specific Configuration
#
#
# Interrupt Priority Assignment
#
#
# Priority
#
CONFIG_IRQ_DMA_ERROR=7
CONFIG_IRQ_ERROR=7
CONFIG_IRQ_CAN_RX=11
CONFIG_IRQ_CAN_TX=11
CONFIG_IRQ_PROG_INTA=12
# #
# Board customizations # Board customizations
...@@ -206,7 +201,7 @@ CONFIG_CLKIN_HZ=25000000 ...@@ -206,7 +201,7 @@ CONFIG_CLKIN_HZ=25000000
# CONFIG_BFIN_KERNEL_CLOCK is not set # CONFIG_BFIN_KERNEL_CLOCK is not set
CONFIG_MAX_VCO_HZ=600000000 CONFIG_MAX_VCO_HZ=600000000
CONFIG_MIN_VCO_HZ=50000000 CONFIG_MIN_VCO_HZ=50000000
CONFIG_MAX_SCLK_HZ=133333333 CONFIG_MAX_SCLK_HZ=133000000
CONFIG_MIN_SCLK_HZ=27000000 CONFIG_MIN_SCLK_HZ=27000000
# #
...@@ -263,6 +258,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 ...@@ -263,6 +258,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set # CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1 CONFIG_ZONE_DMA_FLAG=1
CONFIG_LARGE_ALLOCS=y CONFIG_LARGE_ALLOCS=y
# CONFIG_BFIN_GPTIMERS is not set
CONFIG_BFIN_DMA_5XX=y CONFIG_BFIN_DMA_5XX=y
# CONFIG_DMA_UNCACHED_2M is not set # CONFIG_DMA_UNCACHED_2M is not set
CONFIG_DMA_UNCACHED_1M=y CONFIG_DMA_UNCACHED_1M=y
...@@ -284,7 +280,7 @@ CONFIG_L1_MAX_PIECE=16 ...@@ -284,7 +280,7 @@ CONFIG_L1_MAX_PIECE=16
# #
# #
# EBIU_AMBCTL Global Control # EBIU_AMGCTL Global Control
# #
CONFIG_C_AMCKEN=y CONFIG_C_AMCKEN=y
CONFIG_C_CDPRIO=y CONFIG_C_CDPRIO=y
...@@ -534,14 +530,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y ...@@ -534,14 +530,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_BF5xx=m CONFIG_MTD_BF5xx=m
CONFIG_BFIN_FLASH_SIZE=0x400000 CONFIG_BFIN_FLASH_SIZE=0x400000
CONFIG_EBIU_FLASH_BASE=0x20000000 CONFIG_EBIU_FLASH_BASE=0x20000000
#
# FLASH_EBIU_AMBCTL Control
#
CONFIG_BFIN_FLASH_BANK_0=0x7BB0
CONFIG_BFIN_FLASH_BANK_1=0x7BB0
CONFIG_BFIN_FLASH_BANK_2=0x7BB0
CONFIG_BFIN_FLASH_BANK_3=0x7BB0
# CONFIG_MTD_UCLINUX is not set # CONFIG_MTD_UCLINUX is not set
# CONFIG_MTD_PLATRAM is not set # CONFIG_MTD_PLATRAM is not set
...@@ -660,6 +648,7 @@ CONFIG_BFIN_RX_DESC_NUM=20 ...@@ -660,6 +648,7 @@ CONFIG_BFIN_RX_DESC_NUM=20
# CONFIG_DM9000 is not set # CONFIG_DM9000 is not set
CONFIG_NETDEV_1000=y CONFIG_NETDEV_1000=y
CONFIG_NETDEV_10000=y CONFIG_NETDEV_10000=y
# CONFIG_AX88180 is not set
# #
# Wireless LAN # Wireless LAN
...@@ -730,9 +719,9 @@ CONFIG_BFIN_TWIKEYPAD_IRQ_PFX=72 ...@@ -730,9 +719,9 @@ CONFIG_BFIN_TWIKEYPAD_IRQ_PFX=72
# #
# CONFIG_AD9960 is not set # CONFIG_AD9960 is not set
# CONFIG_SPI_ADC_BF533 is not set # CONFIG_SPI_ADC_BF533 is not set
# CONFIG_BFIN_PFLAGS is not set # CONFIG_BF5xx_PFLAGS is not set
# CONFIG_BF5xx_PPIFCD is not set # CONFIG_BF5xx_PPIFCD is not set
# CONFIG_BF5xx_TIMERS is not set # CONFIG_BFIN_SIMPLE_TIMER is not set
# CONFIG_BF5xx_PPI is not set # CONFIG_BF5xx_PPI is not set
CONFIG_BFIN_SPORT=y CONFIG_BFIN_SPORT=y
# CONFIG_BFIN_TIMER_LATENCY is not set # CONFIG_BFIN_TIMER_LATENCY is not set
...@@ -967,6 +956,7 @@ CONFIG_FB_BF537_LQ035=m ...@@ -967,6 +956,7 @@ CONFIG_FB_BF537_LQ035=m
CONFIG_LQ035_SLAVE_ADDR=0x58 CONFIG_LQ035_SLAVE_ADDR=0x58
# CONFIG_FB_BFIN_LANDSCAPE is not set # CONFIG_FB_BFIN_LANDSCAPE is not set
# CONFIG_FB_BFIN_BGR is not set # CONFIG_FB_BFIN_BGR is not set
# CONFIG_FB_BFIN_T350MCQB is not set
# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VIRTUAL is not set
# CONFIG_LOGO is not set # CONFIG_LOGO is not set
...@@ -1020,11 +1010,6 @@ CONFIG_SND_BFIN_AD73311_SE=4 ...@@ -1020,11 +1010,6 @@ CONFIG_SND_BFIN_AD73311_SE=4
# #
# CONFIG_SND_SOC is not set # CONFIG_SND_SOC is not set
#
# SoC Audio for the ADI Blackfin
#
# CONFIG_SND_BF5XX_HAVE_COLD_RESET is not set
# #
# Open Sound System # Open Sound System
# #
......
arch/blackfin/configs/BF548-EZKIT_defconfig
View file @ b5faa4b8
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.10 # Linux kernel version: 2.6.22.12
# Sat Oct 27 02:34:07 2007
# #
# CONFIG_MMU is not set # CONFIG_MMU is not set
# CONFIG_FPU is not set # CONFIG_FPU is not set
...@@ -9,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y ...@@ -9,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_ZONE_DMA=y CONFIG_ZONE_DMA=y
CONFIG_BFIN=y
CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_HWEIGHT=y
...@@ -19,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y ...@@ -19,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_GPIO=y
CONFIG_FORCE_MAX_ZONEORDER=14 CONFIG_FORCE_MAX_ZONEORDER=14
CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_IRQCHIP_DEMUX_GPIO=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# #
...@@ -128,6 +125,7 @@ CONFIG_PREEMPT_VOLUNTARY=y ...@@ -128,6 +125,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_BF537 is not set # CONFIG_BF537 is not set
# CONFIG_BF542 is not set # CONFIG_BF542 is not set
# CONFIG_BF544 is not set # CONFIG_BF544 is not set
# CONFIG_BF547 is not set
# CONFIG_BF548 is not set # CONFIG_BF548 is not set
CONFIG_BF549=y CONFIG_BF549=y
# CONFIG_BF561 is not set # CONFIG_BF561 is not set
...@@ -141,19 +139,6 @@ CONFIG_BF_REV_0_0=y ...@@ -141,19 +139,6 @@ CONFIG_BF_REV_0_0=y
# CONFIG_BF_REV_NONE is not set # CONFIG_BF_REV_NONE is not set
CONFIG_BF54x=y CONFIG_BF54x=y
CONFIG_BFIN_SINGLE_CORE=y CONFIG_BFIN_SINGLE_CORE=y
# CONFIG_BFIN527_EZKIT is not set
# CONFIG_BFIN533_EZKIT is not set
# CONFIG_BFIN533_STAMP is not set
# CONFIG_BFIN537_STAMP is not set
# CONFIG_BFIN533_BLUETECHNIX_CM is not set
# CONFIG_BFIN537_BLUETECHNIX_CM is not set
CONFIG_BFIN548_EZKIT=y
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
# CONFIG_BFIN561_EZKIT is not set
# CONFIG_BFIN561_TEPLA is not set
# CONFIG_PNAV10 is not set
# CONFIG_H8606_HVSISTEMAS is not set
# CONFIG_GENERIC_BOARD is not set
CONFIG_IRQ_PLL_WAKEUP=7 CONFIG_IRQ_PLL_WAKEUP=7
CONFIG_IRQ_RTC=8 CONFIG_IRQ_RTC=8
CONFIG_IRQ_SPORT0_RX=9 CONFIG_IRQ_SPORT0_RX=9
...@@ -180,6 +165,7 @@ CONFIG_IRQ_TIMER7=11 ...@@ -180,6 +165,7 @@ CONFIG_IRQ_TIMER7=11
CONFIG_IRQ_TIMER8=11 CONFIG_IRQ_TIMER8=11
CONFIG_IRQ_TIMER9=11 CONFIG_IRQ_TIMER9=11
CONFIG_IRQ_TIMER10=11 CONFIG_IRQ_TIMER10=11
CONFIG_BFIN548_EZKIT=y
# #
# BF548 Specific Configuration # BF548 Specific Configuration
...@@ -279,9 +265,9 @@ CONFIG_PINT3_ASSIGN=0x02020303 ...@@ -279,9 +265,9 @@ CONFIG_PINT3_ASSIGN=0x02020303
# #
CONFIG_CLKIN_HZ=25000000 CONFIG_CLKIN_HZ=25000000
# CONFIG_BFIN_KERNEL_CLOCK is not set # CONFIG_BFIN_KERNEL_CLOCK is not set
CONFIG_MAX_VCO_HZ=533333333 CONFIG_MAX_VCO_HZ=533000000
CONFIG_MIN_VCO_HZ=50000000 CONFIG_MIN_VCO_HZ=50000000
CONFIG_MAX_SCLK_HZ=133333333 CONFIG_MAX_SCLK_HZ=133000000
CONFIG_MIN_SCLK_HZ=27000000 CONFIG_MIN_SCLK_HZ=27000000
# #
...@@ -376,6 +362,9 @@ CONFIG_BANK_0=0x7BB0 ...@@ -376,6 +362,9 @@ CONFIG_BANK_0=0x7BB0
CONFIG_BANK_1=0x5554 CONFIG_BANK_1=0x5554
CONFIG_BANK_2=0x7BB0 CONFIG_BANK_2=0x7BB0
CONFIG_BANK_3=0x99B3 CONFIG_BANK_3=0x99B3
CONFIG_EBUI_MBSCTLVAL=0x0
CONFIG_EBUI_MODEVAL=0x1
CONFIG_EBUI_FCTLVAL=0x6
# #
# Bus options (PCI, PCMCIA, EISA, MCA, ISA) # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
...@@ -702,6 +691,7 @@ CONFIG_SMSC911X=y ...@@ -702,6 +691,7 @@ CONFIG_SMSC911X=y
# CONFIG_DM9000 is not set # CONFIG_DM9000 is not set
CONFIG_NETDEV_1000=y CONFIG_NETDEV_1000=y
CONFIG_NETDEV_10000=y CONFIG_NETDEV_10000=y
# CONFIG_AX88180 is not set
# #
# Wireless LAN # Wireless LAN
...@@ -1058,6 +1048,8 @@ CONFIG_SND_SOC=y ...@@ -1058,6 +1048,8 @@ CONFIG_SND_SOC=y
CONFIG_SND_BF5XX_SOC=y CONFIG_SND_BF5XX_SOC=y
CONFIG_SND_BF5XX_SOC_AC97=y CONFIG_SND_BF5XX_SOC_AC97=y
CONFIG_SND_BF5XX_SOC_BF548_EZKIT=y CONFIG_SND_BF5XX_SOC_BF548_EZKIT=y
# CONFIG_SND_BF5XX_SOC_WM8750 is not set
# CONFIG_SND_BF5XX_SOC_WM8731 is not set
CONFIG_SND_BF5XX_SPORT_NUM=0 CONFIG_SND_BF5XX_SPORT_NUM=0
# CONFIG_SND_BF5XX_HAVE_COLD_RESET is not set # CONFIG_SND_BF5XX_HAVE_COLD_RESET is not set
CONFIG_SND_SOC_AD1980=y CONFIG_SND_SOC_AD1980=y
......
arch/blackfin/configs/BF561-EZKIT_defconfig
View file @ b5faa4b8
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.6 # Linux kernel version: 2.6.22.12
# #
# CONFIG_MMU is not set # CONFIG_MMU is not set
# CONFIG_FPU is not set # CONFIG_FPU is not set
...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y ...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_ZONE_DMA=y CONFIG_ZONE_DMA=y
CONFIG_BFIN=y
CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_HWEIGHT=y
...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y ...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_GPIO=y
CONFIG_FORCE_MAX_ZONEORDER=14 CONFIG_FORCE_MAX_ZONEORDER=14
CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_IRQCHIP_DEMUX_GPIO=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# #
...@@ -64,7 +62,6 @@ CONFIG_FUTEX=y ...@@ -64,7 +62,6 @@ CONFIG_FUTEX=y
CONFIG_ANON_INODES=y CONFIG_ANON_INODES=y
CONFIG_EPOLL=y CONFIG_EPOLL=y
CONFIG_SIGNALFD=y CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y CONFIG_EVENTFD=y
CONFIG_VM_EVENT_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y
CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
...@@ -117,6 +114,9 @@ CONFIG_PREEMPT_VOLUNTARY=y ...@@ -117,6 +114,9 @@ CONFIG_PREEMPT_VOLUNTARY=y
# #
# Processor and Board Settings # Processor and Board Settings
# #
# CONFIG_BF522 is not set
# CONFIG_BF525 is not set
# CONFIG_BF527 is not set
# CONFIG_BF531 is not set # CONFIG_BF531 is not set
# CONFIG_BF532 is not set # CONFIG_BF532 is not set
# CONFIG_BF533 is not set # CONFIG_BF533 is not set
...@@ -125,10 +125,12 @@ CONFIG_PREEMPT_VOLUNTARY=y ...@@ -125,10 +125,12 @@ CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_BF537 is not set # CONFIG_BF537 is not set
# CONFIG_BF542 is not set # CONFIG_BF542 is not set
# CONFIG_BF544 is not set # CONFIG_BF544 is not set
# CONFIG_BF547 is not set
# CONFIG_BF548 is not set # CONFIG_BF548 is not set
# CONFIG_BF549 is not set # CONFIG_BF549 is not set
CONFIG_BF561=y CONFIG_BF561=y
# CONFIG_BF_REV_0_0 is not set # CONFIG_BF_REV_0_0 is not set
# CONFIG_BF_REV_0_1 is not set
# CONFIG_BF_REV_0_2 is not set # CONFIG_BF_REV_0_2 is not set
CONFIG_BF_REV_0_3=y CONFIG_BF_REV_0_3=y
# CONFIG_BF_REV_0_4 is not set # CONFIG_BF_REV_0_4 is not set
...@@ -136,18 +138,15 @@ CONFIG_BF_REV_0_3=y ...@@ -136,18 +138,15 @@ CONFIG_BF_REV_0_3=y
# CONFIG_BF_REV_ANY is not set # CONFIG_BF_REV_ANY is not set
# CONFIG_BF_REV_NONE is not set # CONFIG_BF_REV_NONE is not set
CONFIG_BFIN_DUAL_CORE=y CONFIG_BFIN_DUAL_CORE=y
# CONFIG_BFIN533_EZKIT is not set CONFIG_MEM_MT48LC16M16A2TG_75=y
# CONFIG_BFIN533_STAMP is not set CONFIG_IRQ_PLL_WAKEUP=7
# CONFIG_BFIN537_STAMP is not set CONFIG_IRQ_SPORT0_ERROR=7
# CONFIG_BFIN533_BLUETECHNIX_CM is not set CONFIG_IRQ_SPORT1_ERROR=7
# CONFIG_BFIN537_BLUETECHNIX_CM is not set CONFIG_IRQ_SPI_ERROR=7
# CONFIG_BFIN548_EZKIT is not set
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
CONFIG_BFIN561_EZKIT=y CONFIG_BFIN561_EZKIT=y
# CONFIG_BFIN561_TEPLA is not set # CONFIG_BFIN561_TEPLA is not set
# CONFIG_PNAV10 is not set # CONFIG_BFIN561_BLUETECHNIX_CM is not set
# CONFIG_GENERIC_BOARD is not set # CONFIG_GENERIC_BF561_BOARD is not set
CONFIG_MEM_MT48LC16M16A2TG_75=y
# #
# BF561 Specific Configuration # BF561 Specific Configuration
...@@ -170,15 +169,11 @@ CONFIG_BF561_COREB_RESET=y ...@@ -170,15 +169,11 @@ CONFIG_BF561_COREB_RESET=y
# #
# Priority # Priority
# #
CONFIG_IRQ_PLL_WAKEUP=7
CONFIG_IRQ_DMA1_ERROR=7 CONFIG_IRQ_DMA1_ERROR=7
CONFIG_IRQ_DMA2_ERROR=7 CONFIG_IRQ_DMA2_ERROR=7
CONFIG_IRQ_IMDMA_ERROR=7 CONFIG_IRQ_IMDMA_ERROR=7
CONFIG_IRQ_PPI0_ERROR=7 CONFIG_IRQ_PPI0_ERROR=7
CONFIG_IRQ_PPI1_ERROR=7 CONFIG_IRQ_PPI1_ERROR=7
CONFIG_IRQ_SPORT0_ERROR=7
CONFIG_IRQ_SPORT1_ERROR=7
CONFIG_IRQ_SPI_ERROR=7
CONFIG_IRQ_UART_ERROR=7 CONFIG_IRQ_UART_ERROR=7
CONFIG_IRQ_RESERVED_ERROR=7 CONFIG_IRQ_RESERVED_ERROR=7
CONFIG_IRQ_DMA1_0=8 CONFIG_IRQ_DMA1_0=8
...@@ -243,7 +238,7 @@ CONFIG_CLKIN_HZ=30000000 ...@@ -243,7 +238,7 @@ CONFIG_CLKIN_HZ=30000000
# CONFIG_BFIN_KERNEL_CLOCK is not set # CONFIG_BFIN_KERNEL_CLOCK is not set
CONFIG_MAX_VCO_HZ=600000000 CONFIG_MAX_VCO_HZ=600000000
CONFIG_MIN_VCO_HZ=50000000 CONFIG_MIN_VCO_HZ=50000000
CONFIG_MAX_SCLK_HZ=133333333 CONFIG_MAX_SCLK_HZ=133000000
CONFIG_MIN_SCLK_HZ=27000000 CONFIG_MIN_SCLK_HZ=27000000
# #
...@@ -300,6 +295,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 ...@@ -300,6 +295,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set # CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1 CONFIG_ZONE_DMA_FLAG=1
CONFIG_LARGE_ALLOCS=y CONFIG_LARGE_ALLOCS=y
# CONFIG_BFIN_GPTIMERS is not set
CONFIG_BFIN_DMA_5XX=y CONFIG_BFIN_DMA_5XX=y
# CONFIG_DMA_UNCACHED_2M is not set # CONFIG_DMA_UNCACHED_2M is not set
CONFIG_DMA_UNCACHED_1M=y CONFIG_DMA_UNCACHED_1M=y
...@@ -321,7 +317,7 @@ CONFIG_L1_MAX_PIECE=16 ...@@ -321,7 +317,7 @@ CONFIG_L1_MAX_PIECE=16
# #
# #
# EBIU_AMBCTL Global Control # EBIU_AMGCTL Global Control
# #
CONFIG_C_AMCKEN=y CONFIG_C_AMCKEN=y
CONFIG_C_CDPRIO=y CONFIG_C_CDPRIO=y
...@@ -564,14 +560,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y ...@@ -564,14 +560,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_BF5xx=m CONFIG_MTD_BF5xx=m
CONFIG_BFIN_FLASH_SIZE=0x0400000 CONFIG_BFIN_FLASH_SIZE=0x0400000
CONFIG_EBIU_FLASH_BASE=0x20000000 CONFIG_EBIU_FLASH_BASE=0x20000000
#
# FLASH_EBIU_AMBCTL Control
#
CONFIG_BFIN_FLASH_BANK_0=0x7BB0
CONFIG_BFIN_FLASH_BANK_1=0x7BB0
CONFIG_BFIN_FLASH_BANK_2=0x7BB0
CONFIG_BFIN_FLASH_BANK_3=0x7BB0
# CONFIG_MTD_UCLINUX is not set # CONFIG_MTD_UCLINUX is not set
# CONFIG_MTD_PLATRAM is not set # CONFIG_MTD_PLATRAM is not set
...@@ -660,6 +648,7 @@ CONFIG_SMC91X=y ...@@ -660,6 +648,7 @@ CONFIG_SMC91X=y
# CONFIG_DM9000 is not set # CONFIG_DM9000 is not set
CONFIG_NETDEV_1000=y CONFIG_NETDEV_1000=y
CONFIG_NETDEV_10000=y CONFIG_NETDEV_10000=y
# CONFIG_AX88180 is not set
# #
# Wireless LAN # Wireless LAN
...@@ -721,9 +710,9 @@ CONFIG_INPUT_EVDEV=m ...@@ -721,9 +710,9 @@ CONFIG_INPUT_EVDEV=m
# #
# CONFIG_AD9960 is not set # CONFIG_AD9960 is not set
# CONFIG_SPI_ADC_BF533 is not set # CONFIG_SPI_ADC_BF533 is not set
# CONFIG_BFIN_PFLAGS is not set # CONFIG_BF5xx_PFLAGS is not set
# CONFIG_BF5xx_PPIFCD is not set # CONFIG_BF5xx_PPIFCD is not set
# CONFIG_BF5xx_TIMERS is not set # CONFIG_BFIN_SIMPLE_TIMER is not set
# CONFIG_BF5xx_PPI is not set # CONFIG_BF5xx_PPI is not set
# CONFIG_BFIN_SPORT is not set # CONFIG_BFIN_SPORT is not set
# CONFIG_BFIN_TIMER_LATENCY is not set # CONFIG_BFIN_TIMER_LATENCY is not set
......
arch/blackfin/configs/H8606_defconfig 0 → 100644
View file @ b5faa4b8
This diff is collapsed.
arch/blackfin/configs/PNAV-10_defconfig
View file @ b5faa4b8
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.6 # Linux kernel version: 2.6.22.12
# #
# CONFIG_MMU is not set # CONFIG_MMU is not set
# CONFIG_FPU is not set # CONFIG_FPU is not set
...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y ...@@ -8,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_BLACKFIN=y CONFIG_BLACKFIN=y
CONFIG_ZONE_DMA=y CONFIG_ZONE_DMA=y
CONFIG_BFIN=y
CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_HWEIGHT=y
...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y ...@@ -18,7 +17,6 @@ CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_GPIO=y
CONFIG_FORCE_MAX_ZONEORDER=14 CONFIG_FORCE_MAX_ZONEORDER=14
CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_IRQCHIP_DEMUX_GPIO=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# #
...@@ -62,7 +60,6 @@ CONFIG_FUTEX=y ...@@ -62,7 +60,6 @@ CONFIG_FUTEX=y
CONFIG_ANON_INODES=y CONFIG_ANON_INODES=y
CONFIG_EPOLL=y CONFIG_EPOLL=y
CONFIG_SIGNALFD=y CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y CONFIG_EVENTFD=y
CONFIG_VM_EVENT_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y
CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=9 CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=9
...@@ -115,6 +112,9 @@ CONFIG_PREEMPT_VOLUNTARY=y ...@@ -115,6 +112,9 @@ CONFIG_PREEMPT_VOLUNTARY=y
# #
# Processor and Board Settings # Processor and Board Settings
# #
# CONFIG_BF522 is not set
# CONFIG_BF525 is not set
# CONFIG_BF527 is not set
# CONFIG_BF531 is not set # CONFIG_BF531 is not set
# CONFIG_BF532 is not set # CONFIG_BF532 is not set
# CONFIG_BF533 is not set # CONFIG_BF533 is not set
...@@ -123,10 +123,12 @@ CONFIG_PREEMPT_VOLUNTARY=y ...@@ -123,10 +123,12 @@ CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_BF537=y CONFIG_BF537=y
# CONFIG_BF542 is not set # CONFIG_BF542 is not set
# CONFIG_BF544 is not set # CONFIG_BF544 is not set
# CONFIG_BF547 is not set
# CONFIG_BF548 is not set # CONFIG_BF548 is not set
# CONFIG_BF549 is not set # CONFIG_BF549 is not set
# CONFIG_BF561 is not set # CONFIG_BF561 is not set
# CONFIG_BF_REV_0_0 is not set # CONFIG_BF_REV_0_0 is not set
# CONFIG_BF_REV_0_1 is not set
CONFIG_BF_REV_0_2=y CONFIG_BF_REV_0_2=y
# CONFIG_BF_REV_0_3 is not set # CONFIG_BF_REV_0_3 is not set
# CONFIG_BF_REV_0_4 is not set # CONFIG_BF_REV_0_4 is not set
...@@ -135,33 +137,8 @@ CONFIG_BF_REV_0_2=y ...@@ -135,33 +137,8 @@ CONFIG_BF_REV_0_2=y
# CONFIG_BF_REV_NONE is not set # CONFIG_BF_REV_NONE is not set
CONFIG_BF53x=y CONFIG_BF53x=y
CONFIG_BFIN_SINGLE_CORE=y CONFIG_BFIN_SINGLE_CORE=y
# CONFIG_BFIN533_EZKIT is not set
# CONFIG_BFIN533_STAMP is not set
# CONFIG_BFIN537_STAMP is not set
# CONFIG_BFIN533_BLUETECHNIX_CM is not set
# CONFIG_BFIN537_BLUETECHNIX_CM is not set
# CONFIG_BFIN548_EZKIT is not set
# CONFIG_BFIN561_BLUETECHNIX_CM is not set
# CONFIG_BFIN561_EZKIT is not set
# CONFIG_BFIN561_TEPLA is not set
CONFIG_PNAV10=y
# CONFIG_GENERIC_BOARD is not set
CONFIG_MEM_MT48LC32M8A2_75=y CONFIG_MEM_MT48LC32M8A2_75=y
CONFIG_IRQ_PLL_WAKEUP=7 CONFIG_IRQ_PLL_WAKEUP=7
#
# BF537 Specific Configuration
#
#
# Interrupt Priority Assignment
#
#
# Priority
#
CONFIG_IRQ_DMA_ERROR=7
CONFIG_IRQ_ERROR=7
CONFIG_IRQ_RTC=8 CONFIG_IRQ_RTC=8
CONFIG_IRQ_PPI=8 CONFIG_IRQ_PPI=8
CONFIG_IRQ_SPORT0_RX=9 CONFIG_IRQ_SPORT0_RX=9
...@@ -174,8 +151,6 @@ CONFIG_IRQ_UART0_RX=10 ...@@ -174,8 +151,6 @@ CONFIG_IRQ_UART0_RX=10
CONFIG_IRQ_UART0_TX=10 CONFIG_IRQ_UART0_TX=10
CONFIG_IRQ_UART1_RX=10 CONFIG_IRQ_UART1_RX=10
CONFIG_IRQ_UART1_TX=10 CONFIG_IRQ_UART1_TX=10
CONFIG_IRQ_CAN_RX=11
CONFIG_IRQ_CAN_TX=11
CONFIG_IRQ_MAC_RX=11 CONFIG_IRQ_MAC_RX=11
CONFIG_IRQ_MAC_TX=11 CONFIG_IRQ_MAC_TX=11
CONFIG_IRQ_TMR0=12 CONFIG_IRQ_TMR0=12
...@@ -186,11 +161,31 @@ CONFIG_IRQ_TMR4=12 ...@@ -186,11 +161,31 @@ CONFIG_IRQ_TMR4=12
CONFIG_IRQ_TMR5=12 CONFIG_IRQ_TMR5=12
CONFIG_IRQ_TMR6=12 CONFIG_IRQ_TMR6=12
CONFIG_IRQ_TMR7=12 CONFIG_IRQ_TMR7=12
CONFIG_IRQ_PROG_INTA=12
CONFIG_IRQ_PORTG_INTB=12 CONFIG_IRQ_PORTG_INTB=12
CONFIG_IRQ_MEM_DMA0=13 CONFIG_IRQ_MEM_DMA0=13
CONFIG_IRQ_MEM_DMA1=13 CONFIG_IRQ_MEM_DMA1=13
CONFIG_IRQ_WATCH=13 CONFIG_IRQ_WATCH=13
# CONFIG_BFIN537_STAMP is not set
# CONFIG_BFIN537_BLUETECHNIX_CM is not set
CONFIG_PNAV10=y
# CONFIG_GENERIC_BF537_BOARD is not set
#
# BF537 Specific Configuration
#
#
# Interrupt Priority Assignment
#
#
# Priority
#
CONFIG_IRQ_DMA_ERROR=7
CONFIG_IRQ_ERROR=7
CONFIG_IRQ_CAN_RX=11
CONFIG_IRQ_CAN_TX=11
CONFIG_IRQ_PROG_INTA=12
# #
# Board customizations # Board customizations
...@@ -204,7 +199,7 @@ CONFIG_CLKIN_HZ=24576000 ...@@ -204,7 +199,7 @@ CONFIG_CLKIN_HZ=24576000
# CONFIG_BFIN_KERNEL_CLOCK is not set # CONFIG_BFIN_KERNEL_CLOCK is not set
CONFIG_MAX_VCO_HZ=600000000 CONFIG_MAX_VCO_HZ=600000000
CONFIG_MIN_VCO_HZ=50000000 CONFIG_MIN_VCO_HZ=50000000
CONFIG_MAX_SCLK_HZ=133333333 CONFIG_MAX_SCLK_HZ=133000000
CONFIG_MIN_SCLK_HZ=27000000 CONFIG_MIN_SCLK_HZ=27000000
# #
...@@ -261,6 +256,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 ...@@ -261,6 +256,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set # CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1 CONFIG_ZONE_DMA_FLAG=1
CONFIG_LARGE_ALLOCS=y CONFIG_LARGE_ALLOCS=y
# CONFIG_BFIN_GPTIMERS is not set
CONFIG_BFIN_DMA_5XX=y CONFIG_BFIN_DMA_5XX=y
# CONFIG_DMA_UNCACHED_2M is not set # CONFIG_DMA_UNCACHED_2M is not set
CONFIG_DMA_UNCACHED_1M=y CONFIG_DMA_UNCACHED_1M=y
...@@ -282,7 +278,7 @@ CONFIG_L1_MAX_PIECE=16 ...@@ -282,7 +278,7 @@ CONFIG_L1_MAX_PIECE=16
# #
# #
# EBIU_AMBCTL Global Control # EBIU_AMGCTL Global Control
# #
CONFIG_C_AMCKEN=y CONFIG_C_AMCKEN=y
CONFIG_C_CDPRIO=y CONFIG_C_CDPRIO=y
...@@ -593,6 +589,7 @@ CONFIG_BFIN_MAC_RMII=y ...@@ -593,6 +589,7 @@ CONFIG_BFIN_MAC_RMII=y
# CONFIG_DM9000 is not set # CONFIG_DM9000 is not set
CONFIG_NETDEV_1000=y CONFIG_NETDEV_1000=y
CONFIG_NETDEV_10000=y CONFIG_NETDEV_10000=y
# CONFIG_AX88180 is not set
# #
# Wireless LAN # Wireless LAN
...@@ -675,9 +672,9 @@ CONFIG_INPUT_UINPUT=y ...@@ -675,9 +672,9 @@ CONFIG_INPUT_UINPUT=y
# #
# CONFIG_AD9960 is not set # CONFIG_AD9960 is not set
# CONFIG_SPI_ADC_BF533 is not set # CONFIG_SPI_ADC_BF533 is not set
# CONFIG_BFIN_PFLAGS is not set # CONFIG_BF5xx_PFLAGS is not set
# CONFIG_BF5xx_PPIFCD is not set # CONFIG_BF5xx_PPIFCD is not set
# CONFIG_BF5xx_TIMERS is not set # CONFIG_BFIN_SIMPLE_TIMER is not set
# CONFIG_BF5xx_PPI is not set # CONFIG_BF5xx_PPI is not set
CONFIG_BFIN_SPORT=y CONFIG_BFIN_SPORT=y
# CONFIG_BFIN_TIMER_LATENCY is not set # CONFIG_BFIN_TIMER_LATENCY is not set
...@@ -897,6 +894,7 @@ CONFIG_FB_BF537_LQ035=y ...@@ -897,6 +894,7 @@ CONFIG_FB_BF537_LQ035=y
CONFIG_LQ035_SLAVE_ADDR=0x58 CONFIG_LQ035_SLAVE_ADDR=0x58
CONFIG_FB_BFIN_LANDSCAPE=y CONFIG_FB_BFIN_LANDSCAPE=y
# CONFIG_FB_BFIN_BGR is not set # CONFIG_FB_BFIN_BGR is not set
# CONFIG_FB_BFIN_T350MCQB is not set
# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VIRTUAL is not set
# CONFIG_LOGO is not set # CONFIG_LOGO is not set
...@@ -938,11 +936,6 @@ CONFIG_SND=m ...@@ -938,11 +936,6 @@ CONFIG_SND=m
# #
# CONFIG_SND_SOC is not set # CONFIG_SND_SOC is not set
#
# SoC Audio for the ADI Blackfin
#
# CONFIG_SND_BF5XX_HAVE_COLD_RESET is not set
# #
# Open Sound System # Open Sound System
# #
......
arch/blackfin/kernel/bfin_dma_5xx.c
View file @ b5faa4b8
...@@ -436,6 +436,7 @@ unsigned long get_dma_curr_desc_ptr(unsigned int channel) ...@@ -436,6 +436,7 @@ unsigned long get_dma_curr_desc_ptr(unsigned int channel)
return dma_ch[channel].regs->curr_desc_ptr; return dma_ch[channel].regs->curr_desc_ptr;
} }
EXPORT_SYMBOL(get_dma_curr_desc_ptr);
unsigned long get_dma_curr_addr(unsigned int channel) unsigned long get_dma_curr_addr(unsigned int channel)
{ {
......
arch/blackfin/kernel/bfin_ksyms.c
View file @ b5faa4b8
...@@ -37,9 +37,6 @@ ...@@ -37,9 +37,6 @@
/* platform dependent support */ /* platform dependent support */
EXPORT_SYMBOL(__ioremap); EXPORT_SYMBOL(__ioremap);
EXPORT_SYMBOL(strcmp);
EXPORT_SYMBOL(strncmp);
EXPORT_SYMBOL(dump_thread);
EXPORT_SYMBOL(ip_fast_csum); EXPORT_SYMBOL(ip_fast_csum);
...@@ -51,6 +48,7 @@ EXPORT_SYMBOL(__down_trylock); ...@@ -51,6 +48,7 @@ EXPORT_SYMBOL(__down_trylock);
EXPORT_SYMBOL(__down_interruptible); EXPORT_SYMBOL(__down_interruptible);
EXPORT_SYMBOL(is_in_rom); EXPORT_SYMBOL(is_in_rom);
EXPORT_SYMBOL(bfin_return_from_exception);
/* Networking helper routines. */ /* Networking helper routines. */
EXPORT_SYMBOL(csum_partial_copy); EXPORT_SYMBOL(csum_partial_copy);
...@@ -60,13 +58,11 @@ EXPORT_SYMBOL(csum_partial_copy); ...@@ -60,13 +58,11 @@ EXPORT_SYMBOL(csum_partial_copy);
* their interface isn't gonna change any time soon now, so * their interface isn't gonna change any time soon now, so
* it's OK to leave it out of version control. * it's OK to leave it out of version control.
*/ */
EXPORT_SYMBOL(strcpy);
EXPORT_SYMBOL(memcpy); EXPORT_SYMBOL(memcpy);
EXPORT_SYMBOL(memset); EXPORT_SYMBOL(memset);
EXPORT_SYMBOL(memcmp); EXPORT_SYMBOL(memcmp);
EXPORT_SYMBOL(memmove); EXPORT_SYMBOL(memmove);
EXPORT_SYMBOL(memchr); EXPORT_SYMBOL(memchr);
EXPORT_SYMBOL(get_wchan);
/* /*
* libgcc functions - functions that are used internally by the * libgcc functions - functions that are used internally by the
...@@ -102,6 +98,7 @@ EXPORT_SYMBOL(outsw); ...@@ -102,6 +98,7 @@ EXPORT_SYMBOL(outsw);
EXPORT_SYMBOL(insw); EXPORT_SYMBOL(insw);
EXPORT_SYMBOL(outsl); EXPORT_SYMBOL(outsl);
EXPORT_SYMBOL(insl); EXPORT_SYMBOL(insl);
EXPORT_SYMBOL(insl_16);
EXPORT_SYMBOL(irq_flags); EXPORT_SYMBOL(irq_flags);
EXPORT_SYMBOL(iounmap); EXPORT_SYMBOL(iounmap);
EXPORT_SYMBOL(blackfin_dcache_invalidate_range); EXPORT_SYMBOL(blackfin_dcache_invalidate_range);
......
arch/blackfin/kernel/cplbinit.c
View file @ b5faa4b8
...@@ -26,29 +26,22 @@ ...@@ -26,29 +26,22 @@
#include <asm/cplb.h> #include <asm/cplb.h>
#include <asm/cplbinit.h> #include <asm/cplbinit.h>
u_long icplb_table[MAX_CPLBS+1]; u_long icplb_table[MAX_CPLBS + 1];
u_long dcplb_table[MAX_CPLBS+1]; u_long dcplb_table[MAX_CPLBS + 1];
#ifdef CONFIG_CPLB_SWITCH_TAB_L1 #ifdef CONFIG_CPLB_SWITCH_TAB_L1
u_long ipdt_table[MAX_SWITCH_I_CPLBS+1]__attribute__((l1_data)); # define PDT_ATTR __attribute__((l1_data))
u_long dpdt_table[MAX_SWITCH_D_CPLBS+1]__attribute__((l1_data));
#ifdef CONFIG_CPLB_INFO
u_long ipdt_swapcount_table[MAX_SWITCH_I_CPLBS]__attribute__((l1_data));
u_long dpdt_swapcount_table[MAX_SWITCH_D_CPLBS]__attribute__((l1_data));
#endif /* CONFIG_CPLB_INFO */
#else #else
# define PDT_ATTR
#endif
u_long ipdt_table[MAX_SWITCH_I_CPLBS+1]; u_long ipdt_table[MAX_SWITCH_I_CPLBS + 1] PDT_ATTR;
u_long dpdt_table[MAX_SWITCH_D_CPLBS+1]; u_long dpdt_table[MAX_SWITCH_D_CPLBS + 1] PDT_ATTR;
#ifdef CONFIG_CPLB_INFO #ifdef CONFIG_CPLB_INFO
u_long ipdt_swapcount_table[MAX_SWITCH_I_CPLBS]; u_long ipdt_swapcount_table[MAX_SWITCH_I_CPLBS] PDT_ATTR;
u_long dpdt_swapcount_table[MAX_SWITCH_D_CPLBS]; u_long dpdt_swapcount_table[MAX_SWITCH_D_CPLBS] PDT_ATTR;
#endif /* CONFIG_CPLB_INFO */ #endif
#endif /*CONFIG_CPLB_SWITCH_TAB_L1*/
struct s_cplb { struct s_cplb {
struct cplb_tab init_i; struct cplb_tab init_i;
...@@ -71,7 +64,7 @@ static struct cplb_desc cplb_data[] = { ...@@ -71,7 +64,7 @@ static struct cplb_desc cplb_data[] = {
#else #else
.valid = 0, .valid = 0,
#endif #endif
.name = "ZERO Pointer Saveguard", .name = "Zero Pointer Guard Page",
}, },
{ {
.start = L1_CODE_START, .start = L1_CODE_START,
...@@ -102,20 +95,20 @@ static struct cplb_desc cplb_data[] = { ...@@ -102,20 +95,20 @@ static struct cplb_desc cplb_data[] = {
.end = 0, /* dynamic */ .end = 0, /* dynamic */
.psize = 0, .psize = 0,
.attr = INITIAL_T | SWITCH_T | I_CPLB | D_CPLB, .attr = INITIAL_T | SWITCH_T | I_CPLB | D_CPLB,
.i_conf = SDRAM_IGENERIC, .i_conf = SDRAM_IGENERIC,
.d_conf = SDRAM_DGENERIC, .d_conf = SDRAM_DGENERIC,
.valid = 1, .valid = 1,
.name = "SDRAM Kernel", .name = "Kernel Memory",
}, },
{ {
.start = 0, /* dynamic */ .start = 0, /* dynamic */
.end = 0, /* dynamic */ .end = 0, /* dynamic */
.psize = 0, .psize = 0,
.attr = INITIAL_T | SWITCH_T | D_CPLB, .attr = INITIAL_T | SWITCH_T | D_CPLB,
.i_conf = SDRAM_IGENERIC, .i_conf = SDRAM_IGENERIC,
.d_conf = SDRAM_DNON_CHBL, .d_conf = SDRAM_DNON_CHBL,
.valid = 1, .valid = 1,
.name = "SDRAM RAM MTD", .name = "uClinux MTD Memory",
}, },
{ {
.start = 0, /* dynamic */ .start = 0, /* dynamic */
...@@ -124,7 +117,7 @@ static struct cplb_desc cplb_data[] = { ...@@ -124,7 +117,7 @@ static struct cplb_desc cplb_data[] = {
.attr = INITIAL_T | SWITCH_T | D_CPLB, .attr = INITIAL_T | SWITCH_T | D_CPLB,
.d_conf = SDRAM_DNON_CHBL, .d_conf = SDRAM_DNON_CHBL,
.valid = 1, .valid = 1,
.name = "SDRAM Uncached DMA ZONE", .name = "Uncached DMA Zone",
}, },
{ {
.start = 0, /* dynamic */ .start = 0, /* dynamic */
...@@ -134,7 +127,7 @@ static struct cplb_desc cplb_data[] = { ...@@ -134,7 +127,7 @@ static struct cplb_desc cplb_data[] = {
.i_conf = 0, /* dynamic */ .i_conf = 0, /* dynamic */
.d_conf = 0, /* dynamic */ .d_conf = 0, /* dynamic */
.valid = 1, .valid = 1,
.name = "SDRAM Reserved Memory", .name = "Reserved Memory",
}, },
{ {
.start = ASYNC_BANK0_BASE, .start = ASYNC_BANK0_BASE,
...@@ -143,14 +136,14 @@ static struct cplb_desc cplb_data[] = { ...@@ -143,14 +136,14 @@ static struct cplb_desc cplb_data[] = {
.attr = SWITCH_T | D_CPLB, .attr = SWITCH_T | D_CPLB,
.d_conf = SDRAM_EBIU, .d_conf = SDRAM_EBIU,
.valid = 1, .valid = 1,
.name = "ASYNC Memory", .name = "Asynchronous Memory Banks",
}, },
{ {
#if defined(CONFIG_BF561) #ifdef L2_START
.start = L2_SRAM, .start = L2_START,
.end = L2_SRAM_END, .end = L2_START + L2_LENGTH,
.psize = SIZE_1M, .psize = SIZE_1M,
.attr = SWITCH_T | D_CPLB, .attr = SWITCH_T | I_CPLB | D_CPLB,
.i_conf = L2_MEMORY, .i_conf = L2_MEMORY,
.d_conf = L2_MEMORY, .d_conf = L2_MEMORY,
.valid = 1, .valid = 1,
...@@ -158,13 +151,23 @@ static struct cplb_desc cplb_data[] = { ...@@ -158,13 +151,23 @@ static struct cplb_desc cplb_data[] = {
.valid = 0, .valid = 0,
#endif #endif
.name = "L2 Memory", .name = "L2 Memory",
} },
{
.start = BOOT_ROM_START,
.end = BOOT_ROM_START + BOOT_ROM_LENGTH,
.psize = SIZE_1M,
.attr = SWITCH_T | I_CPLB | D_CPLB,
.i_conf = SDRAM_IGENERIC,
.d_conf = SDRAM_DGENERIC,
.valid = 1,
.name = "On-Chip BootROM",
},
}; };
static u16 __init lock_kernel_check(u32 start, u32 end) static u16 __init lock_kernel_check(u32 start, u32 end)
{ {
if ((start <= (u32) _stext && end >= (u32) _end) if ((end <= (u32) _end && end >= (u32)_stext) ||
|| (start >= (u32) _stext && end <= (u32) _end)) (start <= (u32) _end && start >= (u32)_stext))
return IN_KERNEL; return IN_KERNEL;
return 0; return 0;
} }
...@@ -350,7 +353,7 @@ void __init generate_cpl_tables(void) ...@@ -350,7 +353,7 @@ void __init generate_cpl_tables(void)
else else
cplb_data[RES_MEM].i_conf = SDRAM_INON_CHBL; cplb_data[RES_MEM].i_conf = SDRAM_INON_CHBL;
for (i = ZERO_P; i <= L2_MEM; i++) { for (i = ZERO_P; i < ARRAY_SIZE(cplb_data); ++i) {
if (!cplb_data[i].valid) if (!cplb_data[i].valid)
continue; continue;
......
arch/blackfin/kernel/early_printk.c
View file @ b5faa4b8
...@@ -205,7 +205,8 @@ asmlinkage void __init early_trap_c(struct pt_regs *fp, void *retaddr) ...@@ -205,7 +205,8 @@ asmlinkage void __init early_trap_c(struct pt_regs *fp, void *retaddr)
if (likely(early_console == NULL)) if (likely(early_console == NULL))
setup_early_printk(DEFAULT_EARLY_PORT); setup_early_printk(DEFAULT_EARLY_PORT);
dump_bfin_regs(fp, retaddr); dump_bfin_mem((void *)fp->retx);
show_regs(fp);
dump_bfin_trace_buffer(); dump_bfin_trace_buffer();
panic("Died early"); panic("Died early");
......
arch/blackfin/kernel/process.c
View file @ b5faa4b8
...@@ -134,27 +134,6 @@ void cpu_idle(void) ...@@ -134,27 +134,6 @@ void cpu_idle(void)
} }
} }
void show_regs(struct pt_regs *regs)
{
printk(KERN_NOTICE "\n");
printk(KERN_NOTICE
"PC: %08lu Status: %04lu SysStatus: %04lu RETS: %08lu\n",
regs->pc, regs->astat, regs->seqstat, regs->rets);
printk(KERN_NOTICE
"A0.x: %08lx A0.w: %08lx A1.x: %08lx A1.w: %08lx\n",
regs->a0x, regs->a0w, regs->a1x, regs->a1w);
printk(KERN_NOTICE "P0: %08lx P1: %08lx P2: %08lx P3: %08lx\n",
regs->p0, regs->p1, regs->p2, regs->p3);
printk(KERN_NOTICE "P4: %08lx P5: %08lx\n", regs->p4, regs->p5);
printk(KERN_NOTICE "R0: %08lx R1: %08lx R2: %08lx R3: %08lx\n",
regs->r0, regs->r1, regs->r2, regs->r3);
printk(KERN_NOTICE "R4: %08lx R5: %08lx R6: %08lx R7: %08lx\n",
regs->r4, regs->r5, regs->r6, regs->r7);
if (!regs->ipend)
printk(KERN_NOTICE "USP: %08lx\n", rdusp());
}
/* Fill in the fpu structure for a core dump. */ /* Fill in the fpu structure for a core dump. */
int dump_fpu(struct pt_regs *regs, elf_fpregset_t * fpregs) int dump_fpu(struct pt_regs *regs, elf_fpregset_t * fpregs)
...@@ -238,51 +217,6 @@ copy_thread(int nr, unsigned long clone_flags, ...@@ -238,51 +217,6 @@ copy_thread(int nr, unsigned long clone_flags,
return 0; return 0;
} }
/*
* fill in the user structure for a core dump..
*/
void dump_thread(struct pt_regs *regs, struct user *dump)
{
dump->magic = CMAGIC;
dump->start_code = 0;
dump->start_stack = rdusp() & ~(PAGE_SIZE - 1);
dump->u_tsize = ((unsigned long)current->mm->end_code) >> PAGE_SHIFT;
dump->u_dsize = ((unsigned long)(current->mm->brk +
(PAGE_SIZE - 1))) >> PAGE_SHIFT;
dump->u_dsize -= dump->u_tsize;
dump->u_ssize = 0;
if (dump->start_stack < TASK_SIZE)
dump->u_ssize =
((unsigned long)(TASK_SIZE -
dump->start_stack)) >> PAGE_SHIFT;
dump->u_ar0 = (struct user_regs_struct *)((int)&dump->regs - (int)dump);
dump->regs.r0 = regs->r0;
dump->regs.r1 = regs->r1;
dump->regs.r2 = regs->r2;
dump->regs.r3 = regs->r3;
dump->regs.r4 = regs->r4;
dump->regs.r5 = regs->r5;
dump->regs.r6 = regs->r6;
dump->regs.r7 = regs->r7;
dump->regs.p0 = regs->p0;
dump->regs.p1 = regs->p1;
dump->regs.p2 = regs->p2;
dump->regs.p3 = regs->p3;
dump->regs.p4 = regs->p4;
dump->regs.p5 = regs->p5;
dump->regs.orig_p0 = regs->orig_p0;
dump->regs.a0w = regs->a0w;
dump->regs.a1w = regs->a1w;
dump->regs.a0x = regs->a0x;
dump->regs.a1x = regs->a1x;
dump->regs.rets = regs->rets;
dump->regs.astat = regs->astat;
dump->regs.pc = regs->pc;
}
/* /*
* sys_execve() executes a new program. * sys_execve() executes a new program.
*/ */
......
arch/blackfin/kernel/setup.c
View file @ b5faa4b8
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/blackfin.h> #include <asm/blackfin.h>
#include <asm/cplbinit.h> #include <asm/cplbinit.h>
#include <asm/div64.h>
#include <asm/fixed_code.h> #include <asm/fixed_code.h>
#include <asm/early_printk.h> #include <asm/early_printk.h>
...@@ -504,13 +505,17 @@ EXPORT_SYMBOL(get_sclk); ...@@ -504,13 +505,17 @@ EXPORT_SYMBOL(get_sclk);
unsigned long sclk_to_usecs(unsigned long sclk) unsigned long sclk_to_usecs(unsigned long sclk)
{ {
return (USEC_PER_SEC * (u64)sclk) / get_sclk(); u64 tmp = USEC_PER_SEC * (u64)sclk;
do_div(tmp, get_sclk());
return tmp;
} }
EXPORT_SYMBOL(sclk_to_usecs); EXPORT_SYMBOL(sclk_to_usecs);
unsigned long usecs_to_sclk(unsigned long usecs) unsigned long usecs_to_sclk(unsigned long usecs)
{ {
return (get_sclk() * (u64)usecs) / USEC_PER_SEC; u64 tmp = get_sclk() * (u64)usecs;
do_div(tmp, USEC_PER_SEC);
return tmp;
} }
EXPORT_SYMBOL(usecs_to_sclk); EXPORT_SYMBOL(usecs_to_sclk);
......
arch/blackfin/kernel/traps.c
View file @ b5faa4b8
...@@ -158,7 +158,7 @@ static void decode_address(char *buf, unsigned long address) ...@@ -158,7 +158,7 @@ static void decode_address(char *buf, unsigned long address)
} }
/* we were unable to find this address anywhere */ /* we were unable to find this address anywhere */
sprintf(buf, "[<0x%p>]", (void *)address); sprintf(buf, "<0x%p> /* unknown address */", (void *)address);
done: done:
write_unlock_irqrestore(&tasklist_lock, flags); write_unlock_irqrestore(&tasklist_lock, flags);
...@@ -169,7 +169,9 @@ asmlinkage void double_fault_c(struct pt_regs *fp) ...@@ -169,7 +169,9 @@ asmlinkage void double_fault_c(struct pt_regs *fp)
console_verbose(); console_verbose();
oops_in_progress = 1; oops_in_progress = 1;
printk(KERN_EMERG "\n" KERN_EMERG "Double Fault\n"); printk(KERN_EMERG "\n" KERN_EMERG "Double Fault\n");
dump_bfin_regs(fp, (void *)fp->retx); dump_bfin_process(fp);
dump_bfin_mem((void *)fp->retx);
show_regs(fp);
panic("Double Fault - unrecoverable event\n"); panic("Double Fault - unrecoverable event\n");
} }
...@@ -250,7 +252,7 @@ asmlinkage void trap_c(struct pt_regs *fp) ...@@ -250,7 +252,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
case VEC_EXCPT03: case VEC_EXCPT03:
info.si_code = SEGV_STACKFLOW; info.si_code = SEGV_STACKFLOW;
sig = SIGSEGV; sig = SIGSEGV;
printk(KERN_NOTICE EXC_0x03); printk(KERN_NOTICE EXC_0x03(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x04 - User Defined, Caught by default */ /* 0x04 - User Defined, Caught by default */
...@@ -279,7 +281,7 @@ asmlinkage void trap_c(struct pt_regs *fp) ...@@ -279,7 +281,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
case VEC_OVFLOW: case VEC_OVFLOW:
info.si_code = TRAP_TRACEFLOW; info.si_code = TRAP_TRACEFLOW;
sig = SIGTRAP; sig = SIGTRAP;
printk(KERN_NOTICE EXC_0x11); printk(KERN_NOTICE EXC_0x11(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x12 - Reserved, Caught by default */ /* 0x12 - Reserved, Caught by default */
...@@ -301,36 +303,35 @@ asmlinkage void trap_c(struct pt_regs *fp) ...@@ -301,36 +303,35 @@ asmlinkage void trap_c(struct pt_regs *fp)
case VEC_UNDEF_I: case VEC_UNDEF_I:
info.si_code = ILL_ILLOPC; info.si_code = ILL_ILLOPC;
sig = SIGILL; sig = SIGILL;
printk(KERN_NOTICE EXC_0x21); printk(KERN_NOTICE EXC_0x21(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x22 - Illegal Instruction Combination, handled here */ /* 0x22 - Illegal Instruction Combination, handled here */
case VEC_ILGAL_I: case VEC_ILGAL_I:
info.si_code = ILL_ILLPARAOP; info.si_code = ILL_ILLPARAOP;
sig = SIGILL; sig = SIGILL;
printk(KERN_NOTICE EXC_0x22); printk(KERN_NOTICE EXC_0x22(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x23 - Data CPLB Protection Violation, /* 0x23 - Data CPLB protection violation, handled here */
normal case is handled in _cplb_hdr */
case VEC_CPLB_VL: case VEC_CPLB_VL:
info.si_code = ILL_CPLB_VI; info.si_code = ILL_CPLB_VI;
sig = SIGILL; sig = SIGBUS;
printk(KERN_NOTICE EXC_0x23); printk(KERN_NOTICE EXC_0x23(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x24 - Data access misaligned, handled here */ /* 0x24 - Data access misaligned, handled here */
case VEC_MISALI_D: case VEC_MISALI_D:
info.si_code = BUS_ADRALN; info.si_code = BUS_ADRALN;
sig = SIGBUS; sig = SIGBUS;
printk(KERN_NOTICE EXC_0x24); printk(KERN_NOTICE EXC_0x24(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x25 - Unrecoverable Event, handled here */ /* 0x25 - Unrecoverable Event, handled here */
case VEC_UNCOV: case VEC_UNCOV:
info.si_code = ILL_ILLEXCPT; info.si_code = ILL_ILLEXCPT;
sig = SIGILL; sig = SIGILL;
printk(KERN_NOTICE EXC_0x25); printk(KERN_NOTICE EXC_0x25(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x26 - Data CPLB Miss, normal case is handled in _cplb_hdr, /* 0x26 - Data CPLB Miss, normal case is handled in _cplb_hdr,
...@@ -338,7 +339,7 @@ asmlinkage void trap_c(struct pt_regs *fp) ...@@ -338,7 +339,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
case VEC_CPLB_M: case VEC_CPLB_M:
info.si_code = BUS_ADRALN; info.si_code = BUS_ADRALN;
sig = SIGBUS; sig = SIGBUS;
printk(KERN_NOTICE EXC_0x26); printk(KERN_NOTICE EXC_0x26(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero, handled here */ /* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero, handled here */
...@@ -349,7 +350,7 @@ asmlinkage void trap_c(struct pt_regs *fp) ...@@ -349,7 +350,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
printk(KERN_NOTICE "NULL pointer access (probably)\n"); printk(KERN_NOTICE "NULL pointer access (probably)\n");
#else #else
sig = SIGILL; sig = SIGILL;
printk(KERN_NOTICE EXC_0x27); printk(KERN_NOTICE EXC_0x27(KERN_NOTICE));
#endif #endif
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
...@@ -357,7 +358,7 @@ asmlinkage void trap_c(struct pt_regs *fp) ...@@ -357,7 +358,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
case VEC_WATCH: case VEC_WATCH:
info.si_code = TRAP_WATCHPT; info.si_code = TRAP_WATCHPT;
sig = SIGTRAP; sig = SIGTRAP;
pr_debug(EXC_0x28); pr_debug(EXC_0x28(KERN_DEBUG));
CHK_DEBUGGER_TRAP_MAYBE(); CHK_DEBUGGER_TRAP_MAYBE();
/* Check if this is a watchpoint in kernel space */ /* Check if this is a watchpoint in kernel space */
if (fp->ipend & 0xffc0) if (fp->ipend & 0xffc0)
...@@ -379,22 +380,21 @@ asmlinkage void trap_c(struct pt_regs *fp) ...@@ -379,22 +380,21 @@ asmlinkage void trap_c(struct pt_regs *fp)
case VEC_MISALI_I: case VEC_MISALI_I:
info.si_code = BUS_ADRALN; info.si_code = BUS_ADRALN;
sig = SIGBUS; sig = SIGBUS;
printk(KERN_NOTICE EXC_0x2A); printk(KERN_NOTICE EXC_0x2A(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x2B - Instruction CPLB protection Violation, /* 0x2B - Instruction CPLB protection violation, handled here */
handled in _cplb_hdr */
case VEC_CPLB_I_VL: case VEC_CPLB_I_VL:
info.si_code = ILL_CPLB_VI; info.si_code = ILL_CPLB_VI;
sig = SIGILL; sig = SIGBUS;
printk(KERN_NOTICE EXC_0x2B); printk(KERN_NOTICE EXC_0x2B(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x2C - Instruction CPLB miss, handled in _cplb_hdr */ /* 0x2C - Instruction CPLB miss, handled in _cplb_hdr */
case VEC_CPLB_I_M: case VEC_CPLB_I_M:
info.si_code = ILL_CPLB_MISS; info.si_code = ILL_CPLB_MISS;
sig = SIGBUS; sig = SIGBUS;
printk(KERN_NOTICE EXC_0x2C); printk(KERN_NOTICE EXC_0x2C(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x2D - Instruction CPLB Multiple Hits, handled here */ /* 0x2D - Instruction CPLB Multiple Hits, handled here */
...@@ -405,7 +405,7 @@ asmlinkage void trap_c(struct pt_regs *fp) ...@@ -405,7 +405,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
printk(KERN_NOTICE "Jump to address 0 - 0x0fff\n"); printk(KERN_NOTICE "Jump to address 0 - 0x0fff\n");
#else #else
sig = SIGILL; sig = SIGILL;
printk(KERN_NOTICE EXC_0x2D); printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE));
#endif #endif
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
...@@ -413,7 +413,7 @@ asmlinkage void trap_c(struct pt_regs *fp) ...@@ -413,7 +413,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
case VEC_ILL_RES: case VEC_ILL_RES:
info.si_code = ILL_PRVOPC; info.si_code = ILL_PRVOPC;
sig = SIGILL; sig = SIGILL;
printk(KERN_NOTICE EXC_0x2E); printk(KERN_NOTICE EXC_0x2E(KERN_NOTICE));
CHK_DEBUGGER_TRAP(); CHK_DEBUGGER_TRAP();
break; break;
/* 0x2F - Reserved, Caught by default */ /* 0x2F - Reserved, Caught by default */
...@@ -446,7 +446,9 @@ asmlinkage void trap_c(struct pt_regs *fp) ...@@ -446,7 +446,9 @@ asmlinkage void trap_c(struct pt_regs *fp)
if (sig != SIGTRAP) { if (sig != SIGTRAP) {
unsigned long stack; unsigned long stack;
dump_bfin_regs(fp, (void *)fp->retx); dump_bfin_process(fp);
dump_bfin_mem((void *)fp->retx);
show_regs(fp);
/* Print out the trace buffer if it makes sense */ /* Print out the trace buffer if it makes sense */
#ifndef CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE #ifndef CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE
...@@ -460,22 +462,25 @@ asmlinkage void trap_c(struct pt_regs *fp) ...@@ -460,22 +462,25 @@ asmlinkage void trap_c(struct pt_regs *fp)
show_stack(current, &stack); show_stack(current, &stack);
if (oops_in_progress) { if (oops_in_progress) {
#ifndef CONFIG_ACCESS_CHECK #ifndef CONFIG_ACCESS_CHECK
printk(KERN_EMERG "Hey - dork - please turn on " printk(KERN_EMERG "Please turn on "
"CONFIG_ACCESS_CHECK\n"); "CONFIG_ACCESS_CHECK\n");
#endif #endif
panic("Kernel exception"); panic("Kernel exception");
} }
/* Ensure that bad return addresses don't end up in an infinite
* loop, due to speculative loads/reads
*/
fp->pc = SAFE_USER_INSTRUCTION;
} }
info.si_signo = sig; info.si_signo = sig;
info.si_errno = 0; info.si_errno = 0;
info.si_addr = (void *)fp->pc; info.si_addr = (void *)fp->pc;
force_sig_info(sig, &info, current); force_sig_info(sig, &info, current);
/* Ensure that bad return addresses don't end up in an infinite
* loop, due to speculative loads/reads. This needs to be done after
* the signal has been sent.
*/
if (trapnr == VEC_CPLB_I_M && sig != SIGTRAP)
fp->pc = SAFE_USER_INSTRUCTION;
trace_buffer_restore(j); trace_buffer_restore(j);
return; return;
} }
...@@ -600,37 +605,48 @@ void dump_stack(void) ...@@ -600,37 +605,48 @@ void dump_stack(void)
show_stack(current, &stack); show_stack(current, &stack);
trace_buffer_restore(tflags); trace_buffer_restore(tflags);
} }
EXPORT_SYMBOL(dump_stack); EXPORT_SYMBOL(dump_stack);
void dump_bfin_regs(struct pt_regs *fp, void *retaddr) void dump_bfin_process(struct pt_regs *fp)
{ {
char buf [150]; /* We should be able to look at fp->ipend, but we don't push it on the
* stack all the time, so do this until we fix that */
unsigned int context = bfin_read_IPEND();
if (oops_in_progress)
printk(KERN_EMERG "Kernel OOPS in progress\n");
if (context & 0x0020)
printk(KERN_NOTICE "Deferred excecption or HW Error context\n");
else if (context & 0x3FC0)
printk(KERN_NOTICE "Interrupt context\n");
else if (context & 0x4000)
printk(KERN_NOTICE "Deferred Interrupt context\n");
else if (context & 0x8000)
printk(KERN_NOTICE "Kernel process context\n");
if (current->pid && current->mm) {
printk(KERN_NOTICE "CURRENT PROCESS:\n");
printk(KERN_NOTICE "COMM=%s PID=%d\n",
current->comm, current->pid);
printk(KERN_NOTICE "TEXT = 0x%p-0x%p DATA = 0x%p-0x%p\n"
KERN_NOTICE "BSS = 0x%p-0x%p USER-STACK = 0x%p\n"
KERN_NOTICE "\n",
(void *)current->mm->start_code,
(void *)current->mm->end_code,
(void *)current->mm->start_data,
(void *)current->mm->end_data,
(void *)current->mm->end_data,
(void *)current->mm->brk,
(void *)current->mm->start_stack);
} else
printk(KERN_NOTICE "\n" KERN_NOTICE
"No Valid process in current context\n");
}
if (!oops_in_progress) { void dump_bfin_mem(void *retaddr)
if (current->pid && current->mm) { {
printk(KERN_NOTICE "\n" KERN_NOTICE "CURRENT PROCESS:\n");
printk(KERN_NOTICE "COMM=%s PID=%d\n",
current->comm, current->pid);
printk(KERN_NOTICE "TEXT = 0x%p-0x%p DATA = 0x%p-0x%p\n"
KERN_NOTICE "BSS = 0x%p-0x%p USER-STACK = 0x%p\n"
KERN_NOTICE "\n",
(void *)current->mm->start_code,
(void *)current->mm->end_code,
(void *)current->mm->start_data,
(void *)current->mm->end_data,
(void *)current->mm->end_data,
(void *)current->mm->brk,
(void *)current->mm->start_stack);
} else {
printk (KERN_NOTICE "\n" KERN_NOTICE
"No Valid pid - Either things are really messed up,"
" or you are in the kernel\n");
}
} else {
printk(KERN_NOTICE "Kernel or interrupt exception\n");
}
if (retaddr >= (void *)FIXED_CODE_START && retaddr < (void *)physical_mem_end if (retaddr >= (void *)FIXED_CODE_START && retaddr < (void *)physical_mem_end
#if L1_CODE_LENGTH != 0 #if L1_CODE_LENGTH != 0
...@@ -671,8 +687,13 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr) ...@@ -671,8 +687,13 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
printk("\n"); printk("\n");
} else } else
printk("\n" KERN_NOTICE printk("\n" KERN_NOTICE
"Cannot look at the [PC] for it is" "Cannot look at the [PC] <%p> for it is"
" in unreadable memory - sorry\n"); " in unreadable memory - sorry\n", retaddr);
}
void show_regs(struct pt_regs *fp)
{
char buf [150];
printk(KERN_NOTICE "\n" KERN_NOTICE "SEQUENCER STATUS:\n"); printk(KERN_NOTICE "\n" KERN_NOTICE "SEQUENCER STATUS:\n");
printk(KERN_NOTICE " SEQSTAT: %08lx IPEND: %04lx SYSCFG: %04lx\n", printk(KERN_NOTICE " SEQSTAT: %08lx IPEND: %04lx SYSCFG: %04lx\n",
...@@ -686,6 +707,8 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr) ...@@ -686,6 +707,8 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
printk(KERN_NOTICE " RETX: %s\n", buf); printk(KERN_NOTICE " RETX: %s\n", buf);
decode_address(buf, fp->rets); decode_address(buf, fp->rets);
printk(KERN_NOTICE " RETS: %s\n", buf); printk(KERN_NOTICE " RETS: %s\n", buf);
decode_address(buf, fp->pc);
printk(KERN_NOTICE " PC: %s\n", buf);
if ((long)fp->seqstat & SEQSTAT_EXCAUSE) { if ((long)fp->seqstat & SEQSTAT_EXCAUSE) {
decode_address(buf, bfin_read_DCPLB_FAULT_ADDR()); decode_address(buf, bfin_read_DCPLB_FAULT_ADDR());
...@@ -800,7 +823,9 @@ void panic_cplb_error(int cplb_panic, struct pt_regs *fp) ...@@ -800,7 +823,9 @@ void panic_cplb_error(int cplb_panic, struct pt_regs *fp)
printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n", (void *)bfin_read_DCPLB_FAULT_ADDR()); printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n", (void *)bfin_read_DCPLB_FAULT_ADDR());
printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n", (void *)bfin_read_ICPLB_FAULT_ADDR()); printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n", (void *)bfin_read_ICPLB_FAULT_ADDR());
dump_bfin_regs(fp, (void *)fp->retx); dump_bfin_process(fp);
dump_bfin_mem((void *)fp->retx);
show_regs(fp);
dump_stack(); dump_stack();
panic("Unrecoverable event\n"); panic("Unrecoverable event\n");
} }
arch/blackfin/lib/Makefile
View file @ b5faa4b8
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
lib-y := \ lib-y := \
ashldi3.o ashrdi3.o lshrdi3.o \ ashldi3.o ashrdi3.o lshrdi3.o \
muldi3.o divsi3.o udivsi3.o udivdi3.o modsi3.o umodsi3.o \ muldi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \
checksum.o memcpy.o memset.o memcmp.o memchr.o memmove.o \ checksum.o memcpy.o memset.o memcmp.o memchr.o memmove.o \
strcmp.o strcpy.o strncmp.o strncpy.o \ strcmp.o strcpy.o strncmp.o strncpy.o \
umulsi3_highpart.o smulsi3_highpart.o \ umulsi3_highpart.o smulsi3_highpart.o \
......
arch/blackfin/lib/ins.S
View file @ b5faa4b8
...@@ -77,3 +77,22 @@ ENTRY(_insb) ...@@ -77,3 +77,22 @@ ENTRY(_insb)
sti R3; sti R3;
RTS; RTS;
ENDPROC(_insb) ENDPROC(_insb)
ENTRY(_insl_16)
P0 = R0; /* P0 = port */
cli R3;
P1 = R1; /* P1 = address */
P2 = R2; /* P2 = count */
SSYNC;
LSETUP( .Llong16_loop_s, .Llong16_loop_e) LC0 = P2;
.Llong16_loop_s: R0 = [P0];
W[P1++] = R0;
R0 = R0 >> 16;
W[P1++] = R0;
NOP;
.Llong16_loop_e: NOP;
sti R3;
RTS;
ENDPROC(_insl_16)
arch/blackfin/lib/strcmp.c
View file @ b5faa4b8
#include <linux/types.h> /*
* Provide symbol in case str func is not inlined.
*
* Copyright (c) 2006-2007 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/
#define strcmp __inline_strcmp #define strcmp __inline_strcmp
#include <asm/string.h> #include <asm/string.h>
#undef strcmp #undef strcmp
#include <linux/module.h>
int strcmp(const char *dest, const char *src) int strcmp(const char *dest, const char *src)
{ {
return __inline_strcmp(dest, src); return __inline_strcmp(dest, src);
} }
EXPORT_SYMBOL(strcmp);
arch/blackfin/lib/strcpy.c
View file @ b5faa4b8
#include <linux/types.h> /*
* Provide symbol in case str func is not inlined.
*
* Copyright (c) 2006-2007 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/
#define strcpy __inline_strcpy #define strcpy __inline_strcpy
#include <asm/string.h> #include <asm/string.h>
#undef strcpy #undef strcpy
#include <linux/module.h>
char *strcpy(char *dest, const char *src) char *strcpy(char *dest, const char *src)
{ {
return __inline_strcpy(dest, src); return __inline_strcpy(dest, src);
} }
EXPORT_SYMBOL(strcpy);
arch/blackfin/lib/strncmp.c
View file @ b5faa4b8
#include <linux/types.h> /*
* Provide symbol in case str func is not inlined.
*
* Copyright (c) 2006-2007 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/
#define strncmp __inline_strncmp #define strncmp __inline_strncmp
#include <asm/string.h> #include <asm/string.h>
#undef strncmp #undef strncmp
#include <linux/module.h>
int strncmp(const char *cs, const char *ct, size_t count) int strncmp(const char *cs, const char *ct, size_t count)
{ {
return __inline_strncmp(cs, ct, count); return __inline_strncmp(cs, ct, count);
} }
EXPORT_SYMBOL(strncmp);
arch/blackfin/lib/strncpy.c
View file @ b5faa4b8
#include <linux/types.h> /*
* Provide symbol in case str func is not inlined.
*
* Copyright (c) 2006-2007 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/
#define strncpy __inline_strncpy #define strncpy __inline_strncpy
#include <asm/string.h> #include <asm/string.h>
#undef strncpy #undef strncpy
#include <linux/module.h>
char *strncpy(char *dest, const char *src, size_t n) char *strncpy(char *dest, const char *src, size_t n)
{ {
return __inline_strncpy(dest, src, n); return __inline_strncpy(dest, src, n);
} }
EXPORT_SYMBOL(strncpy);
arch/blackfin/lib/udivdi3.S deleted 100644 → 0
View file @ a039767f
/*
* udivdi3.S - unsigned long long division
*
* Copyright 2003-2007 Analog Devices Inc.
* Enter bugs at http://blackfin.uclinux.org/
*
* Licensed under the GPLv2 or later.
*/
#include <linux/linkage.h>
#define CARRY AC0
#ifdef CONFIG_ARITHMETIC_OPS_L1
.section .l1.text
#else
.text
#endif
ENTRY(___udivdi3)
R3 = [SP + 12];
[--SP] = (R7:4, P5:3);
/* Attempt to use divide primitive first; these will handle
** most cases, and they're quick - avoids stalls incurred by
** testing for identities.
*/
R4 = R2 | R3;
CC = R4 == 0;
IF CC JUMP .LDIV_BY_ZERO;
R4.H = 0x8000;
R4 >>>= 16; // R4 now 0xFFFF8000
R5 = R0 | R2; // If either dividend or
R4 = R5 & R4; // divisor have bits in
CC = R4; // top half or low half's sign
IF CC JUMP .LIDENTS; // bit, skip builtins.
R4 = R1 | R3; // Also check top halves
CC = R4;
IF CC JUMP .LIDENTS;
/* Can use the builtins. */
AQ = CC; // Clear AQ (CC==0)
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
DIVQ(R0, R2);
R0 = R0.L (Z);
R1 = 0;
(R7:4, P5:3) = [SP++];
RTS;
.LIDENTS:
/* Test for common identities. Value to be returned is
** placed in R6,R7.
*/
// Check for 0/y, return 0
R4 = R0 | R1;
CC = R4 == 0;
IF CC JUMP .LRETURN_R0;
// Check for x/x, return 1
R6 = R0 - R2; // If x == y, then both R6 and R7 will be zero
R7 = R1 - R3;
R4 = R6 | R7; // making R4 zero.
R6 += 1; // which would now make R6:R7==1.
CC = R4 == 0;
IF CC JUMP .LRETURN_IDENT;
// Check for x/1, return x
R6 = R0;
R7 = R1;
CC = R3 == 0;
IF !CC JUMP .Lnexttest;
CC = R2 == 1;
IF CC JUMP .LRETURN_IDENT;
.Lnexttest:
R4.L = ONES R2; // check for div by power of two which
R5.L = ONES R3; // can be done using a shift
R6 = PACK (R5.L, R4.L);
CC = R6 == 1;
IF CC JUMP .Lpower_of_two_upper_zero;
R6 = PACK (R4.L, R5.L);
CC = R6 == 1;
IF CC JUMP .Lpower_of_two_lower_zero;
// Check for x < y, return 0
R6 = 0;
R7 = R6;
CC = R1 < R3 (IU);
IF CC JUMP .LRETURN_IDENT;
CC = R1 == R3;
IF !CC JUMP .Lno_idents;
CC = R0 < R2 (IU);
IF CC JUMP .LRETURN_IDENT;
.Lno_idents: // Idents don't match. Go for the full operation
// If X, or X and Y have high bit set, it'll affect the
// results, so shift right one to stop this. Note: we've already
// checked that X >= Y, so Y's msb won't be set unless X's
// is.
R4 = 0;
CC = R1 < 0;
IF !CC JUMP .Lx_msb_clear;
CC = !CC; // 1 -> 0;
R1 = ROT R1 BY -1; // Shift X >> 1
R0 = ROT R0 BY -1; // lsb -> CC
BITSET(R4,31); // to record only x msb was set
CC = R3 < 0;
IF !CC JUMP .Ly_msb_clear;
CC = !CC;
R3 = ROT R3 BY -1; // Shift Y >> 1
R2 = ROT R2 BY -1;
BITCLR(R4,31); // clear bit to record only x msb was set
.Ly_msb_clear:
.Lx_msb_clear:
// Bit 31 in R4 indicates X msb set, but Y msb wasn't, and no bits
// were lost, so we should shift result left by one.
[--SP] = R4; // save for later
// In the loop that follows, each iteration we add
// either Y' or -Y' to the Remainder. We compute the
// negated Y', and store, for convenience. Y' goes
// into P0:P1, while -Y' goes into P2:P3.
P0 = R2;
P1 = R3;
R2 = -R2;
CC = CARRY;
CC = !CC;
R4 = CC;
R3 = -R3;
R3 = R3 - R4;
R6 = 0; // remainder = 0
R7 = R6;
[--SP] = R2; P2 = SP;
[--SP] = R3; P3 = SP;
[--SP] = R6; P5 = SP; // AQ = 0
[--SP] = P1;
/* In the loop that follows, we use the following
** register assignments:
** R0,R1 X, workspace
** R2,R3 Y, workspace
** R4,R5 partial Div
** R6,R7 partial remainder
** P5 AQ
** The remainder and div form a 128-bit number, with
** the remainder in the high 64-bits.
*/
R4 = R0; // Div = X'
R5 = R1;
R3 = 0;
P4 = 64; // Iterate once per bit
LSETUP(.LULST,.LULEND) LC0 = P4;
.LULST:
/* Shift Div and remainder up by one. The bit shifted
** out of the top of the quotient is shifted into the bottom
** of the remainder.
*/
CC = R3;
R4 = ROT R4 BY 1;
R5 = ROT R5 BY 1 || // low q to high q
R2 = [P5]; // load saved AQ
R6 = ROT R6 BY 1 || // high q to low r
R0 = [P2]; // load -Y'
R7 = ROT R7 BY 1 || // low r to high r
R1 = [P3];
// Assume add -Y'
CC = R2 < 0; // But if AQ is set...
IF CC R0 = P0; // then add Y' instead
IF CC R1 = P1;
R6 = R6 + R0; // Rem += (Y' or -Y')
CC = CARRY;
R0 = CC;
R7 = R7 + R1;
R7 = R7 + R0 (NS) ||
R1 = [SP];
// Set the next AQ bit
R1 = R7 ^ R1; // from Remainder and Y'
R1 = R1 >> 31 || // Negate AQ's value, and
[P5] = R1; // save next AQ
BITTGL(R1, 0); // add neg AQ to the Div
.LULEND: R4 = R4 + R1;
R6 = [SP + 16];
R0 = R4;
R1 = R5;
CC = BITTST(R6,30); // Just set CC=0
R4 = ROT R0 BY 1; // but if we had to shift X,
R5 = ROT R1 BY 1; // and didn't shift any bits out,
CC = BITTST(R6,31); // then the result will be half as
IF CC R0 = R4; // much as required, so shift left
IF CC R1 = R5; // one space.
SP += 20;
(R7:4, P5:3) = [SP++];
RTS;
.Lpower_of_two:
/* Y has a single bit set, which means it's a power of two.
** That means we can perform the division just by shifting
** X to the right the appropriate number of bits
*/
/* signbits returns the number of sign bits, minus one.
** 1=>30, 2=>29, ..., 0x40000000=>0. Which means we need
** to shift right n-signbits spaces. It also means 0x80000000
** is a special case, because that *also* gives a signbits of 0
*/
.Lpower_of_two_lower_zero:
R7 = 0;
R6 = R1 >> 31;
CC = R3 < 0;
IF CC JUMP .LRETURN_IDENT;
R2.L = SIGNBITS R3;
R2 = R2.L (Z);
R2 += -62;
(R7:4, P5:3) = [SP++];
JUMP ___lshftli;
.Lpower_of_two_upper_zero:
CC = R2 < 0;
IF CC JUMP .Lmaxint_shift;
R2.L = SIGNBITS R2;
R2 = R2.L (Z);
R2 += -30;
(R7:4, P5:3) = [SP++];
JUMP ___lshftli;
.Lmaxint_shift:
R2 = -31;
(R7:4, P5:3) = [SP++];
JUMP ___lshftli;
.LRETURN_IDENT:
R0 = R6;
R1 = R7;
.LRETURN_R0:
(R7:4, P5:3) = [SP++];
RTS;
.LDIV_BY_ZERO:
R0 = ~R2;
R1 = R0;
(R7:4, P5:3) = [SP++];
RTS;
ENDPROC(___udivdi3)
ENTRY(___lshftli)
CC = R2 == 0;
IF CC JUMP .Lfinished; // nothing to do
CC = R2 < 0;
IF CC JUMP .Lrshift;
R3 = 64;
CC = R2 < R3;
IF !CC JUMP .Lretzero;
// We're shifting left, and it's less than 64 bits, so
// a valid result will be returned.
R3 >>= 1; // R3 now 32
CC = R2 < R3;
IF !CC JUMP .Lzerohalf;
// We're shifting left, between 1 and 31 bits, which means
// some of the low half will be shifted into the high half.
// Work out how much.
R3 = R3 - R2;
// Save that much data from the bottom half.
P1 = R7;
R7 = R0;
R7 >>= R3;
// Adjust both parts of the parameter.
R0 <<= R2;
R1 <<= R2;
// And include the bits moved across.
R1 = R1 | R7;
R7 = P1;
RTS;
.Lzerohalf:
// We're shifting left, between 32 and 63 bits, so the
// bottom half will become zero, and the top half will
// lose some bits. How many?
R2 = R2 - R3; // N - 32
R1 = LSHIFT R0 BY R2.L;
R0 = R0 - R0;
RTS;
.Lretzero:
R0 = R0 - R0;
R1 = R0;
.Lfinished:
RTS;
.Lrshift:
// We're shifting right, but by how much?
R2 = -R2;
R3 = 64;
CC = R2 < R3;
IF !CC JUMP .Lretzero;
// Shifting right less than 64 bits, so some result bits will
// be retained.
R3 >>= 1; // R3 now 32
CC = R2 < R3;
IF !CC JUMP .Lsignhalf;
// Shifting right between 1 and 31 bits, so need to copy
// data across words.
P1 = R7;
R3 = R3 - R2;
R7 = R1;
R7 <<= R3;
R1 >>= R2;
R0 >>= R2;
R0 = R7 | R0;
R7 = P1;
RTS;
.Lsignhalf:
// Shifting right between 32 and 63 bits, so the top half
// will become all zero-bits, and the bottom half is some
// of the top half. But how much?
R2 = R2 - R3;
R0 = R1;
R0 >>= R2;
R1 = 0;
RTS;
ENDPROC(___lshftli)
arch/blackfin/mach-bf527/Kconfig
View file @ b5faa4b8
if (BF52x) if (BF52x)
source "arch/blackfin/mach-bf527/boards/Kconfig"
menu "BF527 Specific Configuration" menu "BF527 Specific Configuration"
comment "Alternative Multiplexing Scheme" comment "Alternative Multiplexing Scheme"
......
arch/blackfin/mach-bf527/boards/Kconfig 0 → 100644
View file @ b5faa4b8
choice
prompt "System type"
default BFIN527_EZKIT
help
Select your board!
config BFIN527_EZKIT
bool "BF527-EZKIT"
help
BF527-EZKIT-LITE board support.
endchoice
arch/blackfin/mach-bf527/boards/Makefile
View file @ b5faa4b8
# #
# arch/blackfin/mach-bf532/boards/Makefile # arch/blackfin/mach-bf527/boards/Makefile
# #
obj-y += eth_mac.o obj-$(CONFIG_BFIN527_EZKIT) += ezkit.o
obj-$(CONFIG_BFIN527_EZKIT) += ezkit.o
arch/blackfin/mach-bf527/boards/eth_mac.c deleted 100644 → 0
View file @ a039767f
/*
* arch/blackfin/mach-bf537/board/eth_mac.c
*
* Copyright (C) 2007 Analog Devices, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/module.h>
#include <asm/blackfin.h>
#if defined(CONFIG_GENERIC_BOARD) || defined(CONFIG_BFIN537_STAMP)
/*
* Currently the MAC address is saved in Flash by U-Boot
*/
#define FLASH_MAC 0x203f0000
void get_bf537_ether_addr(char *addr)
{
unsigned int flash_mac = (unsigned int) FLASH_MAC;
*(u32 *)(&(addr[0])) = bfin_read32(flash_mac);
flash_mac += 4;
*(u16 *)(&(addr[4])) = bfin_read16(flash_mac);
}
#else
/*
* Provide MAC address function for other specific board setting
*/
void get_bf537_ether_addr(char *addr)
{
printk(KERN_WARNING "%s: No valid Ethernet MAC address found\n", __FILE__);
}
#endif
EXPORT_SYMBOL(get_bf537_ether_addr);
arch/blackfin/mach-bf527/boards/ezkit.c
View file @ b5faa4b8
...@@ -35,17 +35,18 @@ ...@@ -35,17 +35,18 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
#include <linux/usb_isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/pata_platform.h> #include <linux/pata_platform.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/usb_sl811.h> #include <linux/usb/sl811.h>
#include <asm/cplb.h> #include <asm/cplb.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/nand.h> #include <asm/nand.h>
#include <asm/portmux.h>
#include <linux/spi/ad7877.h> #include <linux/spi/ad7877.h>
/* /*
...@@ -450,6 +451,13 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { ...@@ -450,6 +451,13 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
}; };
#endif #endif
#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
&& defined(CONFIG_SND_SOC_WM8731_SPI)
static struct bfin5xx_spi_chip spi_wm8731_chip_info = {
.enable_dma = 0,
.bits_per_word = 16,
};
#endif
static struct spi_board_info bfin_spi_board_info[] __initdata = { static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_MTD_M25P80) \ #if defined(CONFIG_MTD_M25P80) \
|| defined(CONFIG_MTD_M25P80_MODULE) || defined(CONFIG_MTD_M25P80_MODULE)
...@@ -551,17 +559,29 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -551,17 +559,29 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
.platform_data = &bfin_ad7877_ts_info, .platform_data = &bfin_ad7877_ts_info,
.irq = IRQ_PF6, .irq = IRQ_PF6,
.max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
.bus_num = 1, .bus_num = 0,
.chip_select = 1, .chip_select = 1,
.controller_data = &spi_ad7877_chip_info, .controller_data = &spi_ad7877_chip_info,
}, },
#endif #endif
#if defined(CONFIG_SND_SOC_WM8731) || defined(CONFIG_SND_SOC_WM8731_MODULE) \
&& defined(CONFIG_SND_SOC_WM8731_SPI)
{
.modalias = "wm8731",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0,
.chip_select = 5,
.controller_data = &spi_wm8731_chip_info,
.mode = SPI_MODE_0,
},
#endif
}; };
/* SPI controller data */ /* SPI controller data */
static struct bfin5xx_spi_master bfin_spi0_info = { static struct bfin5xx_spi_master bfin_spi0_info = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
/* SPI (0) */ /* SPI (0) */
...@@ -788,3 +808,14 @@ void native_machine_restart(char *cmd) ...@@ -788,3 +808,14 @@ void native_machine_restart(char *cmd)
if ((bfin_read_SYSCR() & 0x7) == 0x3) if ((bfin_read_SYSCR() & 0x7) == 0x3)
bfin_gpio_reset_spi0_ssel1(); bfin_gpio_reset_spi0_ssel1();
} }
/*
* Currently the MAC address is saved in Flash by U-Boot
*/
#define FLASH_MAC 0x203f0000
void bfin_get_ether_addr(char *addr)
{
*(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
*(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
}
EXPORT_SYMBOL(bfin_get_ether_addr);
arch/blackfin/mach-bf533/Kconfig
View file @ b5faa4b8
if (BF533 || BF532 || BF531) if (BF533 || BF532 || BF531)
source "arch/blackfin/mach-bf533/boards/Kconfig"
menu "BF533/2/1 Specific Configuration" menu "BF533/2/1 Specific Configuration"
comment "Interrupt Priority Assignment" comment "Interrupt Priority Assignment"
......
arch/blackfin/mach-bf533/boards/H8606.c
View file @ b5faa4b8
...@@ -36,20 +36,21 @@ ...@@ -36,20 +36,21 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
#include <linux/usb_isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/pata_platform.h> #include <linux/pata_platform.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/portmux.h>
/* /*
* Name the Board for the /proc/cpuinfo * Name the Board for the /proc/cpuinfo
*/ */
const char bfin_board_name[] = "HV Sistemas H8606"; const char bfin_board_name[] = "HV Sistemas H8606";
#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_BFIN_MODULE) #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
static struct platform_device rtc_device = { static struct platform_device rtc_device = {
.name = "rtc-bfin", .name = "rtc-bfin",
.id = -1, .id = -1,
...@@ -93,10 +94,6 @@ static struct resource smc91x_resources[] = { ...@@ -93,10 +94,6 @@ static struct resource smc91x_resources[] = {
.end = IRQ_PROG_INTB, .end = IRQ_PROG_INTB,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
}, { }, {
/*
* denotes the flag pin and is used directly if
* CONFIG_IRQCHIP_DEMUX_GPIO is defined.
*/
.start = IRQ_PF7, .start = IRQ_PF7,
.end = IRQ_PF7, .end = IRQ_PF7,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
...@@ -269,6 +266,7 @@ static struct resource bfin_spi0_resource[] = { ...@@ -269,6 +266,7 @@ static struct resource bfin_spi0_resource[] = {
static struct bfin5xx_spi_master bfin_spi0_info = { static struct bfin5xx_spi_master bfin_spi0_info = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
static struct platform_device bfin_spi0_device = { static struct platform_device bfin_spi0_device = {
...@@ -342,4 +340,4 @@ static int __init H8606_init(void) ...@@ -342,4 +340,4 @@ static int __init H8606_init(void)
return 0; return 0;
} }
arch_initcall(H8606_init); arch_initcall(H8606_init);
\ No newline at end of file
arch/blackfin/mach-bf533/boards/Kconfig 0 → 100644
View file @ b5faa4b8
choice
prompt "System type"
default BFIN533_STAMP
help
Select your board!
config BFIN533_EZKIT
bool "BF533-EZKIT"
help
BF533-EZKIT-LITE board support.
config BFIN533_STAMP
bool "BF533-STAMP"
help
BF533-STAMP board support.
config BFIN533_BLUETECHNIX_CM
bool "Bluetechnix CM-BF533"
depends on (BF533)
help
CM-BF533 support for EVAL- and DEV-Board.
config H8606_HVSISTEMAS
bool "HV Sistemas H8606"
depends on (BF532)
help
HV Sistemas H8606 board support.
config GENERIC_BF533_BOARD
bool "Generic"
help
Generic or Custom board support.
endchoice
arch/blackfin/mach-bf533/boards/Makefile
View file @ b5faa4b8
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# arch/blackfin/mach-bf533/boards/Makefile # arch/blackfin/mach-bf533/boards/Makefile
# #
obj-$(CONFIG_GENERIC_BOARD) += generic_board.o obj-$(CONFIG_GENERIC_BF533_BOARD) += generic_board.o
obj-$(CONFIG_BFIN533_STAMP) += stamp.o obj-$(CONFIG_BFIN533_STAMP) += stamp.o
obj-$(CONFIG_BFIN533_EZKIT) += ezkit.o obj-$(CONFIG_BFIN533_EZKIT) += ezkit.o
obj-$(CONFIG_BFIN533_BLUETECHNIX_CM) += cm_bf533.o obj-$(CONFIG_BFIN533_BLUETECHNIX_CM) += cm_bf533.o
......
arch/blackfin/mach-bf533/boards/cm_bf533.c
View file @ b5faa4b8
...@@ -33,11 +33,12 @@ ...@@ -33,11 +33,12 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#include <linux/usb_isp1362.h> #include <linux/usb/isp1362.h>
#include <linux/pata_platform.h> #include <linux/pata_platform.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/portmux.h>
/* /*
* Name the Board for the /proc/cpuinfo * Name the Board for the /proc/cpuinfo
...@@ -175,6 +176,7 @@ static struct resource bfin_spi0_resource[] = { ...@@ -175,6 +176,7 @@ static struct resource bfin_spi0_resource[] = {
static struct bfin5xx_spi_master bfin_spi0_info = { static struct bfin5xx_spi_master bfin_spi0_info = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
static struct platform_device bfin_spi0_device = { static struct platform_device bfin_spi0_device = {
......
arch/blackfin/mach-bf533/boards/ezkit.c
View file @ b5faa4b8
...@@ -34,11 +34,12 @@ ...@@ -34,11 +34,12 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#include <linux/usb_isp1362.h> #include <linux/usb/isp1362.h>
#include <linux/pata_platform.h> #include <linux/pata_platform.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/portmux.h>
/* /*
* Name the Board for the /proc/cpuinfo * Name the Board for the /proc/cpuinfo
...@@ -187,6 +188,7 @@ static struct resource bfin_spi0_resource[] = { ...@@ -187,6 +188,7 @@ static struct resource bfin_spi0_resource[] = {
static struct bfin5xx_spi_master bfin_spi0_info = { static struct bfin5xx_spi_master bfin_spi0_info = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
static struct platform_device bfin_spi0_device = { static struct platform_device bfin_spi0_device = {
......
arch/blackfin/mach-bf533/boards/generic_board.c
View file @ b5faa4b8
...@@ -58,10 +58,6 @@ static struct resource smc91x_resources[] = { ...@@ -58,10 +58,6 @@ static struct resource smc91x_resources[] = {
.end = IRQ_PROG_INTB, .end = IRQ_PROG_INTB,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
}, { }, {
/*
* denotes the flag pin and is used directly if
* CONFIG_IRQCHIP_DEMUX_GPIO is defined.
*/
.start = IRQ_PF7, .start = IRQ_PF7,
.end = IRQ_PF7, .end = IRQ_PF7,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
......
arch/blackfin/mach-bf533/boards/stamp.c
View file @ b5faa4b8
...@@ -35,13 +35,14 @@ ...@@ -35,13 +35,14 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
#include <linux/usb_isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/pata_platform.h> #include <linux/pata_platform.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/portmux.h>
/* /*
* Name the Board for the /proc/cpuinfo * Name the Board for the /proc/cpuinfo
...@@ -286,6 +287,7 @@ static struct resource bfin_spi0_resource[] = { ...@@ -286,6 +287,7 @@ static struct resource bfin_spi0_resource[] = {
static struct bfin5xx_spi_master bfin_spi0_info = { static struct bfin5xx_spi_master bfin_spi0_info = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
static struct platform_device bfin_spi0_device = { static struct platform_device bfin_spi0_device = {
......
arch/blackfin/mach-bf537/Kconfig
View file @ b5faa4b8
if (BF537 || BF534 || BF536) if (BF537 || BF534 || BF536)
source "arch/blackfin/mach-bf537/boards/Kconfig"
menu "BF537 Specific Configuration" menu "BF537 Specific Configuration"
comment "Interrupt Priority Assignment" comment "Interrupt Priority Assignment"
......
arch/blackfin/mach-bf537/boards/Kconfig 0 → 100644
View file @ b5faa4b8
choice
prompt "System type"
default BFIN537_STAMP
help
Select your board!
config BFIN537_STAMP
bool "BF537-STAMP"
help
BF537-STAMP board support.
config BFIN537_BLUETECHNIX_CM
bool "Bluetechnix CM-BF537"
depends on (BF537)
help
CM-BF537 support for EVAL- and DEV-Board.
config PNAV10
bool "PNAV board"
depends on (BF537)
help
PNAV board support.
config GENERIC_BF537_BOARD
bool "Generic"
help
Generic or Custom board support.
endchoice
arch/blackfin/mach-bf537/boards/Makefile
View file @ b5faa4b8
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
# arch/blackfin/mach-bf537/boards/Makefile # arch/blackfin/mach-bf537/boards/Makefile
# #
obj-y += eth_mac.o obj-$(CONFIG_GENERIC_BF537_BOARD) += generic_board.o
obj-$(CONFIG_GENERIC_BOARD) += generic_board.o obj-$(CONFIG_BFIN537_STAMP) += stamp.o led.o
obj-$(CONFIG_BFIN537_STAMP) += stamp.o led.o obj-$(CONFIG_BFIN537_BLUETECHNIX_CM) += cm_bf537.o
obj-$(CONFIG_BFIN537_BLUETECHNIX_CM) += cm_bf537.o obj-$(CONFIG_PNAV10) += pnav10.o
obj-$(CONFIG_PNAV10) += pnav10.o
arch/blackfin/mach-bf537/boards/cm_bf537.c
View file @ b5faa4b8
...@@ -34,11 +34,12 @@ ...@@ -34,11 +34,12 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#include <linux/usb_isp1362.h> #include <linux/usb/isp1362.h>
#include <linux/pata_platform.h> #include <linux/pata_platform.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/portmux.h>
/* /*
* Name the Board for the /proc/cpuinfo * Name the Board for the /proc/cpuinfo
...@@ -194,6 +195,7 @@ static struct resource bfin_spi0_resource[] = { ...@@ -194,6 +195,7 @@ static struct resource bfin_spi0_resource[] = {
static struct bfin5xx_spi_master bfin_spi0_info = { static struct bfin5xx_spi_master bfin_spi0_info = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
static struct platform_device bfin_spi0_device = { static struct platform_device bfin_spi0_device = {
...@@ -425,3 +427,10 @@ static int __init cm_bf537_init(void) ...@@ -425,3 +427,10 @@ static int __init cm_bf537_init(void)
} }
arch_initcall(cm_bf537_init); arch_initcall(cm_bf537_init);
void bfin_get_ether_addr(char *addr)
{
random_ether_addr(addr);
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
}
EXPORT_SYMBOL(bfin_get_ether_addr);
arch/blackfin/mach-bf537/boards/eth_mac.c deleted 100644 → 0
View file @ a039767f
/*
* arch/blackfin/mach-bf537/board/eth_mac.c
*
* Copyright (C) 2007 Analog Devices, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/module.h>
#include <asm/blackfin.h>
#if defined(CONFIG_GENERIC_BOARD) || defined(CONFIG_BFIN537_STAMP)
/*
* Currently the MAC address is saved in Flash by U-Boot
*/
#define FLASH_MAC 0x203f0000
void get_bf537_ether_addr(char *addr)
{
unsigned int flash_mac = (unsigned int) FLASH_MAC;
*(u32 *)(&(addr[0])) = bfin_read32(flash_mac);
flash_mac += 4;
*(u16 *)(&(addr[4])) = bfin_read16(flash_mac);
}
#else
/*
* Provide MAC address function for other specific board setting
*/
void get_bf537_ether_addr(char *addr)
{
printk(KERN_WARNING "%s: No valid Ethernet MAC address found\n", __FILE__);
}
#endif
EXPORT_SYMBOL(get_bf537_ether_addr);
arch/blackfin/mach-bf537/boards/generic_board.c
View file @ b5faa4b8
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
#include <linux/usb_isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/pata_platform.h> #include <linux/pata_platform.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/portmux.h>
#include <linux/spi/ad7877.h> #include <linux/spi/ad7877.h>
/* /*
...@@ -502,7 +503,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -502,7 +503,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
.platform_data = &bfin_ad7877_ts_info, .platform_data = &bfin_ad7877_ts_info,
.irq = IRQ_PF6, .irq = IRQ_PF6,
.max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
.bus_num = 1, .bus_num = 0,
.chip_select = 1, .chip_select = 1,
.controller_data = &spi_ad7877_chip_info, .controller_data = &spi_ad7877_chip_info,
}, },
...@@ -513,6 +514,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -513,6 +514,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
static struct bfin5xx_spi_master bfin_spi0_info = { static struct bfin5xx_spi_master bfin_spi0_info = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
/* SPI (0) */ /* SPI (0) */
...@@ -730,3 +732,10 @@ void native_machine_restart(char *cmd) ...@@ -730,3 +732,10 @@ void native_machine_restart(char *cmd)
if ((bfin_read_SYSCR() & 0x7) == 0x3) if ((bfin_read_SYSCR() & 0x7) == 0x3)
bfin_gpio_reset_spi0_ssel1(); bfin_gpio_reset_spi0_ssel1();
} }
void bfin_get_ether_addr(char *addr)
{
random_ether_addr(addr);
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
}
EXPORT_SYMBOL(bfin_get_ether_addr);
arch/blackfin/mach-bf537/boards/pnav10.c
View file @ b5faa4b8
...@@ -35,11 +35,12 @@ ...@@ -35,11 +35,12 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
#include <linux/usb_isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/portmux.h>
#include <linux/usb/sl811.h> #include <linux/usb/sl811.h>
#include <linux/spi/ad7877.h> #include <linux/spi/ad7877.h>
...@@ -295,7 +296,7 @@ static struct bfin5xx_spi_chip spi_mmc_chip_info = { ...@@ -295,7 +296,7 @@ static struct bfin5xx_spi_chip spi_mmc_chip_info = {
#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
static struct bfin5xx_spi_chip spi_ad7877_chip_info = { static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
.cs_change_per_word = 1, .cs_change_per_word = 0,
.enable_dma = 0, .enable_dma = 0,
.bits_per_word = 16, .bits_per_word = 16,
}; };
...@@ -387,7 +388,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -387,7 +388,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
.platform_data = &bfin_ad7877_ts_info, .platform_data = &bfin_ad7877_ts_info,
.irq = IRQ_PF2, .irq = IRQ_PF2,
.max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
.bus_num = 1, .bus_num = 0,
.chip_select = 5, .chip_select = 5,
.controller_data = &spi_ad7877_chip_info, .controller_data = &spi_ad7877_chip_info,
}, },
...@@ -413,6 +414,7 @@ static struct resource bfin_spi0_resource[] = { ...@@ -413,6 +414,7 @@ static struct resource bfin_spi0_resource[] = {
static struct bfin5xx_spi_master bfin_spi0_info = { static struct bfin5xx_spi_master bfin_spi0_info = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
static struct platform_device bfin_spi0_device = { static struct platform_device bfin_spi0_device = {
...@@ -508,3 +510,10 @@ static int __init stamp_init(void) ...@@ -508,3 +510,10 @@ static int __init stamp_init(void)
} }
arch_initcall(stamp_init); arch_initcall(stamp_init);
void bfin_get_ether_addr(char *addr)
{
random_ether_addr(addr);
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
}
EXPORT_SYMBOL(bfin_get_ether_addr);
arch/blackfin/mach-bf537/boards/stamp.c
View file @ b5faa4b8
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
#include <linux/usb_isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/pata_platform.h> #include <linux/pata_platform.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/portmux.h>
#include <linux/spi/ad7877.h> #include <linux/spi/ad7877.h>
/* /*
...@@ -182,6 +183,28 @@ static struct platform_device dm9000_device = { ...@@ -182,6 +183,28 @@ static struct platform_device dm9000_device = {
}; };
#endif #endif
#if defined(CONFIG_AX88180) || defined(CONFIG_AX88180_MODULE)
static struct resource ax88180_resources[] = {
[0] = {
.start = 0x20300000,
.end = 0x20300000 + 0x8000,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_PF7,
.end = IRQ_PF7,
.flags = (IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL),
},
};
static struct platform_device ax88180_device = {
.name = "ax88180",
.id = -1,
.num_resources = ARRAY_SIZE(ax88180_resources),
.resource = ax88180_resources,
};
#endif
#if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE) #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)
static struct resource sl811_hcd_resources[] = { static struct resource sl811_hcd_resources[] = {
{ {
...@@ -502,7 +525,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -502,7 +525,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
.platform_data = &bfin_ad7877_ts_info, .platform_data = &bfin_ad7877_ts_info,
.irq = IRQ_PF6, .irq = IRQ_PF6,
.max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
.bus_num = 1, .bus_num = 0,
.chip_select = 1, .chip_select = 1,
.controller_data = &spi_ad7877_chip_info, .controller_data = &spi_ad7877_chip_info,
}, },
...@@ -513,6 +536,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -513,6 +536,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
static struct bfin5xx_spi_master bfin_spi0_info = { static struct bfin5xx_spi_master bfin_spi0_info = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
/* SPI (0) */ /* SPI (0) */
...@@ -554,15 +578,20 @@ static struct platform_device bfin_fb_adv7393_device = { ...@@ -554,15 +578,20 @@ static struct platform_device bfin_fb_adv7393_device = {
#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
static struct resource bfin_uart_resources[] = { static struct resource bfin_uart_resources[] = {
#ifdef CONFIG_SERIAL_BFIN_UART0
{ {
.start = 0xFFC00400, .start = 0xFFC00400,
.end = 0xFFC004FF, .end = 0xFFC004FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, { },
#endif
#ifdef CONFIG_SERIAL_BFIN_UART1
{
.start = 0xFFC02000, .start = 0xFFC02000,
.end = 0xFFC020FF, .end = 0xFFC020FF,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
#endif
}; };
static struct platform_device bfin_uart_device = { static struct platform_device bfin_uart_device = {
...@@ -669,6 +698,10 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -669,6 +698,10 @@ static struct platform_device *stamp_devices[] __initdata = {
&dm9000_device, &dm9000_device,
#endif #endif
#if defined(CONFIG_AX88180) || defined(CONFIG_AX88180_MODULE)
&ax88180_device,
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
&bfin_mac_device, &bfin_mac_device,
#endif #endif
...@@ -730,3 +763,14 @@ void native_machine_restart(char *cmd) ...@@ -730,3 +763,14 @@ void native_machine_restart(char *cmd)
if ((bfin_read_SYSCR() & 0x7) == 0x3) if ((bfin_read_SYSCR() & 0x7) == 0x3)
bfin_gpio_reset_spi0_ssel1(); bfin_gpio_reset_spi0_ssel1();
} }
/*
* Currently the MAC address is saved in Flash by U-Boot
*/
#define FLASH_MAC 0x203f0000
void bfin_get_ether_addr(char *addr)
{
*(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
*(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
}
EXPORT_SYMBOL(bfin_get_ether_addr);
arch/blackfin/mach-bf548/Kconfig
View file @ b5faa4b8
if (BF54x) if (BF54x)
source "arch/blackfin/mach-bf548/boards/Kconfig"
menu "BF548 Specific Configuration" menu "BF548 Specific Configuration"
config DEB_DMA_URGENT config DEB_DMA_URGENT
......
arch/blackfin/mach-bf548/boards/Kconfig 0 → 100644
View file @ b5faa4b8
choice
prompt "System type"
default BFIN548_EZKIT
help
Select your board!
config BFIN548_EZKIT
bool "BF548-EZKIT"
help
BFIN548-EZKIT board support.
endchoice
arch/blackfin/mach-bf548/boards/Makefile
View file @ b5faa4b8
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
# arch/blackfin/mach-bf548/boards/Makefile # arch/blackfin/mach-bf548/boards/Makefile
# #
obj-$(CONFIG_BFIN548_EZKIT) += ezkit.o led.o obj-$(CONFIG_BFIN548_EZKIT) += ezkit.o led.o
arch/blackfin/mach-bf548/boards/ezkit.c
View file @ b5faa4b8
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/nand.h> #include <asm/nand.h>
#include <asm/portmux.h>
#include <asm/mach/bf54x_keys.h> #include <asm/mach/bf54x_keys.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/spi/ad7877.h> #include <linux/spi/ad7877.h>
...@@ -377,7 +378,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { ...@@ -377,7 +378,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
static struct bfin5xx_spi_chip spi_ad7877_chip_info = { static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
.cs_change_per_word = 1, .cs_change_per_word = 0,
.enable_dma = 0, .enable_dma = 0,
.bits_per_word = 16, .bits_per_word = 16,
}; };
...@@ -453,9 +454,10 @@ static struct resource bfin_spi1_resource[] = { ...@@ -453,9 +454,10 @@ static struct resource bfin_spi1_resource[] = {
}; };
/* SPI controller data */ /* SPI controller data */
static struct bfin5xx_spi_master bf54x_spi_master_info = { static struct bfin5xx_spi_master bf54x_spi_master_info0 = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
static struct platform_device bf54x_spi_master0 = { static struct platform_device bf54x_spi_master0 = {
...@@ -464,17 +466,23 @@ static struct platform_device bf54x_spi_master0 = { ...@@ -464,17 +466,23 @@ static struct platform_device bf54x_spi_master0 = {
.num_resources = ARRAY_SIZE(bfin_spi0_resource), .num_resources = ARRAY_SIZE(bfin_spi0_resource),
.resource = bfin_spi0_resource, .resource = bfin_spi0_resource,
.dev = { .dev = {
.platform_data = &bf54x_spi_master_info, /* Passed to driver */ .platform_data = &bf54x_spi_master_info0, /* Passed to driver */
}, },
}; };
static struct bfin5xx_spi_master bf54x_spi_master_info1 = {
.num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0},
};
static struct platform_device bf54x_spi_master1 = { static struct platform_device bf54x_spi_master1 = {
.name = "bfin-spi", .name = "bfin-spi",
.id = 1, /* Bus number */ .id = 1, /* Bus number */
.num_resources = ARRAY_SIZE(bfin_spi1_resource), .num_resources = ARRAY_SIZE(bfin_spi1_resource),
.resource = bfin_spi1_resource, .resource = bfin_spi1_resource,
.dev = { .dev = {
.platform_data = &bf54x_spi_master_info, /* Passed to driver */ .platform_data = &bf54x_spi_master_info1, /* Passed to driver */
}, },
}; };
#endif /* spi master and devices */ #endif /* spi master and devices */
...@@ -500,6 +508,7 @@ static struct platform_device i2c_bfin_twi0_device = { ...@@ -500,6 +508,7 @@ static struct platform_device i2c_bfin_twi0_device = {
.resource = bfin_twi0_resource, .resource = bfin_twi0_resource,
}; };
#if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */
static struct resource bfin_twi1_resource[] = { static struct resource bfin_twi1_resource[] = {
[0] = { [0] = {
.start = TWI1_REGBASE, .start = TWI1_REGBASE,
...@@ -520,6 +529,7 @@ static struct platform_device i2c_bfin_twi1_device = { ...@@ -520,6 +529,7 @@ static struct platform_device i2c_bfin_twi1_device = {
.resource = bfin_twi1_resource, .resource = bfin_twi1_resource,
}; };
#endif #endif
#endif
static struct platform_device *ezkit_devices[] __initdata = { static struct platform_device *ezkit_devices[] __initdata = {
#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
...@@ -569,8 +579,10 @@ static struct platform_device *ezkit_devices[] __initdata = { ...@@ -569,8 +579,10 @@ static struct platform_device *ezkit_devices[] __initdata = {
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
&i2c_bfin_twi0_device, &i2c_bfin_twi0_device,
#if !defined(CONFIG_BF542)
&i2c_bfin_twi1_device, &i2c_bfin_twi1_device,
#endif #endif
#endif
}; };
static int __init stamp_init(void) static int __init stamp_init(void)
......
arch/blackfin/mach-bf548/head.S
View file @ b5faa4b8
...@@ -158,6 +158,27 @@ ENTRY(__stext) ...@@ -158,6 +158,27 @@ ENTRY(__stext)
w[p2] = r0; w[p2] = r0;
ssync; ssync;
p2.h = hi(EBIU_MBSCTL);
p2.l = lo(EBIU_MBSCTL);
r0.h = hi(CONFIG_EBIU_MBSCTLVAL);
r0.l = lo(CONFIG_EBIU_MBSCTLVAL);
[p2] = r0;
ssync;
p2.h = hi(EBIU_MODE);
p2.l = lo(EBIU_MODE);
r0.h = hi(CONFIG_EBIU_MODEVAL);
r0.l = lo(CONFIG_EBIU_MODEVAL);
[p2] = r0;
ssync;
p2.h = hi(EBIU_FCTL);
p2.l = lo(EBIU_FCTL);
r0.h = hi(CONFIG_EBIU_FCTLVAL);
r0.l = lo(CONFIG_EBIU_FCTLVAL);
[p2] = r0;
ssync;
/* This section keeps the processor in supervisor mode /* This section keeps the processor in supervisor mode
* during kernel boot. Switches to user mode at end of boot. * during kernel boot. Switches to user mode at end of boot.
* See page 3-9 of Hardware Reference manual for documentation. * See page 3-9 of Hardware Reference manual for documentation.
......
arch/blackfin/mach-bf561/Kconfig
View file @ b5faa4b8
if BF561 if (BF561)
source "arch/blackfin/mach-bf561/boards/Kconfig"
menu "BF561 Specific Configuration" menu "BF561 Specific Configuration"
......
arch/blackfin/mach-bf561/boards/Kconfig 0 → 100644
View file @ b5faa4b8
choice
prompt "System type"
default BFIN561_EZKIT
help
Select your board!
config BFIN561_EZKIT
bool "BF561-EZKIT"
help
BF561-EZKIT-LITE board support.
config BFIN561_TEPLA
bool "BF561-TEPLA"
help
BF561-TEPLA board support.
config BFIN561_BLUETECHNIX_CM
bool "Bluetechnix CM-BF561"
help
CM-BF561 support for EVAL- and DEV-Board.
config GENERIC_BF561_BOARD
bool "Generic"
help
Generic or Custom board support.
endchoice
arch/blackfin/mach-bf561/boards/Makefile
View file @ b5faa4b8
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# arch/blackfin/mach-bf561/boards/Makefile # arch/blackfin/mach-bf561/boards/Makefile
# #
obj-$(CONFIG_GENERIC_BOARD) += generic_board.o obj-$(CONFIG_GENERIC_BF561_BOARD) += generic_board.o
obj-$(CONFIG_BFIN561_BLUETECHNIX_CM) += cm_bf561.o obj-$(CONFIG_BFIN561_BLUETECHNIX_CM) += cm_bf561.o
obj-$(CONFIG_BFIN561_EZKIT) += ezkit.o obj-$(CONFIG_BFIN561_EZKIT) += ezkit.o
obj-$(CONFIG_BFIN561_TEPLA) += tepla.o obj-$(CONFIG_BFIN561_TEPLA) += tepla.o
arch/blackfin/mach-bf561/boards/cm_bf561.c
View file @ b5faa4b8
...@@ -33,11 +33,12 @@ ...@@ -33,11 +33,12 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#include <linux/usb_isp1362.h> #include <linux/usb/isp1362.h>
#include <linux/pata_platform.h> #include <linux/pata_platform.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/portmux.h>
/* /*
* Name the Board for the /proc/cpuinfo * Name the Board for the /proc/cpuinfo
...@@ -182,6 +183,7 @@ static struct resource bfin_spi0_resource[] = { ...@@ -182,6 +183,7 @@ static struct resource bfin_spi0_resource[] = {
static struct bfin5xx_spi_master bfin_spi0_info = { static struct bfin5xx_spi_master bfin_spi0_info = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
static struct platform_device bfin_spi0_device = { static struct platform_device bfin_spi0_device = {
......
arch/blackfin/mach-bf561/boards/ezkit.c
View file @ b5faa4b8
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <linux/pata_platform.h> #include <linux/pata_platform.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/portmux.h>
/* /*
* Name the Board for the /proc/cpuinfo * Name the Board for the /proc/cpuinfo
...@@ -115,6 +116,28 @@ static struct platform_device smc91x_device = { ...@@ -115,6 +116,28 @@ static struct platform_device smc91x_device = {
}; };
#endif #endif
#if defined(CONFIG_AX88180) || defined(CONFIG_AX88180_MODULE)
static struct resource ax88180_resources[] = {
[0] = {
.start = 0x2c000000,
.end = 0x2c000000 + 0x8000,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_PF10,
.end = IRQ_PF10,
.flags = (IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL),
},
};
static struct platform_device ax88180_device = {
.name = "ax88180",
.id = -1,
.num_resources = ARRAY_SIZE(ax88180_resources),
.resource = ax88180_resources,
};
#endif
#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE) #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
static struct resource bfin_uart_resources[] = { static struct resource bfin_uart_resources[] = {
{ {
...@@ -160,6 +183,7 @@ static struct resource bfin_spi0_resource[] = { ...@@ -160,6 +183,7 @@ static struct resource bfin_spi0_resource[] = {
static struct bfin5xx_spi_master bfin_spi0_info = { static struct bfin5xx_spi_master bfin_spi0_info = {
.num_chipselect = 8, .num_chipselect = 8,
.enable_dma = 1, /* master has the ability to do dma transfer */ .enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
}; };
static struct platform_device bfin_spi0_device = { static struct platform_device bfin_spi0_device = {
...@@ -226,6 +250,11 @@ static struct platform_device *ezkit_devices[] __initdata = { ...@@ -226,6 +250,11 @@ static struct platform_device *ezkit_devices[] __initdata = {
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
&smc91x_device, &smc91x_device,
#endif #endif
#if defined(CONFIG_AX88180) || defined(CONFIG_AX88180_MODULE)
&ax88180_device,
#endif
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
&bfin_spi0_device, &bfin_spi0_device,
#endif #endif
......
arch/blackfin/mach-bf561/boards/generic_board.c
View file @ b5faa4b8
...@@ -48,10 +48,6 @@ static struct resource smc91x_resources[] = { ...@@ -48,10 +48,6 @@ static struct resource smc91x_resources[] = {
.end = IRQ_PROG_INTB, .end = IRQ_PROG_INTB,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
}, { }, {
/*
* denotes the flag pin and is used directly if
* CONFIG_IRQCHIP_DEMUX_GPIO is defined.
*/
.start = IRQ_PF9, .start = IRQ_PF9,
.end = IRQ_PF9, .end = IRQ_PF9,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
......
arch/blackfin/mach-bf561/boards/tepla.c
View file @ b5faa4b8
...@@ -31,10 +31,6 @@ static struct resource smc91x_resources[] = { ...@@ -31,10 +31,6 @@ static struct resource smc91x_resources[] = {
.end = IRQ_PROG_INTB, .end = IRQ_PROG_INTB,
.flags = IORESOURCE_IRQ|IORESOURCE_IRQ_HIGHLEVEL, .flags = IORESOURCE_IRQ|IORESOURCE_IRQ_HIGHLEVEL,
}, { }, {
/*
* denotes the flag pin and is used directly if
* CONFIG_IRQCHIP_DEMUX_GPIO is defined.
*/
.start = IRQ_PF7, .start = IRQ_PF7,
.end = IRQ_PF7, .end = IRQ_PF7,
.flags = IORESOURCE_IRQ|IORESOURCE_IRQ_HIGHLEVEL, .flags = IORESOURCE_IRQ|IORESOURCE_IRQ_HIGHLEVEL,
......
arch/blackfin/mach-common/cplbinfo.c
View file @ b5faa4b8
...@@ -91,7 +91,7 @@ static char *cplb_print_entry(char *buf, int type) ...@@ -91,7 +91,7 @@ static char *cplb_print_entry(char *buf, int type)
} else } else
buf += sprintf(buf, "Data CPLB entry:\n"); buf += sprintf(buf, "Data CPLB entry:\n");
buf += sprintf(buf, "Address\t\tData\tSize\tValid\tLocked\tSwapin\n\tiCount\toCount\n"); buf += sprintf(buf, "Address\t\tData\tSize\tValid\tLocked\tSwapin\tiCount\toCount\n");
while (*p_addr != 0xffffffff) { while (*p_addr != 0xffffffff) {
entry = cplb_find_entry(cplb_addr, cplb_data, *p_addr, *p_data); entry = cplb_find_entry(cplb_addr, cplb_data, *p_addr, *p_data);
......
arch/blackfin/mach-common/cplbmgr.S
View file @ b5faa4b8
...@@ -73,7 +73,7 @@ ENTRY(_cplb_mgr) ...@@ -73,7 +73,7 @@ ENTRY(_cplb_mgr)
/* ICPLB Miss Exception. We need to choose one of the /* ICPLB Miss Exception. We need to choose one of the
* currently-installed CPLBs, and replace it with one * currently-installed CPLBs, and replace it with one
* from the configuration table. * from the configuration table.
*/ */
P4.L = LO(ICPLB_FAULT_ADDR); P4.L = LO(ICPLB_FAULT_ADDR);
P4.H = HI(ICPLB_FAULT_ADDR); P4.H = HI(ICPLB_FAULT_ADDR);
...@@ -222,7 +222,7 @@ ENTRY(_cplb_mgr) ...@@ -222,7 +222,7 @@ ENTRY(_cplb_mgr)
/* See if failed address > start address */ /* See if failed address > start address */
CC = R4 <= R0(IU); CC = R4 <= R0(IU);
IF !CC JUMP .Linext; IF !CC JUMP .Linext;
/* extract page size (17:16)*/ /* extract page size (17:16)*/
R3 = EXTRACT(R2, R1.L) (Z); R3 = EXTRACT(R2, R1.L) (Z);
...@@ -271,16 +271,27 @@ ENTRY(_cplb_mgr) ...@@ -271,16 +271,27 @@ ENTRY(_cplb_mgr)
/* FAILED CASES*/ /* FAILED CASES*/
.Lno_page_in_table: .Lno_page_in_table:
( R7:4,P5:3 ) = [SP++];
R0 = CPLB_NO_ADDR_MATCH; R0 = CPLB_NO_ADDR_MATCH;
RTS; JUMP .Lfail_ret;
.Lall_locked: .Lall_locked:
( R7:4,P5:3 ) = [SP++];
R0 = CPLB_NO_UNLOCKED; R0 = CPLB_NO_UNLOCKED;
RTS; JUMP .Lfail_ret;
.Lprot_violation: .Lprot_violation:
( R7:4,P5:3 ) = [SP++];
R0 = CPLB_PROT_VIOL; R0 = CPLB_PROT_VIOL;
.Lfail_ret:
/* Make sure we turn protection/cache back on, even in the failing case */
BITSET(R5,ENICPLB_P);
CLI R2;
SSYNC; /* SSYNC required before writing to IMEM_CONTROL. */
.align 8;
[P4] = R5;
SSYNC;
STI R2;
( R7:4,P5:3 ) = [SP++];
RTS; RTS;
.Ldcplb_write: .Ldcplb_write:
......
arch/blackfin/mach-common/entry.S
View file @ b5faa4b8
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
* after a timer-interrupt and after each system call. * after a timer-interrupt and after each system call.
*/ */
#include <linux/init.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#include <asm/blackfin.h> #include <asm/blackfin.h>
...@@ -71,25 +71,44 @@ ENDPROC(_safe_speculative_execution) ...@@ -71,25 +71,44 @@ ENDPROC(_safe_speculative_execution)
* This one does not lower the level to IRQ5, and thus can be used to * This one does not lower the level to IRQ5, and thus can be used to
* patch up CPLB misses on the kernel stack. * patch up CPLB misses on the kernel stack.
*/ */
ENTRY(_ex_dcplb)
#if ANOMALY_05000261 #if ANOMALY_05000261
#define _ex_dviol _ex_workaround_261
#define _ex_dmiss _ex_workaround_261
#define _ex_dmult _ex_workaround_261
ENTRY(_ex_workaround_261)
/* /*
* Work around an anomaly: if we see a new DCPLB fault, return * Work around an anomaly: if we see a new DCPLB fault, return
* without doing anything. Then, if we get the same fault again, * without doing anything. Then, if we get the same fault again,
* handle it. * handle it.
*/ */
P4 = R7; /* Store EXCAUSE */
p5.l = _last_cplb_fault_retx; p5.l = _last_cplb_fault_retx;
p5.h = _last_cplb_fault_retx; p5.h = _last_cplb_fault_retx;
r7 = [p5]; r7 = [p5];
r6 = retx; r6 = retx;
[p5] = r6; [p5] = r6;
cc = r6 == r7; cc = r6 == r7;
if !cc jump _return_from_exception; if !cc jump _bfin_return_from_exception;
/* fall through */ /* fall through */
R7 = P4;
R6 = 0x26; /* Data CPLB Miss */
cc = R6 == R7;
if cc jump _ex_dcplb_miss (BP);
/* Handle 0x23 Data CPLB Protection Violation
* and Data CPLB Multiple Hits - Linux Trap Zero
*/
jump _ex_trap_c;
ENDPROC(_ex_workaround_261)
#else
#define _ex_dviol _ex_trap_c
#define _ex_dmiss _ex_dcplb_miss
#define _ex_dmult _ex_trap_c
#endif #endif
ENDPROC(_ex_dcplb)
ENTRY(_ex_icplb) ENTRY(_ex_dcplb_miss)
ENTRY(_ex_icplb_miss)
(R7:6,P5:4) = [sp++]; (R7:6,P5:4) = [sp++];
ASTAT = [sp++]; ASTAT = [sp++];
SAVE_ALL_SYS SAVE_ALL_SYS
...@@ -98,7 +117,7 @@ ENTRY(_ex_icplb) ...@@ -98,7 +117,7 @@ ENTRY(_ex_icplb)
RESTORE_ALL_SYS RESTORE_ALL_SYS
SP = EX_SCRATCH_REG; SP = EX_SCRATCH_REG;
rtx; rtx;
ENDPROC(_ex_icplb) ENDPROC(_ex_icplb_miss)
ENTRY(_ex_syscall) ENTRY(_ex_syscall)
DEBUG_START_HWTRACE(p5, r7) DEBUG_START_HWTRACE(p5, r7)
...@@ -120,7 +139,7 @@ ENTRY(_ex_single_step) ...@@ -120,7 +139,7 @@ ENTRY(_ex_single_step)
r7 = retx; r7 = retx;
r6 = reti; r6 = reti;
cc = r7 == r6; cc = r7 == r6;
if cc jump _return_from_exception if cc jump _bfin_return_from_exception
r7 = syscfg; r7 = syscfg;
bitclr (r7, 0); bitclr (r7, 0);
syscfg = R7; syscfg = R7;
...@@ -137,8 +156,9 @@ ENTRY(_ex_single_step) ...@@ -137,8 +156,9 @@ ENTRY(_ex_single_step)
r7 = [p4]; r7 = [p4];
cc = r6 == r7; cc = r6 == r7;
if !cc jump _ex_trap_c; if !cc jump _ex_trap_c;
ENDPROC(_ex_single_step)
ENTRY(_return_from_exception) ENTRY(_bfin_return_from_exception)
DEBUG_START_HWTRACE(p5, r7) DEBUG_START_HWTRACE(p5, r7)
#if ANOMALY_05000257 #if ANOMALY_05000257
R7=LC0; R7=LC0;
...@@ -150,7 +170,7 @@ ENTRY(_return_from_exception) ...@@ -150,7 +170,7 @@ ENTRY(_return_from_exception)
ASTAT = [sp++]; ASTAT = [sp++];
sp = EX_SCRATCH_REG; sp = EX_SCRATCH_REG;
rtx; rtx;
ENDPROC(_ex_soft_bp) ENDPROC(_bfin_return_from_exception)
ENTRY(_handle_bad_cplb) ENTRY(_handle_bad_cplb)
/* To get here, we just tried and failed to change a CPLB /* To get here, we just tried and failed to change a CPLB
...@@ -843,7 +863,7 @@ ENTRY(_ex_trace_buff_full) ...@@ -843,7 +863,7 @@ ENTRY(_ex_trace_buff_full)
LC0 = [sp++]; LC0 = [sp++];
P2 = [sp++]; P2 = [sp++];
P3 = [sp++]; P3 = [sp++];
jump _return_from_exception; jump _bfin_return_from_exception;
ENDPROC(_ex_trace_buff_full) ENDPROC(_ex_trace_buff_full)
#if CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN == 4 #if CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN == 4
...@@ -861,7 +881,7 @@ ENTRY(_software_trace_buff) ...@@ -861,7 +881,7 @@ ENTRY(_software_trace_buff)
#endif /* CONFIG_DEBUG_BFIN_HWTRACE_EXPAND */ #endif /* CONFIG_DEBUG_BFIN_HWTRACE_EXPAND */
#if CONFIG_EARLY_PRINTK #if CONFIG_EARLY_PRINTK
.section .init.text __INIT
ENTRY(_early_trap) ENTRY(_early_trap)
SAVE_ALL_SYS SAVE_ALL_SYS
trace_buffer_stop(p0,r0); trace_buffer_stop(p0,r0);
...@@ -896,6 +916,7 @@ ENTRY(_early_trap) ...@@ -896,6 +916,7 @@ ENTRY(_early_trap)
call _early_trap_c; call _early_trap_c;
SP += 12; SP += 12;
ENDPROC(_early_trap) ENDPROC(_early_trap)
__FINIT
#endif /* CONFIG_EARLY_PRINTK */ #endif /* CONFIG_EARLY_PRINTK */
/* /*
...@@ -908,6 +929,7 @@ ENDPROC(_early_trap) ...@@ -908,6 +929,7 @@ ENDPROC(_early_trap)
#else #else
.data .data
#endif #endif
ENTRY(_ex_table) ENTRY(_ex_table)
/* entry for each EXCAUSE[5:0] /* entry for each EXCAUSE[5:0]
* This table must be in sync with the table in ./kernel/traps.c * This table must be in sync with the table in ./kernel/traps.c
...@@ -952,16 +974,16 @@ ENTRY(_ex_table) ...@@ -952,16 +974,16 @@ ENTRY(_ex_table)
.long _ex_trap_c /* 0x20 - Reserved */ .long _ex_trap_c /* 0x20 - Reserved */
.long _ex_trap_c /* 0x21 - Undefined Instruction */ .long _ex_trap_c /* 0x21 - Undefined Instruction */
.long _ex_trap_c /* 0x22 - Illegal Instruction Combination */ .long _ex_trap_c /* 0x22 - Illegal Instruction Combination */
.long _ex_dcplb /* 0x23 - Data CPLB Protection Violation */ .long _ex_dviol /* 0x23 - Data CPLB Protection Violation */
.long _ex_trap_c /* 0x24 - Data access misaligned */ .long _ex_trap_c /* 0x24 - Data access misaligned */
.long _ex_trap_c /* 0x25 - Unrecoverable Event */ .long _ex_trap_c /* 0x25 - Unrecoverable Event */
.long _ex_dcplb /* 0x26 - Data CPLB Miss */ .long _ex_dmiss /* 0x26 - Data CPLB Miss */
.long _ex_trap_c /* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero */ .long _ex_dmult /* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero */
.long _ex_trap_c /* 0x28 - Emulation Watchpoint */ .long _ex_trap_c /* 0x28 - Emulation Watchpoint */
.long _ex_trap_c /* 0x29 - Instruction fetch access error (535 only) */ .long _ex_trap_c /* 0x29 - Instruction fetch access error (535 only) */
.long _ex_trap_c /* 0x2A - Instruction fetch misaligned */ .long _ex_trap_c /* 0x2A - Instruction fetch misaligned */
.long _ex_icplb /* 0x2B - Instruction CPLB protection Violation */ .long _ex_trap_c /* 0x2B - Instruction CPLB protection Violation */
.long _ex_icplb /* 0x2C - Instruction CPLB miss */ .long _ex_icplb_miss /* 0x2C - Instruction CPLB miss */
.long _ex_trap_c /* 0x2D - Instruction CPLB Multiple Hits */ .long _ex_trap_c /* 0x2D - Instruction CPLB Multiple Hits */
.long _ex_trap_c /* 0x2E - Illegal use of Supervisor Resource */ .long _ex_trap_c /* 0x2E - Illegal use of Supervisor Resource */
.long _ex_trap_c /* 0x2E - Illegal use of Supervisor Resource */ .long _ex_trap_c /* 0x2E - Illegal use of Supervisor Resource */
......
arch/blackfin/mach-common/interrupt.S
View file @ b5faa4b8
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include <asm/blackfin.h> #include <asm/blackfin.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <linux/autoconf.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/entry.h> #include <asm/entry.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
......
arch/blackfin/mach-common/ints-priority-dc.c
View file @ b5faa4b8
...@@ -181,7 +181,6 @@ static struct irq_chip bf561_internal_irqchip = { ...@@ -181,7 +181,6 @@ static struct irq_chip bf561_internal_irqchip = {
.unmask = bf561_internal_unmask_irq, .unmask = bf561_internal_unmask_irq,
}; };
#ifdef CONFIG_IRQCHIP_DEMUX_GPIO
static unsigned short gpio_enabled[gpio_bank(MAX_BLACKFIN_GPIOS)]; static unsigned short gpio_enabled[gpio_bank(MAX_BLACKFIN_GPIOS)];
static unsigned short gpio_edge_triggered[gpio_bank(MAX_BLACKFIN_GPIOS)]; static unsigned short gpio_edge_triggered[gpio_bank(MAX_BLACKFIN_GPIOS)];
...@@ -362,8 +361,6 @@ static void bf561_demux_gpio_irq(unsigned int inta_irq, ...@@ -362,8 +361,6 @@ static void bf561_demux_gpio_irq(unsigned int inta_irq,
} }
#endif /* CONFIG_IRQCHIP_DEMUX_GPIO */
void __init init_exception_vectors(void) void __init init_exception_vectors(void)
{ {
SSYNC(); SSYNC();
...@@ -413,26 +410,21 @@ int __init init_arch_irq(void) ...@@ -413,26 +410,21 @@ int __init init_arch_irq(void)
set_irq_chip(irq, &bf561_core_irqchip); set_irq_chip(irq, &bf561_core_irqchip);
else else
set_irq_chip(irq, &bf561_internal_irqchip); set_irq_chip(irq, &bf561_internal_irqchip);
#ifdef CONFIG_IRQCHIP_DEMUX_GPIO
if ((irq != IRQ_PROG0_INTA) && if ((irq != IRQ_PROG0_INTA) &&
(irq != IRQ_PROG1_INTA) && (irq != IRQ_PROG2_INTA)) { (irq != IRQ_PROG1_INTA) &&
#endif (irq != IRQ_PROG2_INTA))
set_irq_handler(irq, handle_simple_irq); set_irq_handler(irq, handle_simple_irq);
#ifdef CONFIG_IRQCHIP_DEMUX_GPIO else
} else {
set_irq_chained_handler(irq, bf561_demux_gpio_irq); set_irq_chained_handler(irq, bf561_demux_gpio_irq);
}
#endif
} }
#ifdef CONFIG_IRQCHIP_DEMUX_GPIO
for (irq = IRQ_PF0; irq <= IRQ_PF47; irq++) { for (irq = IRQ_PF0; irq <= IRQ_PF47; irq++) {
set_irq_chip(irq, &bf561_gpio_irqchip); set_irq_chip(irq, &bf561_gpio_irqchip);
/* if configured as edge, then will be changed to do_edge_IRQ */ /* if configured as edge, then will be changed to do_edge_IRQ */
set_irq_handler(irq, handle_level_irq); set_irq_handler(irq, handle_level_irq);
} }
#endif
bfin_write_IMASK(0); bfin_write_IMASK(0);
CSYNC(); CSYNC();
ilat = bfin_read_ILAT(); ilat = bfin_read_ILAT();
...@@ -457,9 +449,8 @@ int __init init_arch_irq(void) ...@@ -457,9 +449,8 @@ int __init init_arch_irq(void)
} }
#ifdef CONFIG_DO_IRQ_L1 #ifdef CONFIG_DO_IRQ_L1
void do_irq(int vec, struct pt_regs *fp)__attribute__((l1_text)); __attribute__((l1_text))
#endif #endif
void do_irq(int vec, struct pt_regs *fp) void do_irq(int vec, struct pt_regs *fp)
{ {
if (vec == EVT_IVTMR_P) { if (vec == EVT_IVTMR_P) {
......
arch/blackfin/mach-common/irqpanic.c
View file @ b5faa4b8
...@@ -153,27 +153,29 @@ asmlinkage void irq_panic(int reason, struct pt_regs *regs) ...@@ -153,27 +153,29 @@ asmlinkage void irq_panic(int reason, struct pt_regs *regs)
case (SEQSTAT_HWERRCAUSE_SYSTEM_MMR): /* System MMR Error */ case (SEQSTAT_HWERRCAUSE_SYSTEM_MMR): /* System MMR Error */
info.si_code = BUS_ADRALN; info.si_code = BUS_ADRALN;
sig = SIGBUS; sig = SIGBUS;
printk(KERN_EMERG HWC_x2); printk(KERN_EMERG HWC_x2(KERN_EMERG));
break; break;
case (SEQSTAT_HWERRCAUSE_EXTERN_ADDR): /* External Memory Addressing Error */ case (SEQSTAT_HWERRCAUSE_EXTERN_ADDR): /* External Memory Addressing Error */
info.si_code = BUS_ADRERR; info.si_code = BUS_ADRERR;
sig = SIGBUS; sig = SIGBUS;
printk(KERN_EMERG HWC_x3); printk(KERN_EMERG HWC_x3(KERN_EMERG));
break; break;
case (SEQSTAT_HWERRCAUSE_PERF_FLOW): /* Performance Monitor Overflow */ case (SEQSTAT_HWERRCAUSE_PERF_FLOW): /* Performance Monitor Overflow */
printk(KERN_EMERG HWC_x12); printk(KERN_EMERG HWC_x12(KERN_EMERG));
break; break;
case (SEQSTAT_HWERRCAUSE_RAISE_5): /* RAISE 5 instruction */ case (SEQSTAT_HWERRCAUSE_RAISE_5): /* RAISE 5 instruction */
printk(KERN_EMERG HWC_x18); printk(KERN_EMERG HWC_x18(KERN_EMERG));
break; break;
default: /* Reserved */ default: /* Reserved */
printk(KERN_EMERG HWC_default); printk(KERN_EMERG HWC_default(KERN_EMERG));
break; break;
} }
} }
regs->ipend = bfin_read_IPEND(); regs->ipend = bfin_read_IPEND();
dump_bfin_regs(regs, (void *)regs->pc); dump_bfin_process(regs);
dump_bfin_mem((void *)regs->pc);
show_regs(regs);
if (0 == (info.si_signo = sig) || 0 == user_mode(regs)) /* in kernelspace */ if (0 == (info.si_signo = sig) || 0 == user_mode(regs)) /* in kernelspace */
panic("Unhandled IRQ or exceptions!\n"); panic("Unhandled IRQ or exceptions!\n");
else { /* in userspace */ else { /* in userspace */
......
arch/blackfin/mm/blackfin_sram.c
View file @ b5faa4b8
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <linux/autoconf.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
......
drivers/input/serio/Kconfig
View file @ b5faa4b8
This diff is collapsed.
drivers/net/bfin_mac.c
View file @ b5faa4b8
This diff is collapsed.
drivers/net/bfin_mac.h
View file @ b5faa4b8
This diff is collapsed.
drivers/rtc/Kconfig
View file @ b5faa4b8
This diff is collapsed.
drivers/serial/Kconfig
View file @ b5faa4b8
This diff is collapsed.
drivers/spi/Kconfig
View file @ b5faa4b8
This diff is collapsed.
drivers/video/console/Kconfig
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/bfin-global.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/cplbinit.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/delay.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/io.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf527/irq.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf527/mem_map.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf533/irq.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf533/mem_map.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf537/irq.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf537/mem_map.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf548/bf548.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf548/defBF544.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf548/defBF548.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf548/irq.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf548/mem_map.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf561/bf561.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf561/defBF561.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf561/irq.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/mach-bf561/mem_map.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/page_offset.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/string.h
View file @ b5faa4b8
This diff is collapsed.
include/asm-blackfin/traps.h
View file @ b5faa4b8
This diff is collapsed.
init/Kconfig
View file @ b5faa4b8
This diff is collapsed.
lib/Kconfig.debug
View file @ b5faa4b8
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment