diff options
Diffstat (limited to 'recipes/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch')
| -rw-r--r-- | recipes/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch | 268 |
1 files changed, 37 insertions, 231 deletions
diff --git a/recipes/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch b/recipes/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch index 17ee397f45..dbc0ede258 100644 --- a/recipes/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch +++ b/recipes/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch @@ -2,19 +2,19 @@ RS485 auto mode support ported from 2.4 (diff against 2.6.19-rc6-git10) Signed-off-by: Petr Stetiar <ynezz@true.cz> -diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c -index 4213fab..5b3c5ff 100644 ---- a/drivers/serial/amba-pl010.c -+++ b/drivers/serial/amba-pl010.c -@@ -50,6 +50,7 @@ - #include <linux/amba/serial.h> +Index: linux-2.6.24/drivers/serial/amba-pl010.c +=================================================================== +--- linux-2.6.24.orig/drivers/serial/amba-pl010.c 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24/drivers/serial/amba-pl010.c 2010-02-07 18:17:40.000000000 +0100 +@@ -51,6 +51,7 @@ + #include <linux/clk.h> #include <asm/io.h> +#include <asm/hardware.h> #define UART_NR 8 -@@ -65,6 +66,11 @@ +@@ -66,6 +67,16 @@ #define UART_DUMMY_RSR_RX 256 #define UART_PORT_SIZE 64 @@ -23,10 +23,15 @@ index 4213fab..5b3c5ff 100644 +static void __iomem *ts_rs485_control_register; +#endif + ++#ifdef CONFIG_MACH_TS72XX ++static void __iomem *ts_rs485_data9_register; ++static void __iomem *ts_rs485_control_register; ++#endif ++ /* * We wrap our port structure around the generic uart_port. */ -@@ -487,6 +493,107 @@ static int pl010_verify_port(struct uart +@@ -521,6 +532,107 @@ return ret; } @@ -134,7 +139,7 @@ index 4213fab..5b3c5ff 100644 static struct uart_ops amba_pl010_pops = { .tx_empty = pl010_tx_empty, .set_mctrl = pl010_set_mctrl, -@@ -504,6 +611,7 @@ static struct uart_ops amba_pl010_pops = +@@ -538,6 +650,7 @@ .request_port = pl010_request_port, .config_port = pl010_config_port, .verify_port = pl010_verify_port, @@ -142,7 +147,7 @@ index 4213fab..5b3c5ff 100644 }; static struct uart_amba_port *amba_ports[UART_NR]; -@@ -746,6 +854,15 @@ static int __init pl010_init(void) +@@ -796,6 +909,15 @@ ret = uart_register_driver(&amba_reg); if (ret == 0) { ret = amba_driver_register(&pl010_driver); @@ -158,7 +163,7 @@ index 4213fab..5b3c5ff 100644 if (ret) uart_unregister_driver(&amba_reg); } -@@ -756,6 +873,10 @@ static void __exit pl010_exit(void) +@@ -806,6 +928,10 @@ { amba_driver_unregister(&pl010_driver); uart_unregister_driver(&amba_reg); @@ -169,13 +174,13 @@ index 4213fab..5b3c5ff 100644 } module_init(pl010_init); -diff --git a/include/asm-arm/arch-ep93xx/ts72xx.h b/include/asm-arm/arch-ep93xx/ts72xx.h -index a94f63f..4c9396b 100644 ---- a/include/asm-arm/arch-ep93xx/ts72xx.h -+++ b/include/asm-arm/arch-ep93xx/ts72xx.h -@@ -68,6 +68,16 @@ - #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000 - #define TS72XX_RTC_DATA_SIZE 0x00001000 +Index: linux-2.6.24/include/asm-arm/arch-ep93xx/ts72xx.h +=================================================================== +--- linux-2.6.24.orig/include/asm-arm/arch-ep93xx/ts72xx.h 2010-02-07 18:03:02.000000000 +0100 ++++ linux-2.6.24/include/asm-arm/arch-ep93xx/ts72xx.h 2010-02-07 18:03:02.000000000 +0100 +@@ -59,6 +59,16 @@ + #define TS72XX_NAND_BUSY_VIRT_BASE 0xfebfa000 + #define TS72XX_NAND_BUSY_SIZE 0x00001000 +#define TS72XX_RS485_CONTROL_PHYS_BASE 0x22C00000 +#define TS72XX_RS485_DATA9_PHYS_BASE 0x23000000 @@ -188,211 +193,9 @@ index a94f63f..4c9396b 100644 +#define TS72XX_RS485_MODE_57600_HD 0x06 +#define TS72XX_RS485_MODE_115200_HD 0x07 - #ifndef __ASSEMBLY__ - #include <asm/io.h> -@@ -87,6 +100,12 @@ static inline int board_is_ts7260(void) - return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7260; - } - -+static inline int is_rs485_installed(void) -+{ -+ return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) & -+ TS72XX_OPTIONS_COM2_RS485); -+} -+ - static inline int is_max197_installed(void) - { - return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) & -diff --git a/include/asm-arm/ioctls.h b/include/asm-arm/ioctls.h -index bb9a7aa..4d7dad1 100644 ---- a/include/asm-arm/ioctls.h -+++ b/include/asm-arm/ioctls.h -@@ -66,6 +66,9 @@ - #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ - #define FIOQSIZE 0x545E - -+#define TIOC_SBCC485 0x545F /* TS72xx RTS/485 mode clear */ -+#define TIOC_SBCS485 0x5460 /* TS72xx RTS/485 mode set */ -+ - /* Used for packet mode */ - #define TIOCPKT_DATA 0 - #define TIOCPKT_FLUSHREAD 1 -RS485 auto mode support ported from 2.4 (diff against 2.6.19-rc6-git10) - -Signed-off-by: Petr Stetiar <ynezz@true.cz> - -diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c -index 4213fab..5b3c5ff 100644 ---- a/drivers/serial/amba-pl010.c -+++ b/drivers/serial/amba-pl010.c -@@ -50,6 +50,7 @@ - #include <linux/amba/serial.h> - - #include <asm/io.h> -+#include <asm/hardware.h> - - #define UART_NR 8 - -@@ -65,6 +66,11 @@ - #define UART_DUMMY_RSR_RX 256 - #define UART_PORT_SIZE 64 - -+#ifdef CONFIG_MACH_TS72XX -+static void __iomem *ts_rs485_data9_register; -+static void __iomem *ts_rs485_control_register; -+#endif -+ - /* - * We wrap our port structure around the generic uart_port. - */ -@@ -487,6 +493,107 @@ static int pl010_verify_port(struct uart - return ret; - } - -+#ifdef CONFIG_MACH_TS72XX -+static int ts72xx_rs485_init(void) -+{ -+ ts_rs485_data9_register = ioremap(TS72XX_RS485_DATA9_PHYS_BASE, 4096); -+ if (ts_rs485_data9_register == NULL) { -+ return -1; -+ } -+ -+ ts_rs485_control_register = ioremap(TS72XX_RS485_CONTROL_PHYS_BASE, 4096); -+ if (ts_rs485_control_register == NULL) { -+ iounmap(ts_rs485_data9_register); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static int ts72xx_auto485(struct uart_port *port, unsigned int cmd, unsigned long *arg) -+{ -+ int baud, cflag, mode; -+ int datalength; -+ -+ mode = (int)*arg; -+ if (!is_rs485_installed()) { -+ printk("amba-pl010.c: this board does not support RS485 auto mode\n"); -+ return -EINVAL; -+ } -+ -+ if (port->line != 1) { -+ printk("amba-pl010.c: auto RS485 mode is only supported on second port (/dev/ttyAM1)\n"); -+ return -EINVAL; -+ } -+ -+ datalength = 8; -+ cflag = port->info->tty->termios->c_cflag ; -+ if (cflag & PARENB) -+ datalength++; -+ -+ if (cflag & CSTOPB) -+ datalength++; -+ -+ baud = tty_get_baud_rate(port->info->tty); -+ -+ switch (cmd) { -+ case TIOC_SBCC485: -+ if ((mode & TS72XX_RS485_AUTO485FD) || (mode & TS72XX_RS485_AUTO485HD)) { -+ printk("amba-pl010.c: unsetting auto RS485 mode\n"); -+ __raw_writew(TS72XX_RS485_MODE_RS232, ts_rs485_control_register); -+ __raw_writew(TS72XX_RS485_MODE_RS232, ts_rs485_data9_register); -+ } -+ break; -+ case TIOC_SBCS485: -+ if (mode & TS72XX_RS485_AUTO485FD) { -+ printk ("amba-pl010.c: setting FULL duplex auto RS485 mode\n"); -+ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_control_register); -+ if (datalength > 8) -+ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_data9_register); -+ } else if (mode & TS72XX_RS485_AUTO485HD) { -+ printk("amba-pl010.c: setting HALF DUPLEX auto RS485 mode\n"); -+ switch (baud) { -+ case 9600: -+ __raw_writew(TS72XX_RS485_MODE_9600_HD, ts_rs485_control_register); -+ break; -+ case 19200: -+ __raw_writew(TS72XX_RS485_MODE_19200_HD, ts_rs485_control_register); -+ break; -+ case 57600: -+ __raw_writew(TS72XX_RS485_MODE_57600_HD, ts_rs485_control_register); -+ break; -+ case 115200: -+ __raw_writew(TS72XX_RS485_MODE_115200_HD, ts_rs485_control_register); -+ break; -+ default: -+ printk("amba-pl010.c: %d baud rate is not supported for auto RS485 mode\n", baud); -+ return -1; -+ } -+ if (datalength > 8) -+ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_data9_register); -+ } -+ break; -+ } -+ -+ return 0; -+} -+#endif -+ -+int pl010_ioctl(struct uart_port *port, unsigned int cmd, unsigned long arg) -+{ -+#ifdef CONFIG_MACH_TS72XX -+ switch (cmd) { -+ case TIOC_SBCC485: -+ case TIOC_SBCS485: -+ return ts72xx_auto485(port, cmd, (unsigned long *)arg); -+ break; -+ default: -+ return -ENOIOCTLCMD; -+ } -+#endif -+ return -ENOIOCTLCMD; -+} -+ - static struct uart_ops amba_pl010_pops = { - .tx_empty = pl010_tx_empty, - .set_mctrl = pl010_set_mctrl, -@@ -504,6 +611,7 @@ static struct uart_ops amba_pl010_pops = - .request_port = pl010_request_port, - .config_port = pl010_config_port, - .verify_port = pl010_verify_port, -+ .ioctl = pl010_ioctl, - }; - - static struct uart_amba_port *amba_ports[UART_NR]; -@@ -746,6 +854,15 @@ static int __init pl010_init(void) - ret = uart_register_driver(&amba_reg); - if (ret == 0) { - ret = amba_driver_register(&pl010_driver); -+#ifdef CONFIG_MACH_TS72XX -+ if (!ret && is_rs485_installed()) { -+ ret = ts72xx_rs485_init(); -+ if (ret) -+ printk("amba-pl010.c: ts72xx_rs485_init() failed\n"); -+ else -+ printk("amba-pl010.c: auto RS485 mode initialized\n"); -+ } -+#endif - if (ret) - uart_unregister_driver(&amba_reg); - } -@@ -756,6 +873,10 @@ static void __exit pl010_exit(void) - { - amba_driver_unregister(&pl010_driver); - uart_unregister_driver(&amba_reg); -+#ifdef CONFIG_MACH_TS72XX -+ iounmap(ts_rs485_data9_register); -+ iounmap(ts_rs485_control_register); -+#endif - } - - module_init(pl010_init); -diff --git a/include/asm-arm/arch-ep93xx/ts72xx.h b/include/asm-arm/arch-ep93xx/ts72xx.h -index a94f63f..4c9396b 100644 ---- a/include/asm-arm/arch-ep93xx/ts72xx.h -+++ b/include/asm-arm/arch-ep93xx/ts72xx.h -@@ -68,6 +68,16 @@ + #define TS72XX_RTC_INDEX_VIRT_BASE 0xfebf9000 + #define TS72XX_RTC_INDEX_PHYS_BASE 0x10800000 +@@ -68,6 +78,16 @@ #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000 #define TS72XX_RTC_DATA_SIZE 0x00001000 @@ -407,9 +210,9 @@ index a94f63f..4c9396b 100644 +#define TS72XX_RS485_MODE_57600_HD 0x06 +#define TS72XX_RS485_MODE_115200_HD 0x07 - #ifndef __ASSEMBLY__ - #include <asm/io.h> -@@ -87,6 +100,12 @@ static inline int board_is_ts7260(void) + #define TS72XX_WATCHDOG_CONTROL_PHYS_BASE 0x23800000 + #define TS72XX_WATCHDOG_FEED_PHYS_BASE 0x23c00000 +@@ -90,6 +110,12 @@ return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7260; } @@ -422,17 +225,20 @@ index a94f63f..4c9396b 100644 static inline int is_max197_installed(void) { return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) & -diff --git a/include/asm-arm/ioctls.h b/include/asm-arm/ioctls.h -index bb9a7aa..4d7dad1 100644 ---- a/include/asm-arm/ioctls.h -+++ b/include/asm-arm/ioctls.h -@@ -66,6 +66,9 @@ +Index: linux-2.6.24/include/asm-arm/ioctls.h +=================================================================== +--- linux-2.6.24.orig/include/asm-arm/ioctls.h 2008-01-24 23:58:37.000000000 +0100 ++++ linux-2.6.24/include/asm-arm/ioctls.h 2010-02-07 18:03:02.000000000 +0100 +@@ -70,6 +70,12 @@ #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ #define FIOQSIZE 0x545E +#define TIOC_SBCC485 0x545F /* TS72xx RTS/485 mode clear */ +#define TIOC_SBCS485 0x5460 /* TS72xx RTS/485 mode set */ + ++#define TIOC_SBCC485 0x545F /* TS72xx RTS/485 mode clear */ ++#define TIOC_SBCS485 0x5460 /* TS72xx RTS/485 mode set */ ++ /* Used for packet mode */ #define TIOCPKT_DATA 0 #define TIOCPKT_FLUSHREAD 1 |