Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 866a30ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 418702b9 65d1e3dd

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

+2 −1
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ 
	};



	chosen {

		bootargs = "debug console=ttyJ0,115200";

		bootargs = "debug earlycon console=ttyJ0,115200";

		stdout-path = &jtag_uart;

	};

};

arch/nios2/kernel/time.c

+4 −1
Original line number Diff line number Diff line
@@ -107,7 +107,10 @@ static struct nios2_clocksource nios2_cs = { 


cycles_t get_cycles(void)

{

	/* 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);