Changeset 6be2c13 in mainline for kernel/genarch/include/genarch/drivers/amdm37x/gpt.h

Timestamp:

2018-03-16T20:58:20Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

973be387 (diff), 4b1c7c6f (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-16 20:58:20)

git-committer:

GitHub <noreply@…> (2018-03-16 20:58:20)

Message:

Merge 4b1c7c6ff1e7b982f389a8f841b71af2a85e8cfb into 973be38782462a672111ff6833f8dbb40d2a44bf

File:

• kernel/genarch/include/genarch/drivers/amdm37x/gpt.h (modified) (2 diffs)

kernel/genarch/include/genarch/drivers/amdm37x/gpt.h

@@ -208 +208 @@
         // TODO find a nicer way to setup 32kHz clock source for timer1
         // reg 0x48004C40 is CM_CLKSEL_WKUP see page 485 of the manual
-        ioport32_t *clksel = (void*) km_map(0x48004C40, 4, PAGE_NOT_CACHEABLE);
+        ioport32_t *clksel = (void*) km_map(0x48004C40, 4, 0);
         *clksel &= ~1;
         km_unmap((uintptr_t)clksel, 4);
@@ -214 +214 @@
         assert(timer);
         /* Map control register */
-        timer->regs = (void*) km_map(ioregs, iosize, PAGE_NOT_CACHEABLE);
+        timer->regs = (void*) km_map(ioregs, iosize, 0);
 
         /* Reset the timer */