[Linux-kernel-commits] [6005] trunk/arch/blackfin/kernel/bfin_gpio.c: Fix bug [#4801], BF518 port F, G, and H have different mux offset compare to BF527.

[gyang]

Title: [6005] trunk/arch/blackfin/kernel/bfin_gpio.c: Fix bug [#4801], BF518 port F, G, and H have different mux offset compare to BF527.

Revision

6005

Author

gyang

Date

2009-01-13 05:12:13 -0600 (Tue, 13 Jan 2009)

Log Message

Fix bug [#4801], BF518 port F, G, and H have different mux offset compare to BF527.

Modified Paths

trunk/arch/blackfin/kernel/bfin_gpio.c

Diff

Modified: trunk/arch/blackfin/kernel/bfin_gpio.c (6004 => 6005)

--- trunk/arch/blackfin/kernel/bfin_gpio.c	2009-01-13 09:02:58 UTC (rev 6004)
+++ trunk/arch/blackfin/kernel/bfin_gpio.c	2009-01-13 11:12:13 UTC (rev 6005)
@@ -106,16 +106,27 @@
 	(unsigned short *) PORTG_MUX,
 	(unsigned short *) PORTH_MUX,
 };
+# endif
 
+#if defined(BF527_FAMILY)
 static const
 u8 pmux_offset[][16] =
 	{{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 4, 6, 8, 8, 10, 10 }, /* PORTF */
 	 { 0, 0, 0, 0, 0, 2, 2, 4, 4, 6, 8, 10, 10, 10, 12, 12 }, /* PORTG */
 	 { 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 4, 4, 4, 4, 4, 4 }, /* PORTH */
 	};
-# endif
 #endif
 
+#if defined(BF518_FAMILY)
+static const
+u8 pmux_offset[][16] =
+	{{ 0, 2, 2, 2, 2, 2, 2, 4, 6, 6, 6, 8, 8, 8, 8, 10 }, /* PORTF */
+	 { 0, 0, 0, 2, 4, 6, 6, 6, 8, 10, 10, 12, 14, 14, 14, 14 }, /* PORTG */
+	 { 0, 0, 0, 0, 2, 2, 4, 6, 10, 10, 10, 10, 10, 10, 10, 10 }, /* PORTH */
+	};
+#endif
+#endif
+
 static unsigned short reserved_gpio_map[GPIO_BANK_NUM];
 static unsigned short reserved_peri_map[gpio_bank(MAX_RESOURCES)];
 static unsigned short reserved_gpio_irq_map[GPIO_BANK_NUM];

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits