Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/vapier/blackfin

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (88 commits)
  Blackfin: Convert BUG() to use unreachable()
  Blackfin: define __NR_recvmmsg
  Blackfin: drop duplicate sched_clock
  Blackfin: NOMPU: skip DMA ICPLB hole when it is redundant
  Blackfin: MPU: add missing __init markings
  Blackfin: add support for TIF_NOTIFY_RESUME
  Blackfin: kgdb_test: clean up code a bit
  Blackfin: convert kgdbtest to proc_fops
  Blackfin: convert cyc2ns() to clocksource_cyc2ns()
  Blackfin: ip0x: pull in asm/portmux.h for P_xxx defines
  Blackfin: drop unused ax88180 resources
  Blackfin: bf537-stamp: add ADF702x network driver resources
  Blackfin: bf537-stamp: add CAN resources
  Blackfin: bf537-stamp: add AD5258 i2c address
  Blackfin: bf537-stamp: add adau1761 i2c address
  Blackfin: bf537-stamp: add adau1371 i2c address
  Blackfin: bf537-stamp: add ADP8870 resources
  Blackfin: bf537-stamp: kill AD714x board-specific Kconfigs
  Blackfin: bf537-stamp: update ADP5520 resources
  Blackfin: bf537-stamp: add ADXL346 orientation sensing support
  ...
  • Loading branch information
Linus Torvalds committed Dec 16, 2009
2 parents e4bdda1 + 64a2b16 commit 525995d
Show file tree
Hide file tree
Showing 137 changed files with 6,847 additions and 13,625 deletions.
3 changes: 0 additions & 3 deletions Documentation/blackfin/00-INDEX
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
00-INDEX
- This file

cache-lock.txt
- HOWTO for blackfin cache locking.

cachefeatures.txt
- Supported cache features.

Expand Down
6 changes: 6 additions & 0 deletions Documentation/blackfin/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
obj-m := gptimers-example.o

all: modules

modules clean:
$(MAKE) -C ../.. SUBDIRS=$(PWD) $@
48 changes: 0 additions & 48 deletions Documentation/blackfin/cache-lock.txt

This file was deleted.

10 changes: 0 additions & 10 deletions Documentation/blackfin/cachefeatures.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,6 @@
icplb_flush();
dcplb_flush();

- Locking the cache.

cache_grab_lock();
cache_lock();

Please refer linux-2.6.x/Documentation/blackfin/cache-lock.txt for how to
lock the cache.

Locking the cache is optional feature.

- Miscellaneous cache functions.

flush_cache_all();
Expand Down
83 changes: 83 additions & 0 deletions Documentation/blackfin/gptimers-example.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
/*
* Simple gptimers example
* http://docs.blackfin.uclinux.org/doku.php?id=linux-kernel:drivers:gptimers
*
* Copyright 2007-2009 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/

#include <linux/interrupt.h>
#include <linux/module.h>

#include <asm/gptimers.h>
#include <asm/portmux.h>

/* ... random driver includes ... */

#define DRIVER_NAME "gptimer_example"

struct gptimer_data {
uint32_t period, width;
};
static struct gptimer_data data;

/* ... random driver state ... */

static irqreturn_t gptimer_example_irq(int irq, void *dev_id)
{
struct gptimer_data *data = dev_id;

/* make sure it was our timer which caused the interrupt */
if (!get_gptimer_intr(TIMER5_id))
return IRQ_NONE;

/* read the width/period values that were captured for the waveform */
data->width = get_gptimer_pwidth(TIMER5_id);
data->period = get_gptimer_period(TIMER5_id);

/* acknowledge the interrupt */
clear_gptimer_intr(TIMER5_id);

/* tell the upper layers we took care of things */
return IRQ_HANDLED;
}

/* ... random driver code ... */

