1 Index: rtems-060602/c/src/lib/libbsp/arm/csb336/console/uart.c
2 ===================================================================
3 --- rtems-060602.orig/c/src/lib/libbsp/arm/csb336/console/uart.c
4 +++ rtems-060602/c/src/lib/libbsp/arm/csb336/console/uart.c
6 /* Define this to use interrupt driver UART driver */
7 #define USE_INTERRUPTS 1
9 +/* Define this to use interrupt driver UART driver */
10 +#define WITH_IRDA_UART1TO3 1
12 +#ifdef WITH_IRDA_UART1TO3
13 +int bsp_uart1_switched_to_3 = 0;
14 +#endif /*WITH_IRDA_UART1TO3*/
16 /* How many serial ports? */
18 #define poll_write(c) imx_uart_poll_write_char(0, c)
19 @@ -185,6 +192,41 @@ static void imx_uart_init(int minor)
20 imx_uart_data[minor].len = 0;
21 imx_uart_data[minor].idx = 0;
23 +#ifdef WITH_IRDA_UART1TO3
25 + if((MC9328MXL_GPIOC_SSR & (1<<9))==0)
26 + bsp_uart1_switched_to_3 = 1;
29 + if ((minor == 0) && bsp_uart1_switched_to_3) {
31 + rtems_interrupt_level flags;
33 + unsigned long iconfa2_clr;
34 + unsigned long ocr2_set;
35 + unsigned long ocr2_clr;
36 + unsigned long ddir_set;
37 + mask = (1<<31) | (1<<30); /* RxD and TxD */
39 + iconfa2_clr = (1<<31) | (1<<30);
42 + rtems_interrupt_disable(flags);
43 + MC9328MXL_GPIOC_ICONFA2 &=~ iconfa2_clr;
44 + MC9328MXL_GPIOC_OCR2 |= ocr2_set;
45 + MC9328MXL_GPIOC_OCR2 &=~ ocr2_clr;
46 + MC9328MXL_GPIOC_GIUS |= mask ; /* GIUS_C */
47 + MC9328MXL_GPIOC_DDIR |= ddir_set;
48 + MC9328MXL_PLL_GCCR |= MC9328MXL_PLL_GCCR_UART3_CLK_EN;
49 + rtems_interrupt_enable(flags);
50 +#if defined(USE_INTERRUPTS)
51 + imx_uart_tx_isr_data[minor].name = BSP_INT_UART3_TX;
52 + imx_uart_rx_isr_data[minor].name = BSP_INT_UART3_RX;
54 + imx_uart_data[minor].regs =
55 + (mc9328mxl_uart_regs_t *) MC9328MXL_UART3_BASE;
57 +#endif /*WITH_IRDA_UART1TO3*/
59 #if defined(USE_INTERRUPTS)
60 imx_uart_tx_isr_data[minor].name = BSP_INT_UART1_TX;
61 Index: rtems-060602/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h
62 ===================================================================
63 --- rtems-060602.orig/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h
64 +++ rtems-060602/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h
66 #define MC9328MXL_LCDC_BASE 0x00205000
67 #define MC9328MXL_UART1_BASE 0x00206000
68 #define MC9328MXL_UART2_BASE 0x00207000
69 +#define MC9328MXL_UART3_BASE 0x0020A000
70 #define MC9328MXL_PWM_BASE 0x00208000
71 #define MC9328MXL_DMAC_BASE 0x00209000
72 #define MC9328MXL_USBD_BASE 0x00212000
74 #define MC9328MXL_UART2_MPR4 (*((volatile uint32_t *)((MC9328MXL_UART2_BASE) + 0xcc)))
75 #define MC9328MXL_UART2_TS (*((volatile uint32_t *)((MC9328MXL_UART2_BASE) + 0xd0)))
77 +#define MC9328MXL_UART3_RXD (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0x00)))
78 +#define MC9328MXL_UART3_TXD (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0x40)))
79 +#define MC9328MXL_UART3_CR1 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0x80)))
80 +#define MC9328MXL_UART3_CR2 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0x84)))
81 +#define MC9328MXL_UART3_CR3 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0x88)))
82 +#define MC9328MXL_UART3_CR4 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0x8c)))
83 +#define MC9328MXL_UART3_FCR (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0x90)))
84 +#define MC9328MXL_UART3_SR1 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0x94)))
85 +#define MC9328MXL_UART3_SR2 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0x98)))
86 +#define MC9328MXL_UART3_ESC (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0x9c)))
87 +#define MC9328MXL_UART3_TIM (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xa0)))
88 +#define MC9328MXL_UART3_BIR (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xa4)))
89 +#define MC9328MXL_UART3_BMR (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xa8)))
90 +#define MC9328MXL_UART3_BRC (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xac)))
91 +#define MC9328MXL_UART3_IPR1 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xb0)))
92 +#define MC9328MXL_UART3_IPR2 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xb4)))
93 +#define MC9328MXL_UART3_IPR3 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xb8)))
94 +#define MC9328MXL_UART3_IPR4 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xbc)))
95 +#define MC9328MXL_UART3_MPR1 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xc0)))
96 +#define MC9328MXL_UART3_MPR2 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xc4)))
97 +#define MC9328MXL_UART3_MPR3 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xc8)))
98 +#define MC9328MXL_UART3_MPR4 (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xcc)))
99 +#define MC9328MXL_UART3_TS (*((volatile uint32_t *)((MC9328MXL_UART3_BASE) + 0xd0)))
102 volatile uint32_t rxd;
103 volatile uint32_t _res0[15];
104 @@ -274,6 +299,12 @@ typedef struct {
105 #define MC9328MXL_PLL_SPCTL1 (*((volatile uint32_t *)((MC9328MXL_PLL_BASE) + 0x10)))
106 #define MC9328MXL_PLL_PCDR (*((volatile uint32_t *)((MC9328MXL_PLL_BASE) + 0x20)))
108 +#define MC9328MXL_PLL_RSR (*((volatile uint32_t *)((MC9328MXL_PLL_BASE) + 0x800)))
109 +#define MC9328MXL_PLL_SIDR (*((volatile uint32_t *)((MC9328MXL_PLL_BASE) + 0x804)))
110 +#define MC9328MXL_PLL_FMCR (*((volatile uint32_t *)((MC9328MXL_PLL_BASE) + 0x808)))
111 +#define MC9328MXL_PLL_GPCR (*((volatile uint32_t *)((MC9328MXL_PLL_BASE) + 0x80C)))
112 +#define MC9328MXL_PLL_GCCR (*((volatile uint32_t *)((MC9328MXL_PLL_BASE) + 0x810)))
114 #define MC9328MXL_PLL_CSCR_CLKOSEL_PERCLK1 (0 << 29)
115 #define MC9328MXL_PLL_CSCR_CLKOSEL_HCLK (1 << 29)
116 #define MC9328MXL_PLL_CSCR_CLKOSEL_CLK48M (2 << 29)
117 @@ -304,6 +335,16 @@ typedef struct {
118 #define MC9328MXL_PLL_PCDR_PCLK3_MASK (0x007f0000)
119 #define MC9328MXL_PLL_PCDR_PCLK3_SHIFT (16)
121 +#define MC9328MXL_PLL_RSR_WDR (bit(1))
122 +#define MC9328MXL_PLL_RSR_EXR (bit(0))
124 +#define MC9328MXL_PLL_GCCR_UART3_CLK_EN (bit(6))
125 +#define MC9328MXL_PLL_GCCR_SSI2_CLK_EN (bit(5))
126 +#define MC9328MXL_PLL_GCCR_BROM_CLK_EN (bit(4))
127 +#define MC9328MXL_PLL_GCCR_DMA_CLK_EN (bit(3))
128 +#define MC9328MXL_PLL_GCCR_CSI_CLK_EN (bit(2))
129 +#define MC9328MXL_PLL_GCCR_MMA_CLK_EN (bit(1))
130 +#define MC9328MXL_PLL_GCCR_USBD_CLK_EN (bit(0))
132 #define MC9328MXL_PLL_SPCTL_PD_MASK (0x3c000000)
133 #define MC9328MXL_PLL_SPCTL_PD_SHIFT (26)