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

Commit 22943a6a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arch/arc updates from Vineet Gupta:
 "Minor updates for ARC for 3.19"

* tag 'arc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: rename default defconfig
  ARC: [nsimosci] move peripherals to match model to FPGA
  ARC: document memory clobber in irq control macros
  ARC: R-M-W assist locks only needed for !LLSC
  ARC: add power management options
parents 39757e73 7a70bf79

arch/arc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -428,3 +428,4 @@ source "arch/arc/Kconfig.debug" 
source "security/Kconfig"

source "crypto/Kconfig"

source "lib/Kconfig"

source "kernel/power/Kconfig"

arch/arc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ ifeq ($(CROSS_COMPILE),) 
CROSS_COMPILE := arc-linux-uclibc-

endif



KBUILD_DEFCONFIG := fpga_defconfig

KBUILD_DEFCONFIG := nsim_700_defconfig



cflags-y	+= -mA7 -fno-common -pipe -fno-builtin -D__linux__

arch/arc/boot/dts/nsimosci.dts

+9 −9
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
		/* this is for console on PGU */

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

		/* this is for console on serial */

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

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

	};



	aliases {
@@ -41,9 +41,9 @@ 
			#interrupt-cells = <1>;

		};



		uart0: serial@c0000000 {

		uart0: serial@f0000000 {

			compatible = "ns8250";

			reg = <0xc0000000 0x2000>;

			reg = <0xf0000000 0x2000>;

			interrupts = <11>;

			clock-frequency = <3686400>;

			baud = <115200>;
@@ -52,21 +52,21 @@ 
			no-loopback-test = <1>;

		};



		pgu0: pgu@c9000000 {

		pgu0: pgu@f9000000 {

			compatible = "snps,arcpgufb";

			reg = <0xc9000000 0x400>;

			reg = <0xf9000000 0x400>;

		};



		ps2: ps2@c9001000 {

		ps2: ps2@f9001000 {

			compatible = "snps,arc_ps2";

			reg = <0xc9000400 0x14>;

			reg = <0xf9000400 0x14>;

			interrupts = <13>;

			interrupt-names = "arc_ps2_irq";

		};



		eth0: ethernet@c0003000 {

		eth0: ethernet@f0003000 {

			compatible = "snps,oscilan";

			reg = <0xc0003000 0x44>;

			reg = <0xf0003000 0x44>;

			interrupts = <7>, <8>;

			interrupt-names = "rx", "tx";

		};

arch/arc/configs/fpga_noramfs_defconfig

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
CONFIG_CROSS_COMPILE="arc-linux-uclibc-"

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_DEFAULT_HOSTNAME="ARCLinux"

# CONFIG_SWAP is not set

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_KPROBES=y

CONFIG_MODULES=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARC_PLAT_FPGA_LEGACY=y

# CONFIG_ARC_HAS_RTSC is not set

CONFIG_ARC_BUILTIN_DTB_NAME="angel4"

CONFIG_PREEMPT=y

# CONFIG_COMPACTION is not set

# CONFIG_CROSS_MEMORY_ATTACH is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_UNIX_DIAG=y

CONFIG_NET_KEY=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

# CONFIG_BLK_DEV is not set

CONFIG_NETDEVICES=y

CONFIG_ARC_EMAC=y

CONFIG_LXT_PHY=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_ARC=y

CONFIG_SERIAL_ARC_CONSOLE=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_XZ_DEC=y