static int __init gptimer_example_init(void)
{
int ret;

/* grab the peripheral pins */
ret = peripheral_request(P_TMR5, DRIVER_NAME);
if (ret) {
printk(KERN_NOTICE DRIVER_NAME ": peripheral request failed\n");
return ret;
}

/* grab the IRQ for the timer */
ret = request_irq(IRQ_TIMER5, gptimer_example_irq, IRQF_SHARED, DRIVER_NAME, &data);
if (ret) {
printk(KERN_NOTICE DRIVER_NAME ": IRQ request failed\n");
peripheral_free(P_TMR5);
return ret;
}

/* setup the timer and enable it */
set_gptimer_config(TIMER5_id, WDTH_CAP | PULSE_HI | PERIOD_CNT | IRQ_ENA);
enable_gptimers(TIMER5bit);

return 0;
}
module_init(gptimer_example_init);

static void __exit gptimer_example_exit(void)
{
disable_gptimers(TIMER5bit);
free_irq(IRQ_TIMER5, &data);
peripheral_free(P_TMR5);
}
module_exit(gptimer_example_exit);

MODULE_LICENSE("BSD");
41 changes: 16 additions & 25 deletions arch/blackfin/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ config BLACKFIN
select HAVE_OPROFILE
select ARCH_WANT_OPTIONAL_GPIOLIB

config GENERIC_CSUM
def_bool y

config GENERIC_BUG
def_bool y
depends on BUG
Expand Down Expand Up @@ -177,7 +180,7 @@ config BF539
help
BF539 Processor Support.

config BF542
config BF542_std
bool "BF542"
help
BF542 Processor Support.
Expand All @@ -187,7 +190,7 @@ config BF542M
help
BF542 Processor Support.

config BF544
config BF544_std
bool "BF544"
help
BF544 Processor Support.
Expand All @@ -197,7 +200,7 @@ config BF544M
help
BF544 Processor Support.

config BF547
config BF547_std
bool "BF547"
help
BF547 Processor Support.
Expand All @@ -207,7 +210,7 @@ config BF547M
help
BF547 Processor Support.

config BF548
config BF548_std
bool "BF548"
help
BF548 Processor Support.
Expand All @@ -217,7 +220,7 @@ config BF548M
help
BF548 Processor Support.

config BF549
config BF549_std
bool "BF549"
help
BF549 Processor Support.
Expand Down Expand Up @@ -311,31 +314,11 @@ config BF_REV_NONE

endchoice

config BF51x
bool
depends on (BF512 || BF514 || BF516 || BF518)
default y

config BF52x
bool
depends on (BF522 || BF523 || BF524 || BF525 || BF526 || BF527)
default y

config BF53x
bool
depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537)
default y

config BF54xM
bool
depends on (BF542M || BF544M || BF547M || BF548M || BF549M)
default y

config BF54x
bool
depends on (BF542 || BF544 || BF547 || BF548 || BF549 || BF54xM)
default y

config MEM_GENERIC_BOARD
bool
depends on GENERIC_BOARD
Expand Down Expand Up @@ -917,6 +900,12 @@ config DMA_UNCACHED_2M
bool "Enable 2M DMA region"
config DMA_UNCACHED_1M
bool "Enable 1M DMA region"
config DMA_UNCACHED_512K
bool "Enable 512K DMA region"
config DMA_UNCACHED_256K
bool "Enable 256K DMA region"
config DMA_UNCACHED_128K
bool "Enable 128K DMA region"
config DMA_UNCACHED_NONE
bool "Disable DMA region"
endchoice
Expand Down Expand Up @@ -1278,6 +1267,8 @@ source "net/Kconfig"

source "drivers/Kconfig"

source "drivers/firmware/Kconfig"

source "fs/Kconfig"

source "arch/blackfin/Kconfig.debug"
Expand Down
4 changes: 3 additions & 1 deletion arch/blackfin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ GZFLAGS := -9
KBUILD_CFLAGS += $(call cc-option,-mno-fdpic)
KBUILD_AFLAGS += $(call cc-option,-mno-fdpic)
CFLAGS_MODULE += -mlong-calls
LDFLAGS_MODULE += -m elf32bfin
KALLSYMS += --symbol-prefix=_

KBUILD_DEFCONFIG := BF537-STAMP_defconfig
Expand Down Expand Up @@ -137,7 +138,7 @@ archclean:

INSTALL_PATH ?= /tftpboot
boot := arch/$(ARCH)/boot
BOOT_TARGETS = vmImage vmImage.bz2 vmImage.gz vmImage.lzma
BOOT_TARGETS = vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma
PHONY += $(BOOT_TARGETS) install
KBUILD_IMAGE := $(boot)/vmImage

