Changeset fe56c08a in mainline for kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c

Timestamp:

2012-01-28T09:17:24Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ca3d77a

Parents:

8da2c60 (diff), 9970a5a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c (modified) (2 diffs)

kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c

@@ -45 +45 @@
 #include <mm/slab.h>
 #include <mm/page.h>
+#include <mm/km.h>
 #include <sysinfo/sysinfo.h>
 #include <str.h>
@@ -113 +114 @@
         uart_dev->data = uart;
 
-        uart->io = (s3c24xx_uart_io_t *) hw_map(paddr, PAGE_SIZE);
+        uart->io = (s3c24xx_uart_io_t *) km_map(paddr, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         uart->indev = NULL;