Changeset b38c079 in mainline

Timestamp:

2013-05-01T00:08:28Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7ca8422b

Parents:

9e7898e

Message:

am335x: implementation of a generic omap uart driver derived from the am335x code.

Files:

• HelenOS.config (modified) (2 diffs)
• kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (3 diffs)
• kernel/genarch/Makefile.inc (modified) (1 diff)
• kernel/genarch/include/genarch/drivers/am335x/uart.h (modified) (2 diffs)
• kernel/genarch/include/genarch/drivers/am335x/uart_regs.h (deleted)
• kernel/genarch/include/genarch/drivers/omap/uart.h (added)
• kernel/genarch/include/genarch/drivers/omap/uart_regs.h (added)
• kernel/genarch/src/drivers/omap/uart.c (added)

HelenOS.config

@@ -487 +487 @@
 ! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y)
 
-% Support for TI AM335x on-chip UART
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_UART (y/n)
+% Support for OMAP on-chip UART
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beaglebone] CONFIG_OMAP_UART (y/n)
 
 % Support for TI AM335x timers support
@@ -515 +515 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_AM335X_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_AMDM37X_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
+! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_AMDM37X_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
 
 % EGA support

kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

@@ -68 +68 @@
         am335x_ctrl_module_t  *ctrl_module;
         am335x_timer_t timer;
-        am335x_uart_t uart;
+        omap_uart_t uart;
 } bbone;
 
@@ -195 +195 @@
 static void bbone_output_init(void)
 {
-        const bool ok = am335x_uart_init(&bbone.uart,
+        const bool ok = omap_uart_init(&bbone.uart,
             AM335x_UART0_IRQ, AM335x_UART0_BASE_ADDRESS,
             AM335x_UART0_SIZE);
@@ -209 +209 @@
                 indev_t *sink = stdin_wire();
                 indev_t *srln = srln_wire(srln_instance, sink);
-                am335x_uart_input_wire(&bbone.uart, srln);
+                omap_uart_input_wire(&bbone.uart, srln);
                 am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
         }

kernel/genarch/Makefile.inc

@@ -105 +105 @@
 endif
 
-ifeq ($(CONFIG_AM335X_UART),y)
+ifeq ($(CONFIG_OMAP_UART),y)
         GENARCH_SOURCES += \
-                genarch/src/drivers/am335x/uart.c
+                genarch/src/drivers/omap/uart.c
 endif
 

kernel/genarch/include/genarch/drivers/am335x/uart.h

@@ -37 +37 @@
 #define _KERN_AM335X_UART_H_
 
-#include "uart_regs.h"
+#include <genarch/drivers/omap/uart.h>
 
 #define AM335x_UART0_BASE_ADDRESS    0x44E09000
@@ -63 +63 @@
 #define AM335x_UART5_IRQ             46
 
-typedef struct {
-        am335x_uart_regs_t *regs;
-        indev_t *indev;
-        outdev_t outdev;
-        irq_t irq;
-} am335x_uart_t;
-
-#ifdef CONFIG_AM335X_UART
-extern bool am335x_uart_init(am335x_uart_t *uart, inr_t interrupt,
-    uintptr_t addr, size_t size);
-
-extern void am335x_uart_input_wire(am335x_uart_t *uart, indev_t *indev);
-#else
-static bool am335x_uart_init(am335x_uart_t *uart, inr_t interrupt,
-    uintptr_t addr, size_t size)
-{ return true; }
-
-static void am335x_uart_input_wire(am335x_uart_t *uart, indev_t *indev) {}
-#endif
-
 #endif