Diff
Modified: trunk/arch/blackfin/mach-bf518/boards/ezbrd.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf518/boards/ezbrd.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf518/boards/ezbrd.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -615,6 +615,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -649,6 +667,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -843,6 +843,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -877,6 +895,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf527/boards/ezbrd.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf527/boards/ezbrd.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf527/boards/ezbrd.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -674,6 +674,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -708,6 +726,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf527/boards/ezkit.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf527/boards/ezkit.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf527/boards/ezkit.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -887,6 +887,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -921,6 +939,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf533/boards/blackstamp.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf533/boards/blackstamp.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf533/boards/blackstamp.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -305,6 +305,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -339,6 +357,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf533/boards/cm_bf533.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf533/boards/cm_bf533.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf533/boards/cm_bf533.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -365,6 +365,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -399,6 +417,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf533/boards/stamp.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf533/boards/stamp.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf533/boards/stamp.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -432,6 +432,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -466,6 +484,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf537/boards/cm_bf537e.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf537/boards/cm_bf537e.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf537/boards/cm_bf537e.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -556,6 +556,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -590,6 +608,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf537/boards/cm_bf537u.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf537/boards/cm_bf537u.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf537/boards/cm_bf537u.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -557,6 +557,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -591,6 +609,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf537/boards/minotaur.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf537/boards/minotaur.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf537/boards/minotaur.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -430,6 +430,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -464,6 +482,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf537/boards/stamp.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf537/boards/stamp.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf537/boards/stamp.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -1600,6 +1600,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -1634,6 +1652,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf537/boards/tcm_bf537.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf537/boards/tcm_bf537.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf537/boards/tcm_bf537.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -559,6 +559,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -593,6 +611,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf538/boards/ezkit.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf538/boards/ezkit.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf538/boards/ezkit.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -324,6 +324,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -358,6 +376,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
@@ -392,6 +428,24 @@
.end = IRQ_SPORT2_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT2_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport2_peripherals[] = {
@@ -426,6 +480,24 @@
.end = IRQ_SPORT3_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT3_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport3_peripherals[] = {
Modified: trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c (7487 => 7488)
--- trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -605,6 +605,24 @@
.end = IRQ_SPORT0_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport0_peripherals[] = {
@@ -639,6 +657,24 @@
.end = IRQ_SPORT1_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport1_peripherals[] = {
@@ -673,6 +709,24 @@
.end = IRQ_SPORT2_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT2_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport2_peripherals[] = {
@@ -707,6 +761,24 @@
.end = IRQ_SPORT3_ERROR,
.flags = IORESOURCE_IRQ,
},
+#ifdef CONFIG_SERIAL_BFIN_SPORT3_UART_CTSRTS
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+ {
+ /*
+ * Refer to arch/blackfin/mach-xxx/include/mach/gpio.h for the GPIO map.
+ */
+ .start = -1,
+ .end = -1,
+ .flags = IORESOURCE_IO,
+ },
+#endif
};
unsigned short bfin_sport3_peripherals[] = {
Modified: trunk/drivers/serial/Kconfig (7487 => 7488)
--- trunk/drivers/serial/Kconfig 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/drivers/serial/Kconfig 2009-09-28 09:20:57 UTC (rev 7488)
@@ -1360,24 +1360,48 @@
help
Enable UART over SPORT0
+config SERIAL_BFIN_SPORT0_UART_CTSRTS
+ bool "Enable UART over SPORT0 hardware flow control"
+ depends on SERIAL_BFIN_SPORT0_UART
+ help
+ Enable hardware flow control in the driver.
+
config SERIAL_BFIN_SPORT1_UART
bool "Enable UART over SPORT1"
depends on SERIAL_BFIN_SPORT
help
Enable UART over SPORT1
+config SERIAL_BFIN_SPORT1_UART_CTSRTS
+ bool "Enable UART over SPORT1 hardware flow control"
+ depends on SERIAL_BFIN_SPORT1_UART
+ help
+ Enable hardware flow control in the driver.
+
config SERIAL_BFIN_SPORT2_UART
bool "Enable UART over SPORT2"
depends on SERIAL_BFIN_SPORT && (BF54x || BF538 || BF539)
help
Enable UART over SPORT2
+config SERIAL_BFIN_SPORT2_UART_CTSRTS
+ bool "Enable UART over SPORT2 hardware flow control"
+ depends on SERIAL_BFIN_SPORT2_UART
+ help
+ Enable hardware flow control in the driver.
+
config SERIAL_BFIN_SPORT3_UART
bool "Enable UART over SPORT3"
depends on SERIAL_BFIN_SPORT && (BF54x || BF538 || BF539)
help
Enable UART over SPORT3
+config SERIAL_BFIN_SPORT3_UART_CTSRTS
+ bool "Enable UART over SPORT3 hardware flow control"
+ depends on SERIAL_BFIN_SPORT3_UART
+ help
+ Enable hardware flow control in the driver.
+
config SERIAL_TIMBERDALE
tristate "Support for timberdale UART"
depends on MFD_TIMBERDALE
Modified: trunk/drivers/serial/bfin_sport_uart.c (7487 => 7488)
--- trunk/drivers/serial/bfin_sport_uart.c 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/drivers/serial/bfin_sport_uart.c 2009-09-28 09:20:57 UTC (rev 7488)
@@ -47,6 +47,10 @@
unsigned short txmask2;
unsigned char stopb;
/* unsigned char parib; */
+#ifdef CONFIG_SERIAL_BFIN_SPORT_CTSRTS
+ int cts_pin;
+ int rts_pin;
+#endif
};
static void sport_uart_tx_chars(struct sport_uart_port *up);
@@ -197,6 +201,59 @@
return IRQ_HANDLED;
}
+#ifdef CONFIG_SERIAL_BFIN_SPORT_CTSRTS
+static unsigned int sport_get_mctrl(struct uart_port *port)
+{
+ struct sport_uart_port *up = (struct sport_uart_port *)port;
+ if (up->cts_pin < 0)
+ return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
+
+ /* CTS PIN is negative assertive. */
+ if (SPORT_UART_GET_CTS(up))
+ return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
+ else
+ return TIOCM_DSR | TIOCM_CAR;
+}
+
+static void sport_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+ struct sport_uart_port *up = (struct sport_uart_port *)port;
+ if (up->rts_pin < 0)
+ return;
+
+ /* RTS PIN is negative assertive. */
+ if (mctrl & TIOCM_RTS)
+ SPORT_UART_ENABLE_RTS(up);
+ else
+ SPORT_UART_DISABLE_RTS(up);
+}
+
+/*
+ * Handle any change of modem status signal.
+ */
+static irqreturn_t sport_mctrl_cts_int(int irq, void *dev_id)
+{
+ struct sport_uart_port *up = (struct sport_uart_port *)dev_id;
+ unsigned int status;
+
+ status = sport_get_mctrl(&up->port);
+ uart_handle_cts_change(&up->port, status & TIOCM_CTS);
+
+ return IRQ_HANDLED;
+}
+#else
+static unsigned int sport_get_mctrl(struct uart_port *port)
+{
+ pr_debug("%s enter\n", __func__);
+ return TIOCM_CTS | TIOCM_CD | TIOCM_DSR;
+}
+
+static void sport_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+ pr_debug("%s enter\n", __func__);
+}
+#endif
+
/* Reqeust IRQ, Setup clock */
static int sport_startup(struct uart_port *port)
{
@@ -225,6 +282,21 @@
goto fail2;
}
+#ifdef CONFIG_SERIAL_BFIN_SPORT_CTSRTS
+ if (up->cts_pin >= 0) {
+ if (request_irq(gpio_to_irq(up->cts_pin),
+ sport_mctrl_cts_int,
+ IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
+ IRQF_DISABLED, "BFIN_SPORT_UART_CTS", up)) {
+ up->cts_pin = -1;
+ dev_info(port->dev, "Unable to attach BlackFin UART \
+ over SPORT CTS interrupt. So, disable it.\n");
+ }
+ }
+ if (up->rts_pin >= 0)
+ gpio_direction_output(up->rts_pin, 0);
+#endif
+
return 0;
fail2:
free_irq(up->port.irq+1, up);
@@ -283,17 +355,6 @@
return 0;
}
-static unsigned int sport_get_mctrl(struct uart_port *port)
-{
- pr_debug("%s enter\n", __func__);
- return (TIOCM_CTS | TIOCM_CD | TIOCM_DSR);
-}
-
-static void sport_set_mctrl(struct uart_port *port, unsigned int mctrl)
-{
- pr_debug("%s enter\n", __func__);
-}
-
static void sport_stop_tx(struct uart_port *port)
{
struct sport_uart_port *up = (struct sport_uart_port *)port;
@@ -364,6 +425,10 @@
free_irq(up->port.irq, up);
free_irq(up->port.irq+1, up);
free_irq(up->err_irq, up);
+#ifdef CONFIG_SERIAL_BFIN_SPORT_CTSRTS
+ if (up->cts_pin >= 0)
+ free_irq(gpio_to_irq(up->cts_pin), up);
+#endif
}
static const char *sport_type(struct uart_port *port)
@@ -536,7 +601,11 @@
int baud = 57600;
int bits = 8;
int parity = 'n';
+# ifdef CONFIG_SERIAL_BFIN_SPORT_CTSRTS
+ int flow = 'r';
+# else
int flow = 'n';
+# endif
/* Check whether an invalid uart number has been specified */
if (co->index < 0 || co->index >= BFIN_SPORT_UART_MAX_PORTS)
@@ -729,6 +798,22 @@
ret = -ENOENT;
goto out_error_unmap;
}
+#ifdef CONFIG_SERIAL_BFIN_SPORT_CTSRTS
+ res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+ if (res == NULL)
+ sport->cts_pin = -1;
+ else
+ sport->cts_pin = res->start;
+
+ res = platform_get_resource(pdev, IORESOURCE_IO, 1);
+ if (res == NULL)
+ sport->rts_pin = -1;
+ else
+ sport->rts_pin = res->start;
+
+ if (sport->rts_pin >= 0)
+ gpio_request(sport->rts_pin, DRV_NAME);
+#endif
}
#ifdef CONFIG_SERIAL_BFIN_SPORT_CONSOLE
@@ -767,6 +852,10 @@
if (sport) {
uart_remove_one_port(&sport_uart_reg, &sport->port);
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+ if (sport->rts_pin >= 0)
+ gpio_free(sport->rts_pin);
+#endif
iounmap(sport->port.membase);
peripheral_free_list(
(unsigned short *)pdev->dev.platform_data);
Modified: trunk/drivers/serial/bfin_sport_uart.h (7487 => 7488)
--- trunk/drivers/serial/bfin_sport_uart.h 2009-09-28 09:01:28 UTC (rev 7487)
+++ trunk/drivers/serial/bfin_sport_uart.h 2009-09-28 09:20:57 UTC (rev 7488)
@@ -72,4 +72,15 @@
#define SPORT_TX_FIFO_SIZE 8
+#define SPORT_UART_GET_CTS(x) gpio_get_value(x->cts_pin)
+#define SPORT_UART_DISABLE_RTS(x) gpio_set_value(x->rts_pin, 1)
+#define SPORT_UART_ENABLE_RTS(x) gpio_set_value(x->rts_pin, 0)
+
+#if defined(CONFIG_SERIAL_BFIN_SPORT0_UART_CTSRTS) \
+ || defined(CONFIG_SERIAL_BFIN_SPORT1_UART_CTSRTS) \
+ || defined(CONFIG_SERIAL_BFIN_SPORT2_UART_CTSRTS) \
+ || defined(CONFIG_SERIAL_BFIN_SPORT3_UART_CTSRTS)
+# define CONFIG_SERIAL_BFIN_SPORT_CTSRTS
+#endif
+
#endif /* _BFIN_SPORT_UART_H */
