aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/include/asm/gpio.h2
-rw-r--r--arch/blackfin/include/asm/gptimers.h4
-rw-r--r--arch/blackfin/kernel/bfin_gpio.c54
-rw-r--r--arch/blackfin/mach-bf518/include/mach/blackfin.h2
-rw-r--r--arch/blackfin/mach-bf527/include/mach/blackfin.h2
-rw-r--r--arch/blackfin/mach-bf548/include/mach/blackfin.h2
6 files changed, 30 insertions, 36 deletions
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h
index 3c99ddc8df16..fe139619351f 100644
--- a/arch/blackfin/include/asm/gpio.h
+++ b/arch/blackfin/include/asm/gpio.h
@@ -110,7 +110,7 @@
110* MODIFICATION HISTORY : 110* MODIFICATION HISTORY :
111**************************************************************/ 111**************************************************************/
112 112
113#ifndef BF548_FAMILY 113#ifndef CONFIG_BF54x
114void set_gpio_dir(unsigned, unsigned short); 114void set_gpio_dir(unsigned, unsigned short);
115void set_gpio_inen(unsigned, unsigned short); 115void set_gpio_inen(unsigned, unsigned short);
116void set_gpio_polar(unsigned, unsigned short); 116void set_gpio_polar(unsigned, unsigned short);
diff --git a/arch/blackfin/include/asm/gptimers.h b/arch/blackfin/include/asm/gptimers.h
index a29f649e1729..b0f847ae4bf4 100644
--- a/arch/blackfin/include/asm/gptimers.h
+++ b/arch/blackfin/include/asm/gptimers.h
@@ -17,14 +17,14 @@
17/* 17/*
18 * BF51x/BF52x/BF537: 8 timers: 18 * BF51x/BF52x/BF537: 8 timers:
19 */ 19 */
20#if defined(CONFIG_BF51x) || defined(BF527_FAMILY) || defined(BF537_FAMILY) 20#if defined(CONFIG_BF51x) || defined(CONFIG_BF52x) || defined(BF537_FAMILY)
21# define MAX_BLACKFIN_GPTIMERS 8 21# define MAX_BLACKFIN_GPTIMERS 8
22# define TIMER0_GROUP_REG TIMER_ENABLE 22# define TIMER0_GROUP_REG TIMER_ENABLE
23#endif 23#endif
24/* 24/*
25 * BF54x: 11 timers (BF542: 8 timers): 25 * BF54x: 11 timers (BF542: 8 timers):
26 */ 26 */
27#if defined(BF548_FAMILY) 27#if defined(CONFIG_BF54x)
28# ifdef CONFIG_BF542 28# ifdef CONFIG_BF542
29# define MAX_BLACKFIN_GPTIMERS 8 29# define MAX_BLACKFIN_GPTIMERS 8
30# else 30# else
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 51dac55c524a..031ea3e21400 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -69,7 +69,7 @@ enum {
69static struct gpio_port_t * const gpio_array[] = { 69static struct gpio_port_t * const gpio_array[] = {
70#if defined(BF533_FAMILY) || defined(BF538_FAMILY) 70#if defined(BF533_FAMILY) || defined(BF538_FAMILY)
71 (struct gpio_port_t *) FIO_FLAG_D, 71 (struct gpio_port_t *) FIO_FLAG_D,
72#elif defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 72#elif defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
73 (struct gpio_port_t *) PORTFIO, 73 (struct gpio_port_t *) PORTFIO,
74 (struct gpio_port_t *) PORTGIO, 74 (struct gpio_port_t *) PORTGIO,
75 (struct gpio_port_t *) PORTHIO, 75 (struct gpio_port_t *) PORTHIO,
@@ -77,7 +77,7 @@ static struct gpio_port_t * const gpio_array[] = {
77 (struct gpio_port_t *) FIO0_FLAG_D, 77 (struct gpio_port_t *) FIO0_FLAG_D,
78 (struct gpio_port_t *) FIO1_FLAG_D, 78 (struct gpio_port_t *) FIO1_FLAG_D,
79 (struct gpio_port_t *) FIO2_FLAG_D, 79 (struct gpio_port_t *) FIO2_FLAG_D,
80#elif defined(BF548_FAMILY) 80#elif defined(CONFIG_BF54x)
81 (struct gpio_port_t *)PORTA_FER, 81 (struct gpio_port_t *)PORTA_FER,
82 (struct gpio_port_t *)PORTB_FER, 82 (struct gpio_port_t *)PORTB_FER,
83 (struct gpio_port_t *)PORTC_FER, 83 (struct gpio_port_t *)PORTC_FER,
@@ -93,7 +93,7 @@ static struct gpio_port_t * const gpio_array[] = {
93#endif 93#endif
94}; 94};
95 95
96#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 96#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
97static unsigned short * const port_fer[] = { 97static unsigned short * const port_fer[] = {
98 (unsigned short *) PORTF_FER, 98 (unsigned short *) PORTF_FER,
99 (unsigned short *) PORTG_FER, 99 (unsigned short *) PORTG_FER,
@@ -109,11 +109,11 @@ static unsigned short * const port_mux[] = {
109 109
110static const 110static const
111u8 pmux_offset[][16] = { 111u8 pmux_offset[][16] = {
112# if defined(BF527_FAMILY) 112# if defined(CONFIG_BF52x)
113 { 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 4, 6, 8, 8, 10, 10 }, /* PORTF */ 113 { 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 4, 6, 8, 8, 10, 10 }, /* PORTF */
114 { 0, 0, 0, 0, 0, 2, 2, 4, 4, 6, 8, 10, 10, 10, 12, 12 }, /* PORTG */ 114 { 0, 0, 0, 0, 0, 2, 2, 4, 4, 6, 8, 10, 10, 10, 12, 12 }, /* PORTG */
115 { 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 4, 4, 4, 4, 4, 4 }, /* PORTH */ 115 { 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 4, 4, 4, 4, 4, 4 }, /* PORTH */
116# elif defined(BF518_FAMILY) 116# elif defined(CONFIG_BF51x)
117 { 0, 2, 2, 2, 2, 2, 2, 4, 6, 6, 6, 8, 8, 8, 8, 10 }, /* PORTF */ 117 { 0, 2, 2, 2, 2, 2, 2, 4, 6, 6, 6, 8, 8, 8, 8, 10 }, /* PORTF */
118 { 0, 0, 0, 2, 4, 6, 6, 6, 8, 10, 10, 12, 14, 14, 14, 14 }, /* PORTG */ 118 { 0, 0, 0, 2, 4, 6, 6, 6, 8, 10, 10, 12, 14, 14, 14, 14 }, /* PORTG */
119 { 0, 0, 0, 0, 2, 2, 4, 6, 10, 10, 10, 10, 10, 10, 10, 10 }, /* PORTH */ 119 { 0, 0, 0, 0, 2, 2, 4, 6, 10, 10, 10, 10, 10, 10, 10, 10 }, /* PORTH */
@@ -139,7 +139,7 @@ static struct gpio_port_s gpio_bank_saved[GPIO_BANK_NUM];
139 139
140inline int check_gpio(unsigned gpio) 140inline int check_gpio(unsigned gpio)
141{ 141{
142#if defined(BF548_FAMILY) 142#if defined(CONFIG_BF54x)
143 if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15 143 if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15
144 || gpio == GPIO_PH14 || gpio == GPIO_PH15 144 || gpio == GPIO_PH14 || gpio == GPIO_PH15
145 || gpio == GPIO_PJ14 || gpio == GPIO_PJ15) 145 || gpio == GPIO_PJ14 || gpio == GPIO_PJ15)
@@ -187,13 +187,13 @@ static void port_setup(unsigned gpio, unsigned short usage)
187 if (check_gpio(gpio)) 187 if (check_gpio(gpio))
188 return; 188 return;
189 189
190#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 190#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
191 if (usage == GPIO_USAGE) 191 if (usage == GPIO_USAGE)
192 *port_fer[gpio_bank(gpio)] &= ~gpio_bit(gpio); 192 *port_fer[gpio_bank(gpio)] &= ~gpio_bit(gpio);
193 else 193 else
194 *port_fer[gpio_bank(gpio)] |= gpio_bit(gpio); 194 *port_fer[gpio_bank(gpio)] |= gpio_bit(gpio);
195 SSYNC(); 195 SSYNC();
196#elif defined(BF548_FAMILY) 196#elif defined(CONFIG_BF54x)
197 if (usage == GPIO_USAGE) 197 if (usage == GPIO_USAGE)
198 gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio); 198 gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio);
199 else 199 else
@@ -273,7 +273,7 @@ static void portmux_setup(unsigned short per)
273 } 273 }
274 } 274 }
275} 275}
276#elif defined(BF548_FAMILY) 276#elif defined(CONFIG_BF54x)
277inline void portmux_setup(unsigned short per) 277inline void portmux_setup(unsigned short per)
278{ 278{
279 u32 pmux; 279 u32 pmux;
@@ -297,7 +297,7 @@ inline u16 get_portmux(unsigned short per)
297 297
298 return (pmux >> (2 * gpio_sub_n(ident)) & 0x3); 298 return (pmux >> (2 * gpio_sub_n(ident)) & 0x3);
299} 299}
300#elif defined(BF527_FAMILY) || defined(BF518_FAMILY) 300#elif defined(CONFIG_BF52x) || defined(CONFIG_BF51x)
301inline void portmux_setup(unsigned short per) 301inline void portmux_setup(unsigned short per)
302{ 302{
303 u16 pmux, ident = P_IDENT(per), function = P_FUNCT2MUX(per); 303 u16 pmux, ident = P_IDENT(per), function = P_FUNCT2MUX(per);
@@ -322,7 +322,7 @@ static int __init bfin_gpio_init(void)
322arch_initcall(bfin_gpio_init); 322arch_initcall(bfin_gpio_init);
323 323
324 324
325#ifndef BF548_FAMILY 325#ifndef CONFIG_BF54x
326/*********************************************************** 326/***********************************************************
327* 327*
328* FUNCTIONS: Blackfin General Purpose Ports Access Functions 328* FUNCTIONS: Blackfin General Purpose Ports Access Functions
@@ -489,7 +489,7 @@ static const unsigned int sic_iwr_irqs[] = {
489 IRQ_PROG_INTB, IRQ_PORTG_INTB, IRQ_MAC_TX 489 IRQ_PROG_INTB, IRQ_PORTG_INTB, IRQ_MAC_TX
490#elif defined(BF538_FAMILY) 490#elif defined(BF538_FAMILY)
491 IRQ_PORTF_INTB 491 IRQ_PORTF_INTB
492#elif defined(BF527_FAMILY) || defined(BF518_FAMILY) 492#elif defined(CONFIG_BF52x) || defined(CONFIG_BF51x)
493 IRQ_PORTF_INTB, IRQ_PORTG_INTB, IRQ_PORTH_INTB 493 IRQ_PORTF_INTB, IRQ_PORTG_INTB, IRQ_PORTH_INTB
494#elif defined(BF561_FAMILY) 494#elif defined(BF561_FAMILY)
495 IRQ_PROG0_INTB, IRQ_PROG1_INTB, IRQ_PROG2_INTB 495 IRQ_PROG0_INTB, IRQ_PROG1_INTB, IRQ_PROG2_INTB
@@ -586,7 +586,7 @@ u32 bfin_pm_standby_setup(void)
586 gpio_array[bank]->maskb = 0; 586 gpio_array[bank]->maskb = 0;
587 587
588 if (mask) { 588 if (mask) {
589#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 589#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
590 gpio_bank_saved[bank].fer = *port_fer[bank]; 590 gpio_bank_saved[bank].fer = *port_fer[bank];
591#endif 591#endif
592 gpio_bank_saved[bank].inen = gpio_array[bank]->inen; 592 gpio_bank_saved[bank].inen = gpio_array[bank]->inen;
@@ -631,7 +631,7 @@ void bfin_pm_standby_restore(void)
631 bank = gpio_bank(i); 631 bank = gpio_bank(i);
632 632
633 if (mask) { 633 if (mask) {
634#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 634#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
635 *port_fer[bank] = gpio_bank_saved[bank].fer; 635 *port_fer[bank] = gpio_bank_saved[bank].fer;
636#endif 636#endif
637 gpio_array[bank]->inen = gpio_bank_saved[bank].inen; 637 gpio_array[bank]->inen = gpio_bank_saved[bank].inen;
@@ -657,9 +657,9 @@ void bfin_gpio_pm_hibernate_suspend(void)
657 for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { 657 for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) {
658 bank = gpio_bank(i); 658 bank = gpio_bank(i);
659 659
660#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 660#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
661 gpio_bank_saved[bank].fer = *port_fer[bank]; 661 gpio_bank_saved[bank].fer = *port_fer[bank];
662#if defined(BF527_FAMILY) || defined(BF518_FAMILY) 662#if defined(CONFIG_BF52x) || defined(CONFIG_BF51x)
663 gpio_bank_saved[bank].mux = *port_mux[bank]; 663 gpio_bank_saved[bank].mux = *port_mux[bank];
664#else 664#else
665 if (bank == 0) 665 if (bank == 0)
@@ -685,8 +685,8 @@ void bfin_gpio_pm_hibernate_restore(void)
685 for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { 685 for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) {
686 bank = gpio_bank(i); 686 bank = gpio_bank(i);
687 687
688#if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) 688#if defined(CONFIG_BF52x) || defined(BF537_FAMILY) || defined(CONFIG_BF51x)
689#if defined(BF527_FAMILY) || defined(BF518_FAMILY) 689#if defined(CONFIG_BF52x) || defined(CONFIG_BF51x)
690 *port_mux[bank] = gpio_bank_saved[bank].mux; 690 *port_mux[bank] = gpio_bank_saved[bank].mux;
691#else 691#else
692 if (bank == 0) 692 if (bank == 0)
@@ -710,7 +710,7 @@ void bfin_gpio_pm_hibernate_restore(void)
710 710
711 711
712#endif 712#endif
713#else /* BF548_FAMILY */ 713#else /* CONFIG_BF54x */
714#ifdef CONFIG_PM 714#ifdef CONFIG_PM
715 715
716u32 bfin_pm_standby_setup(void) 716u32 bfin_pm_standby_setup(void)
@@ -762,7 +762,7 @@ unsigned short get_gpio_dir(unsigned gpio)
762} 762}
763EXPORT_SYMBOL(get_gpio_dir); 763EXPORT_SYMBOL(get_gpio_dir);
764 764
765#endif /* BF548_FAMILY */ 765#endif /* CONFIG_BF54x */
766 766
767/*********************************************************** 767/***********************************************************
768* 768*
@@ -817,7 +817,7 @@ int peripheral_request(unsigned short per, const char *label)
817 * be requested and used by several drivers 817 * be requested and used by several drivers
818 */ 818 */
819 819
820#ifdef BF548_FAMILY 820#ifdef CONFIG_BF54x
821 if (!((per & P_MAYSHARE) && get_portmux(per) == P_FUNCT2MUX(per))) { 821 if (!((per & P_MAYSHARE) && get_portmux(per) == P_FUNCT2MUX(per))) {
822#else 822#else
823 if (!(per & P_MAYSHARE)) { 823 if (!(per & P_MAYSHARE)) {
@@ -964,7 +964,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
964 printk(KERN_NOTICE "bfin-gpio: GPIO %d is already reserved as gpio-irq!" 964 printk(KERN_NOTICE "bfin-gpio: GPIO %d is already reserved as gpio-irq!"
965 " (Documentation/blackfin/bfin-gpio-notes.txt)\n", gpio); 965 " (Documentation/blackfin/bfin-gpio-notes.txt)\n", gpio);
966 } 966 }
967#ifndef BF548_FAMILY 967#ifndef CONFIG_BF54x
968 else { /* Reset POLAR setting when acquiring a gpio for the first time */ 968 else { /* Reset POLAR setting when acquiring a gpio for the first time */
969 set_gpio_polar(gpio, 0); 969 set_gpio_polar(gpio, 0);
970 } 970 }
@@ -1072,7 +1072,7 @@ void bfin_gpio_irq_free(unsigned gpio)
1072 1072
1073static inline void __bfin_gpio_direction_input(unsigned gpio) 1073static inline void __bfin_gpio_direction_input(unsigned gpio)
1074{ 1074{
1075#ifdef BF548_FAMILY 1075#ifdef CONFIG_BF54x
1076 gpio_array[gpio_bank(gpio)]->dir_clear = gpio_bit(gpio); 1076 gpio_array[gpio_bank(gpio)]->dir_clear = gpio_bit(gpio);
1077#else 1077#else
1078 gpio_array[gpio_bank(gpio)]->dir &= ~gpio_bit(gpio); 1078 gpio_array[gpio_bank(gpio)]->dir &= ~gpio_bit(gpio);
@@ -1100,13 +1100,13 @@ EXPORT_SYMBOL(bfin_gpio_direction_input);
1100 1100
1101void bfin_gpio_irq_prepare(unsigned gpio) 1101void bfin_gpio_irq_prepare(unsigned gpio)
1102{ 1102{
1103#ifdef BF548_FAMILY 1103#ifdef CONFIG_BF54x
1104 unsigned long flags; 1104 unsigned long flags;
1105#endif 1105#endif
1106 1106
1107 port_setup(gpio, GPIO_USAGE); 1107 port_setup(gpio, GPIO_USAGE);
1108 1108
1109#ifdef BF548_FAMILY 1109#ifdef CONFIG_BF54x
1110 local_irq_save_hw(flags); 1110 local_irq_save_hw(flags);
1111 __bfin_gpio_direction_input(gpio); 1111 __bfin_gpio_direction_input(gpio);
1112 local_irq_restore_hw(flags); 1112 local_irq_restore_hw(flags);
@@ -1135,7 +1135,7 @@ int bfin_gpio_direction_output(unsigned gpio, int value)
1135 1135
1136 gpio_array[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio); 1136 gpio_array[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio);
1137 gpio_set_value(gpio, value); 1137 gpio_set_value(gpio, value);
1138#ifdef BF548_FAMILY 1138#ifdef CONFIG_BF54x
1139 gpio_array[gpio_bank(gpio)]->dir_set = gpio_bit(gpio); 1139 gpio_array[gpio_bank(gpio)]->dir_set = gpio_bit(gpio);
1140#else 1140#else
1141 gpio_array[gpio_bank(gpio)]->dir |= gpio_bit(gpio); 1141 gpio_array[gpio_bank(gpio)]->dir |= gpio_bit(gpio);
@@ -1150,7 +1150,7 @@ EXPORT_SYMBOL(bfin_gpio_direction_output);
1150 1150
1151int bfin_gpio_get_value(unsigned gpio) 1151int bfin_gpio_get_value(unsigned gpio)
1152{ 1152{
1153#ifdef BF548_FAMILY 1153#ifdef CONFIG_BF54x
1154 return (1 & (gpio_array[gpio_bank(gpio)]->data >> gpio_sub_n(gpio))); 1154 return (1 & (gpio_array[gpio_bank(gpio)]->data >> gpio_sub_n(gpio)));
1155#else 1155#else
1156 unsigned long flags; 1156 unsigned long flags;
diff --git a/arch/blackfin/mach-bf518/include/mach/blackfin.h b/arch/blackfin/mach-bf518/include/mach/blackfin.h
index d1a2b9ca6227..267bb7c8bfb5 100644
--- a/arch/blackfin/mach-bf518/include/mach/blackfin.h
+++ b/arch/blackfin/mach-bf518/include/mach/blackfin.h
@@ -32,8 +32,6 @@
32#ifndef _MACH_BLACKFIN_H_ 32#ifndef _MACH_BLACKFIN_H_
33#define _MACH_BLACKFIN_H_ 33#define _MACH_BLACKFIN_H_
34 34
35#define BF518_FAMILY
36
37#include "bf518.h" 35#include "bf518.h"
38#include "mem_map.h" 36#include "mem_map.h"
39#include "defBF512.h" 37#include "defBF512.h"
diff --git a/arch/blackfin/mach-bf527/include/mach/blackfin.h b/arch/blackfin/mach-bf527/include/mach/blackfin.h
index 297821e2d79a..417abcd61f4d 100644
--- a/arch/blackfin/mach-bf527/include/mach/blackfin.h
+++ b/arch/blackfin/mach-bf527/include/mach/blackfin.h
@@ -32,8 +32,6 @@
32#ifndef _MACH_BLACKFIN_H_ 32#ifndef _MACH_BLACKFIN_H_
33#define _MACH_BLACKFIN_H_ 33#define _MACH_BLACKFIN_H_
34 34
35#define BF527_FAMILY
36
37#include "bf527.h" 35#include "bf527.h"
38#include "mem_map.h" 36#include "mem_map.h"
39#include "defBF522.h" 37#include "defBF522.h"
diff --git a/arch/blackfin/mach-bf548/include/mach/blackfin.h b/arch/blackfin/mach-bf548/include/mach/blackfin.h
index 0c0e3e2c3c21..cf6c1500222a 100644
--- a/arch/blackfin/mach-bf548/include/mach/blackfin.h
+++ b/arch/blackfin/mach-bf548/include/mach/blackfin.h
@@ -32,8 +32,6 @@
32#ifndef _MACH_BLACKFIN_H_ 32#ifndef _MACH_BLACKFIN_H_
33#define _MACH_BLACKFIN_H_ 33#define _MACH_BLACKFIN_H_
34 34
35#define BF548_FAMILY
36
37#include "bf548.h" 35#include "bf548.h"
38#include "mem_map.h" 36#include "mem_map.h"
39#include "anomaly.h" 37#include "anomaly.h"