Changeset 1c7a170 in mainline for kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

Timestamp:

2018-03-27T16:49:29Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

f303afc6 (diff), 94d211e (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-27 16:49:29)

git-committer:

GitHub <noreply@…> (2018-03-27 16:49:29)

Message:

Merge 94d211e1f212626c420cf42c22b056ac1db9c0f1 into f303afc69bfdfc798071487501f775a7c4d8c475

File:

• kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (1 diff)

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

@@ -87 +87 @@
 {
         bbone.irc_addr = (void *) km_map(AM335x_IRC_BASE_ADDRESS,
-            AM335x_IRC_SIZE, PAGE_NOT_CACHEABLE);
+            AM335x_IRC_SIZE,
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
 
         bbone.cm_per_addr = (void *) km_map(AM335x_CM_PER_BASE_ADDRESS,
-            AM335x_CM_PER_SIZE, PAGE_NOT_CACHEABLE);
+            AM335x_CM_PER_SIZE,
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
 
         bbone.cm_dpll_addr = (void *) km_map(AM335x_CM_DPLL_BASE_ADDRESS,
-            AM335x_CM_DPLL_SIZE, PAGE_NOT_CACHEABLE);
+            AM335x_CM_DPLL_SIZE,
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
 
         bbone.ctrl_module = (void *) km_map(AM335x_CTRL_MODULE_BASE_ADDRESS,
-            AM335x_CTRL_MODULE_SIZE, PAGE_NOT_CACHEABLE);
+            AM335x_CTRL_MODULE_SIZE,
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
 
         assert(bbone.irc_addr != NULL);