[Linux-kernel-commits] [6014] trunk/arch/blackfin: setup P_DEFAULT_BOOT_SPI_CS for every arch based on the default bootrom behavior and convert all our boards to it

Tue, 13 Jan 2009 15:08:16 -0800

Title: [6014] trunk/arch/blackfin: setup P_DEFAULT_BOOT_SPI_CS for every arch based on the default bootrom behavior and convert all our boards to it

Diff

Modified: trunk/arch/blackfin/include/asm/reboot.h (6013 => 6014)


--- trunk/arch/blackfin/include/asm/reboot.h	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/include/asm/reboot.h	2009-01-13 23:07:51 UTC (rev 6014)
@@ -15,6 +15,6 @@
 extern void native_machine_power_off(void);
 
 /* common reboot workarounds */
-extern void bfin_gpio_reset_spi0(unsigned int ssel);
+extern void bfin_reset_boot_spi_cs(unsigned short pin);
 
 #endif

Modified: trunk/arch/blackfin/kernel/bfin_gpio.c (6013 => 6014)


--- trunk/arch/blackfin/kernel/bfin_gpio.c	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/kernel/bfin_gpio.c	2009-01-13 23:07:51 UTC (rev 6014)
@@ -1179,36 +1179,9 @@
  * lives here as we need to force all the GPIO states w/out going through
  * BUG() checks and such.
  */
