From 085780d5bb53edbc008156c310ac512aabd23610 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 28 Mar 2009 17:43:01 +0800 Subject: Blackfin arch: include linux headers that this one uses definitions from fro sport drivers Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu --- arch/blackfin/include/asm/bfin_sport.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'arch/blackfin/include') diff --git a/arch/blackfin/include/asm/bfin_sport.h b/arch/blackfin/include/asm/bfin_sport.h index 65a651d..d416959 100644 --- a/arch/blackfin/include/asm/bfin_sport.h +++ b/arch/blackfin/include/asm/bfin_sport.h @@ -9,6 +9,13 @@ #ifndef __BFIN_SPORT_H__ #define __BFIN_SPORT_H__ +#ifdef __KERNEL__ +#include +#include +#include +#include +#endif + #define SPORT_MAJOR 237 #define SPORT_NR_DEVS 2 -- cgit v1.1 From e1312bfcc25f9301f997bf1ce84355a0f1167847 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Sat, 28 Mar 2009 21:18:45 +0800 Subject: Blackfin arch: add a check to make sure only Blackfin GPIOs may generate IRQs Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu --- arch/blackfin/include/asm/gpio.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'arch/blackfin/include') diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index d4a082e..3c99ddc 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h @@ -303,7 +303,10 @@ static inline void gpio_set_value(unsigned gpio, int value) static inline int gpio_to_irq(unsigned gpio) { - return (gpio + GPIO_IRQ_BASE); + if (likely(gpio < MAX_BLACKFIN_GPIOS)) + return gpio + GPIO_IRQ_BASE; + + return -EINVAL; } static inline int irq_to_gpio(unsigned irq) -- cgit v1.1 From ffc89627ae14b46f41836ddabdc9dc77c597eca5 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 28 Mar 2009 20:31:33 +0800 Subject: Blackfin arch: bf51x processors also have 8 timers Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu --- arch/blackfin/include/asm/gptimers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/blackfin/include') diff --git a/arch/blackfin/include/asm/gptimers.h b/arch/blackfin/include/asm/gptimers.h index 0520d2a..a29f649 100644 --- a/arch/blackfin/include/asm/gptimers.h +++ b/arch/blackfin/include/asm/gptimers.h @@ -15,9 +15,9 @@ #include /* - * BF537/BF527: 8 timers: + * BF51x/BF52x/BF537: 8 timers: */ -#if defined(BF527_FAMILY) || defined(BF537_FAMILY) +#if defined(CONFIG_BF51x) || defined(BF527_FAMILY) || defined(BF537_FAMILY) # define MAX_BLACKFIN_GPTIMERS 8 # define TIMER0_GROUP_REG TIMER_ENABLE #endif -- cgit v1.1 From 269647dc8f3b557d0f9ec59533a5e651cc109efb Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 28 Mar 2009 20:32:57 +0800 Subject: Blackfin arch: convert BF5{18,27,48}_FAMILY to CONFIG_BF{51,52,54}x convert BF5{18,27,48}_FAMILY to CONFIG_BF{51,52,54}x as the defines are redundant in these cases Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu --- arch/blackfin/include/asm/gpio.h | 2 +- arch/blackfin/include/asm/gptimers.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/blackfin/include') diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 3c99ddc..fe13961 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h @@ -110,7 +110,7 @@ * MODIFICATION HISTORY : **************************************************************/ -#ifndef BF548_FAMILY +#ifndef CONFIG_BF54x void set_gpio_dir(unsigned, unsigned short); void set_gpio_inen(unsigned, unsigned short); void set_gpio_polar(unsigned, unsigned short); diff --git a/arch/blackfin/include/asm/gptimers.h b/arch/blackfin/include/asm/gptimers.h index a29f649..b0f847a 100644 --- a/arch/blackfin/include/asm/gptimers.h +++ b/arch/blackfin/include/asm/gptimers.h @@ -17,14 +17,14 @@ /* * BF51x/BF52x/BF537: 8 timers: */ -#if defined(CONFIG_BF51x) || defined(BF527_FAMILY) || defined(BF537_FAMILY) +#if defined(CONFIG_BF51x) || defined(CONFIG_BF52x) || defined(BF537_FAMILY) # define MAX_BLACKFIN_GPTIMERS 8 # define TIMER0_GROUP_REG TIMER_ENABLE #endif /* * BF54x: 11 timers (BF542: 8 timers): */ -#if defined(BF548_FAMILY) +#if defined(CONFIG_BF54x) # ifdef CONFIG_BF542 # define MAX_BLACKFIN_GPTIMERS 8 # else -- cgit v1.1 From 714e76d71d99f00734217e642ba64204df3bdf35 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 28 Mar 2009 20:38:17 +0800 Subject: Blackfin arch: clean up sports header file Remove redundancy of the name err_irq Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu --- arch/blackfin/include/asm/bfin_sport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/blackfin/include') diff --git a/arch/blackfin/include/asm/bfin_sport.h b/arch/blackfin/include/asm/bfin_sport.h index d416959..b558908 100644 --- a/arch/blackfin/include/asm/bfin_sport.h +++ b/arch/blackfin/include/asm/bfin_sport.h @@ -126,7 +126,7 @@ struct sport_dev { int tx_len; int tx_sent; - int sport_err_irq; + int err_irq; struct mutex mutex; /* mutual exclusion semaphore */ struct task_struct *task; -- cgit v1.1 From 1eb19e30adeb05957b45204f0c04d94fc4662ffd Mon Sep 17 00:00:00 2001 From: Cliff Cai Date: Sat, 28 Mar 2009 23:31:43 +0800 Subject: Blackfin arch: sport spi needs 6 gpio pins Signed-off-by: Cliff Cai Signed-off-by: Bryan Wu --- arch/blackfin/include/asm/bfin5xx_spi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/blackfin/include') diff --git a/arch/blackfin/include/asm/bfin5xx_spi.h b/arch/blackfin/include/asm/bfin5xx_spi.h index 1306e6b..0292d58 100644 --- a/arch/blackfin/include/asm/bfin5xx_spi.h +++ b/arch/blackfin/include/asm/bfin5xx_spi.h @@ -110,7 +110,7 @@ struct bfin5xx_spi_master { u16 num_chipselect; u8 enable_dma; - u16 pin_req[4]; + u16 pin_req[7]; }; /* spi_board_info.controller_data for SPI slave devices, -- cgit v1.1