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

torvalds · torvalds · commit 43e347a1c451 · 2012-04-05T21:38:51.000-07:00
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
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
@@ -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)
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig
@@ -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
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -244,16 +244,26 @@ static inline int gpio_set_debounce(unsigned gpio, unsigned debounce)`
`244`	`244`	`return -EINVAL;`
`245`	`245`	`}`
`246`	`246`
`247`		`-static inline int gpio_get_value(unsigned gpio)`
	`247`	`+static inline int __gpio_get_value(unsigned gpio)`
`248`	`248`	`{`
`249`	`249`	`return bfin_gpio_get_value(gpio);`
`250`	`250`	`}`
`251`	`251`
`252`		`-static inline void gpio_set_value(unsigned gpio, int value)`
	`252`	`+static inline void __gpio_set_value(unsigned gpio, int value)`
`253`	`253`	`{`
`254`	`254`	`return bfin_gpio_set_value(gpio, value);`
`255`	`255`	`}`
`256`	`256`
	`257`	`+static inline int gpio_get_value(unsigned gpio)`
	`258`	`+{`
	`259`	`+ return __gpio_get_value(gpio);`
	`260`	`+}`
	`261`	`+`
	`262`	`+static inline void gpio_set_value(unsigned gpio, int value)`
	`263`	`+{`
	`264`	`+ return __gpio_set_value(gpio, value);`
	`265`	`+}`
	`266`	`+`
`257`	`267`	`static inline int gpio_to_irq(unsigned gpio)`
`258`	`268`	`{`
`259`	`269`	`if (likely(gpio < MAX_BLACKFIN_GPIOS))`