Commit b32649b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARC updates from Vineet Gupta:
 "The bulk of ARC pull request is removal of EZChip NPS platform which
  was suffering from constant bitrot. In recent years EZChip has gone
  though multiple successive acquisitions and I guess things and people
  move on. I would like to take this opportunity to recognize and thank
  all those good folks (Gilad, Noam, Ofer...) for contributing major
  bits to ARC port (SMP, Big Endian).

  Summary:

   - drop support for EZChip NPS platform

   - misc other fixes"

* tag 'arc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  arc: include/asm: fix typos of "themselves"
  ARC: SMP: fix typo and use "come up" instead of "comeup"
  ARC: [dts] fix the errors detected by dtbs_check
  arc: plat-hsdk: fix kconfig dependency warning when !RESET_CONTROLLER
  ARC: [plat-eznps]: Drop support for EZChip NPS platform
parents 270315b8 6364d1b4

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -6652,13 +6652,6 @@ L: iommu@lists.linux-foundation.org 
S:	Maintained

F:	drivers/iommu/exynos-iommu.c









EZchip NPS platform support









M:	Vineet Gupta <vgupta@synopsys.com>









M:	Ofer Levi <oferle@nvidia.com>









S:	Supported









F:	arch/arc/boot/dts/eznps.dts









F:	arch/arc/plat-eznps

















F2FS FILE SYSTEM









M:	Jaegeuk Kim <jaegeuk@kernel.org>









M:	Chao Yu <yuchao0@huawei.com>
































arch/arc/Kconfig



+0
−2






























Original line number
Diff line number
Diff line







@@ -96,8 +96,6 @@ menu "ARC Platform/SoC/Board"

















source "arch/arc/plat-tb10x/Kconfig"









source "arch/arc/plat-axs10x/Kconfig"









#New platform adds here









source "arch/arc/plat-eznps/Kconfig"









source "arch/arc/plat-hsdk/Kconfig"



















endmenu
































arch/arc/Makefile



+0
−5






























Original line number
Diff line number
Diff line







@@ -94,13 +94,8 @@ core-y		+= arch/arc/boot/dts/







core-y				+= arch/arc/plat-sim/









core-$(CONFIG_ARC_PLAT_TB10X)	+= arch/arc/plat-tb10x/









core-$(CONFIG_ARC_PLAT_AXS10X)	+= arch/arc/plat-axs10x/









core-$(CONFIG_ARC_PLAT_EZNPS)	+= arch/arc/plat-eznps/









core-$(CONFIG_ARC_SOC_HSDK)	+= arch/arc/plat-hsdk/



















ifdef CONFIG_ARC_PLAT_EZNPS









KBUILD_CPPFLAGS += -I$(srctree)/arch/arc/plat-eznps/include









endif



















drivers-$(CONFIG_OPROFILE)	+= arch/arc/oprofile/



















libs-y		+= arch/arc/lib/ $(LIBGCC)
































arch/arc/boot/dts/axc001.dtsi



+1
−1






























Original line number
Diff line number
Diff line







@@ -91,7 +91,7 @@







	 * avoid duplicating the MB dtsi file given that IRQ from









	 * this intc to cpu intc are different for axs101 and axs103









	 */









	mb_intc: dw-apb-ictl@e0012000 {









	mb_intc: interrupt-controller@e0012000 {









		#interrupt-cells = <1>;









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









		reg = < 0x0 0xe0012000 0x0 0x200 >;
































arch/arc/boot/dts/axc003.dtsi



+1
−1






























Original line number
Diff line number
Diff line







@@ -129,7 +129,7 @@







	 * avoid duplicating the MB dtsi file given that IRQ from









	 * this intc to cpu intc are different for axs101 and axs103









	 */









	mb_intc: dw-apb-ictl@e0012000 {









	mb_intc: interrupt-controller@e0012000 {









		#interrupt-cells = <1>;









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









		reg = < 0x0 0xe0012000 0x0 0x200 >;








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE