xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'nios2-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2

Browse Source 
Pull arch/nios2 update from Ley Foon Tan.

* tag 'nios2-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: time: Read timer in get_cycles only if initialized
  nios2: add earlycon support to 3c120 devboard DTS
This commit is contained in:
Linus Torvalds
2017-09-15 12:47:21 -07:00
parent 418702b910 65d1e3ddea
commit 866a30efdc
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/nios2/boot/dts/3c120_devboard.dts
View File

@@ -159,6 +159,7 @@
};
chosen {
bootargs = "debug console=ttyJ0,115200";
bootargs = "debug earlycon console=ttyJ0,115200";
stdout-path = &jtag_uart;
};
};

5
arch/nios2/kernel/time.c
View File

@@ -107,7 +107,10 @@ static struct nios2_clocksource nios2_cs = {
cycles_t get_cycles(void)
{
return nios2_timer_read(&nios2_cs.cs);
/* Only read timer if it has been initialized */
if (nios2_cs.timer.base)
return nios2_timer_read(&nios2_cs.cs);
return 0;
}
EXPORT_SYMBOL(get_cycles);