Changes in kernel/arch/arm32/src/mach/beaglebone/beaglebone.c [3c9646b:9c56996] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/arm32/src/mach/beaglebone/beaglebone.c
r3c9646b r9c56996 63 63 64 64 static struct beaglebone { 65 omap_irc_regs_t *irc_addr;65 am335x_irc_regs_t *irc_addr; 66 66 am335x_cm_per_regs_t *cm_per_addr; 67 67 am335x_cm_dpll_regs_t *cm_dpll_addr; 68 68 am335x_ctrl_module_t *ctrl_module; 69 69 am335x_timer_t timer; 70 omap_uart_t uart;70 am335x_uart_t uart; 71 71 } bbone; 72 72 … … 104 104 105 105 /* Initialize the interrupt controller */ 106 omap_irc_init(bbone.irc_addr);106 am335x_irc_init(bbone.irc_addr); 107 107 } 108 108 … … 153 153 } 154 154 /* Enable the interrupt */ 155 omap_irc_enable(bbone.irc_addr, AM335x_DMTIMER2_IRQ);155 am335x_irc_enable(bbone.irc_addr, AM335x_DMTIMER2_IRQ); 156 156 /* Start the timer */ 157 157 am335x_timer_start(&bbone.timer); … … 176 176 static void bbone_irq_exception(unsigned int exc_no, istate_t *istate) 177 177 { 178 const unsigned inum = omap_irc_inum_get(bbone.irc_addr); 178 const unsigned inum = am335x_irc_inum_get(bbone.irc_addr); 179 am335x_irc_irq_ack(bbone.irc_addr); 179 180 180 181 irq_t *irq = irq_dispatch_and_lock(inum); … … 186 187 printf("Spurious interrupt\n"); 187 188 } 188 189 omap_irc_irq_ack(bbone.irc_addr);190 189 } 191 190 … … 196 195 static void bbone_output_init(void) 197 196 { 198 #ifdef CONFIG_OMAP_UART 199 const bool ok = omap_uart_init(&bbone.uart, 197 const bool ok = am335x_uart_init(&bbone.uart, 200 198 AM335x_UART0_IRQ, AM335x_UART0_BASE_ADDRESS, 201 199 AM335x_UART0_SIZE); … … 203 201 if (ok) 204 202 stdout_wire(&bbone.uart.outdev); 205 #endif206 203 } 207 204 208 205 static void bbone_input_init(void) 209 206 { 210 #ifdef CONFIG_OMAP_UART211 207 srln_instance_t *srln_instance = srln_init(); 212 208 if (srln_instance) { 213 209 indev_t *sink = stdin_wire(); 214 210 indev_t *srln = srln_wire(srln_instance, sink); 215 omap_uart_input_wire(&bbone.uart, srln);216 omap_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);211 am335x_uart_input_wire(&bbone.uart, srln); 212 am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ); 217 213 } 218 #endif219 214 } 220 215
Note:
See TracChangeset
for help on using the changeset viewer.