Title: [7354] branches/2009R1/arch/blackfin: PJx can only be peripheral pins on BF537, so mark them DONTCARE
- Revision
- 7354
- Author
- bhsong
- Date
- 2009-09-16 00:40:54 -0400 (Wed, 16 Sep 2009)
Log Message
PJx can only be peripheral pins on BF537, so mark them DONTCARE
move gpio number check behind DONTCARE check
Modified Paths
Diff
Modified: branches/2009R1/arch/blackfin/kernel/bfin_gpio.c (7353 => 7354)
--- branches/2009R1/arch/blackfin/kernel/bfin_gpio.c 2009-09-16 04:38:10 UTC (rev 7353)
+++ branches/2009R1/arch/blackfin/kernel/bfin_gpio.c 2009-09-16 04:40:54 UTC (rev 7354)
@@ -777,8 +777,6 @@
unsigned long flags;
unsigned short ident = P_IDENT(per);
- BUG_ON(ident >= MAX_BLACKFIN_GPIOS);
-
/*
* Don't cares are pins with only one dedicated function
*/
@@ -789,6 +787,8 @@
if (!(per & P_DEFINED))
return -ENODEV;
+ BUG_ON(ident >= MAX_BLACKFIN_GPIOS);
+
local_irq_save_hw(flags);
/* If a pin can be muxed as either GPIO or peripheral, make
Modified: branches/2009R1/arch/blackfin/mach-bf537/include/mach/portmux.h (7353 => 7354)
--- branches/2009R1/arch/blackfin/mach-bf537/include/mach/portmux.h 2009-09-16 04:38:10 UTC (rev 7353)
+++ branches/2009R1/arch/blackfin/mach-bf537/include/mach/portmux.h 2009-09-16 04:40:54 UTC (rev 7354)
@@ -91,23 +91,23 @@
#define PORT_PJ10 (GPIO_PH15 + 11)
#define PORT_PJ11 (GPIO_PH15 + 12)
-#define P_MDC (P_DEFINED | P_IDENT(PORT_PJ0) | P_FUNCT(0))
-#define P_MDIO (P_DEFINED | P_IDENT(PORT_PJ1) | P_FUNCT(0))
-#define P_TWI0_SCL (P_DEFINED | P_IDENT(PORT_PJ2) | P_FUNCT(0))
-#define P_TWI0_SDA (P_DEFINED | P_IDENT(PORT_PJ3) | P_FUNCT(0))
-#define P_SPORT0_DRSEC (P_DEFINED | P_IDENT(PORT_PJ4) | P_FUNCT(0))
-#define P_SPORT0_DTSEC (P_DEFINED | P_IDENT(PORT_PJ5) | P_FUNCT(0))
-#define P_SPORT0_RSCLK (P_DEFINED | P_IDENT(PORT_PJ6) | P_FUNCT(0))
-#define P_SPORT0_RFS (P_DEFINED | P_IDENT(PORT_PJ7) | P_FUNCT(0))
-#define P_SPORT0_DRPRI (P_DEFINED | P_IDENT(PORT_PJ8) | P_FUNCT(0))
-#define P_SPORT0_TSCLK (P_DEFINED | P_IDENT(PORT_PJ9) | P_FUNCT(0))
-#define P_SPORT0_TFS (P_DEFINED | P_IDENT(PORT_PJ10) | P_FUNCT(0))
-#define P_SPORT0_DTPRI (P_DEFINED | P_IDENT(PORT_PJ11) | P_FUNCT(0))
-#define P_CAN0_RX (P_DEFINED | P_IDENT(PORT_PJ4) | P_FUNCT(1))
-#define P_CAN0_TX (P_DEFINED | P_IDENT(PORT_PJ5) | P_FUNCT(1))
-#define P_SPI0_SSEL3 (P_DEFINED | P_IDENT(PORT_PJ10) | P_FUNCT(1))
-#define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(PORT_PJ11) | P_FUNCT(1))
-#define P_SPI0_SSEL7 (P_DEFINED | P_IDENT(PORT_PJ5) | P_FUNCT(2))
+#define P_MDC (P_DONTCARE | P_IDENT(PORT_PJ0) | P_FUNCT(0))
+#define P_MDIO (P_DONTCARE | P_IDENT(PORT_PJ1) | P_FUNCT(0))
+#define P_TWI0_SCL (P_DONTCARE | P_IDENT(PORT_PJ2) | P_FUNCT(0))
+#define P_TWI0_SDA (P_DONTCARE | P_IDENT(PORT_PJ3) | P_FUNCT(0))
+#define P_SPORT0_DRSEC (P_DONTCARE | P_IDENT(PORT_PJ4) | P_FUNCT(0))
+#define P_SPORT0_DTSEC (P_DONTCARE | P_IDENT(PORT_PJ5) | P_FUNCT(0))
+#define P_SPORT0_RSCLK (P_DONTCARE | P_IDENT(PORT_PJ6) | P_FUNCT(0))
+#define P_SPORT0_RFS (P_DONTCARE | P_IDENT(PORT_PJ7) | P_FUNCT(0))
+#define P_SPORT0_DRPRI (P_DONTCARE | P_IDENT(PORT_PJ8) | P_FUNCT(0))
+#define P_SPORT0_TSCLK (P_DONTCARE | P_IDENT(PORT_PJ9) | P_FUNCT(0))
+#define P_SPORT0_TFS (P_DONTCARE | P_IDENT(PORT_PJ10) | P_FUNCT(0))
+#define P_SPORT0_DTPRI (P_DONTCARE | P_IDENT(PORT_PJ11) | P_FUNCT(0))
+#define P_CAN0_RX (P_DONTCARE | P_IDENT(PORT_PJ4) | P_FUNCT(1))
+#define P_CAN0_TX (P_DONTCARE | P_IDENT(PORT_PJ5) | P_FUNCT(1))
+#define P_SPI0_SSEL3 (P_DONTCARE | P_IDENT(PORT_PJ10) | P_FUNCT(1))
+#define P_SPI0_SSEL2 (P_DONTCARE | P_IDENT(PORT_PJ11) | P_FUNCT(1))
+#define P_SPI0_SSEL7 (P_DONTCARE | P_IDENT(PORT_PJ5) | P_FUNCT(2))
#define P_MII0 {\
P_MII0_ETxD0, \
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