Expand All @@ -151,6 +152,7 @@ install:

define archhelp
echo '* vmImage - Alias to selected kernel format (vmImage.gz by default)'
echo ' vmImage.bin - Uncompressed Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bin)'
echo ' vmImage.bz2 - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bz2)'
echo '* vmImage.gz - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)'
echo ' vmImage.lzma - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)'
Expand Down
6 changes: 5 additions & 1 deletion arch/blackfin/boot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

MKIMAGE := $(srctree)/scripts/mkuboot.sh

targets := vmImage vmImage.bz2 vmImage.gz vmImage.lzma
targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma
extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma

quiet_cmd_uimage = UIMAGE $@
Expand All @@ -29,6 +29,9 @@ $(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE
$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
$(call if_changed,lzma)

$(obj)/vmImage.bin: $(obj)/vmlinux.bin
$(call if_changed,uimage,none)

$(obj)/vmImage.bz2: $(obj)/vmlinux.bin.bz2
$(call if_changed,uimage,bzip2)

Expand All @@ -38,6 +41,7 @@ $(obj)/vmImage.gz: $(obj)/vmlinux.bin.gz
$(obj)/vmImage.lzma: $(obj)/vmlinux.bin.lzma
$(call if_changed,uimage,lzma)

suffix-y := bin
suffix-$(CONFIG_KERNEL_GZIP) := gz
suffix-$(CONFIG_KERNEL_BZIP2) := bz2
suffix-$(CONFIG_KERNEL_LZMA) := lzma
Expand Down
14 changes: 3 additions & 11 deletions arch/blackfin/configs/BF518F-EZBRD_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ CONFIG_COMPAT_BRK=y
CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
CONFIG_MMAP_ALLOW_UNINITIALIZED=y
# CONFIG_PROFILING is not set
# CONFIG_MARKERS is not set
CONFIG_HAVE_OPROFILE=y
Expand Down Expand Up @@ -316,6 +317,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_VIRT_TO_BUS=y
CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0
CONFIG_BFIN_GPTIMERS=m
# CONFIG_DMA_UNCACHED_4M is not set
# CONFIG_DMA_UNCACHED_2M is not set
Expand Down Expand Up @@ -438,17 +440,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
CONFIG_NET_DSA=y
# CONFIG_NET_DSA_TAG_DSA is not set
# CONFIG_NET_DSA_TAG_EDSA is not set
# CONFIG_NET_DSA_TAG_TRAILER is not set
CONFIG_NET_DSA_TAG_STPID=y
# CONFIG_NET_DSA_MV88E6XXX is not set
# CONFIG_NET_DSA_MV88E6060 is not set
# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
# CONFIG_NET_DSA_MV88E6131 is not set
# CONFIG_NET_DSA_MV88E6123_61_65 is not set
CONFIG_NET_DSA_KSZ8893M=y
# CONFIG_NET_DSA is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/blackfin/configs/BF526-EZBRD_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ CONFIG_COMPAT_BRK=y
CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
CONFIG_MMAP_ALLOW_UNINITIALIZED=y
# CONFIG_PROFILING is not set
# CONFIG_MARKERS is not set
CONFIG_HAVE_OPROFILE=y
Expand Down Expand Up @@ -321,6 +322,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_VIRT_TO_BUS=y
CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0
CONFIG_BFIN_GPTIMERS=m
# CONFIG_DMA_UNCACHED_4M is not set
# CONFIG_DMA_UNCACHED_2M is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/blackfin/configs/BF527-EZKIT_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ CONFIG_COMPAT_BRK=y
CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
CONFIG_MMAP_ALLOW_UNINITIALIZED=y
# CONFIG_PROFILING is not set
# CONFIG_MARKERS is not set
CONFIG_HAVE_OPROFILE=y
Expand Down Expand Up @@ -321,6 +322,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_VIRT_TO_BUS=y
CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0
CONFIG_BFIN_GPTIMERS=y
# CONFIG_DMA_UNCACHED_4M is not set
# CONFIG_DMA_UNCACHED_2M is not set
Expand Down
Loading

0 comments on commit 525995d

Please sign in to comment.