Commit 3573d386 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC changes from Vineet Gupta:
 - Support for external initrd from Noam
 - Fix broken serial console in nsimosci Virtual Platform
 - Reuse of ENTRY/END assembler macros across hand asm code
 - Other minor fixes here and there

* tag 'arc-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: [nsimosci] Unbork console
  ARC: [nsimosci] Change .dts to use generic 8250 UART
  ARC: [SMP] General Fixes
  ARC: Remove unused DT template file
  ARC: [clockevent] simplify timer ISR
  ARC: [clockevent] can't be SoC specific
  ARC: Remove ARC_HAS_COH_RTSC
  ARC: switch to generic ENTRY/END assembler annotations
  ARC: support external initrd
  ARC: add uImage to .gitignore
  ARC: [arcfpga] Fix __initconst data const-correctness
parents c8d9762a 61fb4bfc

arch/arc/boot/.gitignore

+1 −0
Original line number Diff line number Diff line 
*.dtb*

uImage

arch/arc/boot/dts/nsimosci.dts

+7 −5
Original line number Diff line number Diff line
@@ -11,13 +11,16 @@ 


/ {

	compatible = "snps,nsimosci";

	clock-frequency = <80000000>;	/* 80 MHZ */

	clock-frequency = <20000000>;	/* 20 MHZ */

	#address-cells = <1>;

	#size-cells = <1>;

	interrupt-parent = <&intc>;



	chosen {

		bootargs = "console=tty0 consoleblank=0";

		/* this is for console on PGU */

		/* bootargs = "console=tty0 consoleblank=0"; */

		/* this is for console on serial */

		bootargs = "earlycon=uart8250,mmio32,0xc0000000,115200n8 console=ttyS0,115200n8 consoleblank=0 debug";

	};



	aliases {
@@ -44,15 +47,14 @@ 
		};



		uart0: serial@c0000000 {

			compatible = "snps,dw-apb-uart";

			compatible = "ns8250";

			reg = <0xc0000000 0x2000>;

			interrupts = <11>;

			#clock-frequency = <80000000>;

			clock-frequency = <3686400>;

			baud = <115200>;

			reg-shift = <2>;

			reg-io-width = <4>;

			status = "okay";

			no-loopback-test = <1>;

		};



		pgu0: pgu@c9000000 {

arch/arc/boot/dts/skeleton.dts

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Synopsys, Inc. (www.synopsys.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

/dts-v1/;



/include/ "skeleton.dtsi"

arch/arc/configs/nsimosci_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ CONFIG_SERIO_ARC_PS2=y 
CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_DW=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_ARC=y

CONFIG_SERIAL_ARC_CONSOLE=y

# CONFIG_HW_RANDOM is not set

arch/arc/include/asm/linkage.h

+0 −14
Original line number Diff line number Diff line
@@ -13,20 +13,6 @@ 


#define ASM_NL		 `	/* use '`' to mark new line in macro */



/* Can't use the ENTRY macro in linux/linkage.h

 * gas considers ';' as comment vs. newline

 */

.macro ARC_ENTRY name

	.global \name

	.align 4

	\name:

.endm



.macro ARC_EXIT name

#define ASM_PREV_SYM_ADDR(name)  .-##name

	.size \ name, ASM_PREV_SYM_ADDR(\name)

.endm



/* annotation for data we want in DCCM - if enabled in .config */

.macro ARCFP_DATA nm

#ifdef CONFIG_ARC_HAS_DCCM

CRA Git | Maintained and supported by SUSTech CRA and CCSE