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

Commit 43e347a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull 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
parents fb9d78ac 35fe2e73

arch/blackfin/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ config CACHELINE_ALIGNED_L1 
	bool "Locate cacheline_aligned data to L1 Data Memory"

	default y if !BF54x

	default n if BF54x

	depends on !SMP && !BF531

	depends on !SMP && !BF531 && !CRC32

	help

	  If enabled, cacheline_aligned data is linked

	  into L1 data memory. (less latency)

arch/blackfin/configs/BF527-EZKIT_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ CONFIG_USB_OTG_BLACKLIST_HUB=y 
CONFIG_USB_MON=y

CONFIG_USB_MUSB_HDRC=y

CONFIG_USB_MUSB_BLACKFIN=y

CONFIG_MUSB_PIO_ONLY=y

CONFIG_USB_STORAGE=y

CONFIG_USB_GADGET=y

CONFIG_RTC_CLASS=y

arch/blackfin/include/asm/gpio.h

+12 −2
Original line number Diff line number Diff line
@@ -244,16 +244,26 @@ static inline int gpio_set_debounce(unsigned gpio, unsigned debounce) 
	return -EINVAL;

}



static inline int gpio_get_value(unsigned gpio)

static inline int __gpio_get_value(unsigned 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);

}



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)

{

	if (likely(gpio < MAX_BLACKFIN_GPIOS))