Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-31 01:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Pull a few blackfin compile fixes from Bob Liu.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin:
  blackfin: update defconfig for bf527-ezkit
  blackfin: gpio: fix compile error if !CONFIG_GPIOLIB
  blackfin: fix L1 data A overflow link issue
This commit is contained in:
Linus Torvalds 2012-04-05 21:38:51 -07:00
commit 43e347a1c4
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/blackfin/Kconfig
View File

@ -823,7 +823,7 @@ config CACHELINE_ALIGNED_L1
bool "Locate cacheline_aligned data to L1 Data Memory" bool "Locate cacheline_aligned data to L1 Data Memory"
default y if !BF54x default y if !BF54x
default n if BF54x default n if BF54x
depends on !SMP && !BF531 depends on !SMP && !BF531 && !CRC32
help help
If enabled, cacheline_aligned data is linked If enabled, cacheline_aligned data is linked
into L1 data memory. (less latency) into L1 data memory. (less latency)

1
arch/blackfin/configs/BF527-EZKIT_defconfig
View File

@ -147,6 +147,7 @@ CONFIG_USB_OTG_BLACKLIST_HUB=y
CONFIG_USB_MON=y CONFIG_USB_MON=y
CONFIG_USB_MUSB_HDRC=y CONFIG_USB_MUSB_HDRC=y
CONFIG_USB_MUSB_BLACKFIN=y CONFIG_USB_MUSB_BLACKFIN=y
CONFIG_MUSB_PIO_ONLY=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y

14
arch/blackfin/include/asm/gpio.h
View File

@ -244,16 +244,26 @@ static inline int gpio_set_debounce(unsigned gpio, unsigned debounce)
return -EINVAL; return -EINVAL;
} }
static inline int gpio_get_value(unsigned gpio) static inline int __gpio_get_value(unsigned gpio)
{ {
return bfin_gpio_get_value(gpio); return bfin_gpio_get_value(gpio);
} }
static inline void gpio_set_value(unsigned gpio, int value) static inline void __gpio_set_value(unsigned gpio, int value)
{ {
return bfin_gpio_set_value(gpio, value); return bfin_gpio_set_value(gpio, value);
} }
static inline int gpio_get_value(unsigned gpio)
{
return __gpio_get_value(gpio);
}
static inline void gpio_set_value(unsigned gpio, int value)
{
return __gpio_set_value(gpio, value);
}
static inline int gpio_to_irq(unsigned gpio) static inline int gpio_to_irq(unsigned gpio)
{ {
if (likely(gpio < MAX_BLACKFIN_GPIOS)) if (likely(gpio < MAX_BLACKFIN_GPIOS))