Changeset c882505 in mainline for kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c

Timestamp:

2013-03-26T17:44:16Z (11 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

44b2b78

Parents:

0dfa93b0

Message:

Merge arm926 and bcm2835 drivers for pl011 uart and move the code
under a generic directory

File:

• kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c (modified) (2 diffs)

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

@@ -36 +36 @@
 #include <arch/exception.h>
 #include <arch/mach/raspberrypi/raspberrypi.h>
-#include <genarch/drivers/bcm2835/pl011_uart.h>
+#include <genarch/drivers/pl011/pl011.h>
 #include <genarch/drivers/bcm2835/irc.h>
 #include <genarch/drivers/bcm2835/timer.h>
@@ -169 +169 @@
 static void raspberrypi_output_init(void)
 {
-#ifdef CONFIG_BCM2835_UART
+#ifdef CONFIG_PL011_UART
         if (pl011_uart_init(&raspi.uart, BCM2835_UART_IRQ,
-                            PL011_UART0_BASE_ADDRESS,
-                            sizeof(pl011_uart_regs_t)))
+                            BCM2835_UART0_BASE_ADDRESS))
                 stdout_wire(&raspi.uart.outdev);
 #endif