-void bfin_gpio_reset_spi0(unsigned int ssel)
+void bfin_reset_boot_spi_cs(unsigned short pin)
 {
-	u16 gpio;
-
-	switch (ssel) {
-	case 1:
-		gpio = P_IDENT(P_SPI0_SSEL1);
-		break;
-	case 2:
-		gpio = P_IDENT(P_SPI0_SSEL2);
-		break;
-	case 3:
-		gpio = P_IDENT(P_SPI0_SSEL3);
-		break;
-	case 4:
-		gpio = P_IDENT(P_SPI0_SSEL4);
-		break;
-	case 5:
-		gpio = P_IDENT(P_SPI0_SSEL5);
-		break;
-	case 6:
-		gpio = P_IDENT(P_SPI0_SSEL6);
-		break;
-	case 7:
-		gpio = P_IDENT(P_SPI0_SSEL7);
-		break;
-	default:
-		return;
-	}
-
+	unsigned short gpio = P_IDENT(pin);
 	port_setup(gpio, GPIO_USAGE);
 	gpio_array[gpio_bank(gpio)]->data_set = gpio_bit(gpio);
 	AWA_DUMMY_READ(data_set);

Modified: trunk/arch/blackfin/mach-bf518/boards/ezbrd.c (6013 => 6014)


--- trunk/arch/blackfin/mach-bf518/boards/ezbrd.c	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf518/boards/ezbrd.c	2009-01-13 23:07:51 UTC (rev 6014)
@@ -649,7 +649,7 @@
 {
 	/* workaround reboot hang when booting from SPI */
 	if ((bfin_read_SYSCR() & 0x7) == 0x3)
-		bfin_gpio_reset_spi0(2);
+		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
 void bfin_get_ether_addr(char *addr)

Modified: trunk/arch/blackfin/mach-bf518/include/mach/portmux.h (6013 => 6014)


--- trunk/arch/blackfin/mach-bf518/include/mach/portmux.h	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf518/include/mach/portmux.h	2009-01-13 23:07:51 UTC (rev 6014)
@@ -103,6 +103,8 @@
 #define P_SPI1_SSEL4	(P_DEFINED | P_IDENT(GPIO_PF8) | P_FUNCT(2))
 #define P_SPI1_SSEL5	(P_DEFINED | P_IDENT(GPIO_PG11) | P_FUNCT(2))
 
+#define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2
+
 /* SPORT Port Mux */
 #define P_SPORT0_DRPRI	(P_DEFINED | P_IDENT(GPIO_PG3) | P_FUNCT(0))
 #define P_SPORT0_RSCLK	(P_DEFINED | P_IDENT(GPIO_PG4) | P_FUNCT(0))

Modified: trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c (6013 => 6014)


--- trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c	2009-01-13 23:07:51 UTC (rev 6014)
@@ -988,7 +988,7 @@
 {
 	/* workaround reboot hang when booting from SPI */
 	if ((bfin_read_SYSCR() & 0x7) == 0x3)
-		bfin_gpio_reset_spi0(1);
+		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
 void bfin_get_ether_addr(char *addr)

Modified: trunk/arch/blackfin/mach-bf527/boards/ezbrd.c (6013 => 6014)


--- trunk/arch/blackfin/mach-bf527/boards/ezbrd.c	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf527/boards/ezbrd.c	2009-01-13 23:07:51 UTC (rev 6014)
@@ -784,7 +784,7 @@
 {
 	/* workaround reboot hang when booting from SPI */
 	if ((bfin_read_SYSCR() & 0x7) == 0x3)
-		bfin_gpio_reset_spi0(1);
+		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
 void bfin_get_ether_addr(char *addr)

Modified: trunk/arch/blackfin/mach-bf527/boards/ezkit.c (6013 => 6014)


--- trunk/arch/blackfin/mach-bf527/boards/ezkit.c	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf527/boards/ezkit.c	2009-01-13 23:07:51 UTC (rev 6014)
@@ -1068,7 +1068,7 @@
 {
 	/* workaround reboot hang when booting from SPI */
 	if ((bfin_read_SYSCR() & 0x7) == 0x3)
-		bfin_gpio_reset_spi0(1);
+		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
 void bfin_get_ether_addr(char *addr)

Modified: trunk/arch/blackfin/mach-bf527/include/mach/portmux.h (6013 => 6014)


--- trunk/arch/blackfin/mach-bf527/include/mach/portmux.h	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf527/include/mach/portmux.h	2009-01-13 23:07:51 UTC (rev 6014)
@@ -73,6 +73,8 @@
 
 #define P_HWAIT		(P_DONTCARE)
 
+#define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1
+
 #define P_SPI0_SS	(P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(0))
 #define P_SPI0_SSEL1	(P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(2))
 #define P_SPI0_SCK	(P_DEFINED | P_IDENT(GPIO_PG2) | P_FUNCT(2))

Modified: trunk/arch/blackfin/mach-bf533/include/mach/portmux.h (6013 => 6014)


--- trunk/arch/blackfin/mach-bf533/include/mach/portmux.h	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf533/include/mach/portmux.h	2009-01-13 23:07:51 UTC (rev 6014)
@@ -54,14 +54,11 @@
 #define P_SPI0_SSEL2	(P_DEFINED | P_IDENT(GPIO_PF2))
 #define P_SPI0_SSEL1	(P_DEFINED | P_IDENT(GPIO_PF1))
 #define P_SPI0_SS	(P_DEFINED | P_IDENT(GPIO_PF0))
+#define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2
 
 #define P_TMR2		(P_DONTCARE)
 #define P_TMR1		(P_DONTCARE)
 #define P_TMR0		(P_DONTCARE)
 #define P_TMRCLK	(P_DEFINED | P_IDENT(GPIO_PF1))
 
-
-
-
-
 #endif /* _MACH_PORTMUX_H_ */

Modified: trunk/arch/blackfin/mach-bf537/boards/generic_board.c (6013 => 6014)


--- trunk/arch/blackfin/mach-bf537/boards/generic_board.c	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf537/boards/generic_board.c	2009-01-13 23:07:51 UTC (rev 6014)
@@ -726,7 +726,7 @@
 {
 	/* workaround reboot hang when booting from SPI */
 	if ((bfin_read_SYSCR() & 0x7) == 0x3)
-		bfin_gpio_reset_spi0(1);
+		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)

Modified: trunk/arch/blackfin/mach-bf537/boards/minotaur.c (6013 => 6014)


--- trunk/arch/blackfin/mach-bf537/boards/minotaur.c	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf537/boards/minotaur.c	2009-01-13 23:07:51 UTC (rev 6014)
@@ -377,5 +377,5 @@
 {
 	/* workaround reboot hang when booting from SPI */
 	if ((bfin_read_SYSCR() & 0x7) == 0x3)
-		bfin_gpio_reset_spi0(1);
+		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }

Modified: trunk/arch/blackfin/mach-bf537/boards/stamp.c (6013 => 6014)


--- trunk/arch/blackfin/mach-bf537/boards/stamp.c	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf537/boards/stamp.c	2009-01-13 23:07:51 UTC (rev 6014)
@@ -1307,7 +1307,7 @@
 {
 	/* workaround reboot hang when booting from SPI */
 	if ((bfin_read_SYSCR() & 0x7) == 0x3)
-		bfin_gpio_reset_spi0(1);
+		bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
 /*

Modified: trunk/arch/blackfin/mach-bf537/include/mach/portmux.h (6013 => 6014)


--- trunk/arch/blackfin/mach-bf537/include/mach/portmux.h	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf537/include/mach/portmux.h	2009-01-13 23:07:51 UTC (rev 6014)
@@ -31,6 +31,7 @@
 #define P_PPI0_FS1	(P_DEFINED | P_IDENT(GPIO_PF9) | P_FUNCT(1))
 #define P_TACLK0	(P_DEFINED | P_IDENT(GPIO_PF14) | P_FUNCT(1))
 #define P_TMRCLK	(P_DEFINED | P_IDENT(GPIO_PF15) | P_FUNCT(1))
+#define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1
 
 #define P_PPI0_D0	(P_DEFINED | P_IDENT(GPIO_PG0) | P_FUNCT(0))
 #define P_PPI0_D1	(P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(0))

Modified: trunk/arch/blackfin/mach-bf538/include/mach/portmux.h (6013 => 6014)


--- trunk/arch/blackfin/mach-bf538/include/mach/portmux.h	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf538/include/mach/portmux.h	2009-01-13 23:07:51 UTC (rev 6014)
@@ -102,5 +102,6 @@
 #define P_SPI0_SSEL2	(P_DEFINED | P_IDENT(GPIO_PF2))
 #define P_SPI0_SSEL1	(P_DEFINED | P_IDENT(GPIO_PF1))
 #define P_SPI0_SS	(P_DEFINED | P_IDENT(GPIO_PF0))
+#define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2
 
 #endif /* _MACH_PORTMUX_H_ */

Modified: trunk/arch/blackfin/mach-bf548/include/mach/portmux.h (6013 => 6014)


--- trunk/arch/blackfin/mach-bf548/include/mach/portmux.h	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf548/include/mach/portmux.h	2009-01-13 23:07:51 UTC (rev 6014)
@@ -125,6 +125,7 @@
 #define P_KEY_COL2	(P_DEFINED | P_IDENT(GPIO_PD14) | P_FUNCT(3))
 #define P_KEY_COL3	(P_DEFINED | P_IDENT(GPIO_PD15) | P_FUNCT(3))
 
+#define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1
 #define P_SPI0_SCK	(P_DEFINED | P_IDENT(GPIO_PE0) | P_FUNCT(0))
 #define P_SPI0_MISO	(P_DEFINED | P_IDENT(GPIO_PE1) | P_FUNCT(0))
 #define P_SPI0_MOSI	(P_DEFINED | P_IDENT(GPIO_PE2) | P_FUNCT(0))

Modified: trunk/arch/blackfin/mach-bf561/include/mach/portmux.h (6013 => 6014)


--- trunk/arch/blackfin/mach-bf561/include/mach/portmux.h	2009-01-13 21:18:07 UTC (rev 6013)
+++ trunk/arch/blackfin/mach-bf561/include/mach/portmux.h	2009-01-13 23:07:51 UTC (rev 6014)
@@ -85,5 +85,6 @@
 #define P_SPI0_MOSI	(P_DONTCARE)
 #define P_SPI0_MISO	(P_DONTCARE)
 #define P_SPI0_SCK	(P_DONTCARE)
+#define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2
 
 #endif /* _MACH_PORTMUX_H_ */

_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to