Commit 2309d076 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nds32-for-linus-5.5-rc1' of... 

Merge tag 'nds32-for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux

Pull nds32 updates from Greentime Hu:

 - code clean up

 - add a nds32 maintainer

* tag 'nds32-for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux:
  MAINTAINERS: add nds32 maintainer
  nds32: Move static keyword to the front of declaration
  nds32: Fix typo in Kconfig.cpu
  nds32: remove unneeded clean-files for DTB
parents 6a965666 a7f96fce

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1049,6 +1049,7 @@ F: drivers/clk/analogbits/* 
F:	include/linux/clk/analogbits*









ANDES ARCHITECTURE









M:	Nick Hu <nickhu@andestech.com>









M:	Greentime Hu <green.hu@gmail.com>









M:	Vincent Chen <deanbo422@gmail.com>









T:	git https://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
































arch/nds32/Kconfig.cpu



+4
−4






























Original line number
Diff line number
Diff line







@@ -13,7 +13,7 @@ config FPU







	default n









	help









	  If FPU ISA is used in user space, this configuration shall be Y to









          enable required support in kerenl such as fpu context switch and









          enable required support in kernel such as fpu context switch and









          fpu exception handler.



















	  If no FPU ISA is used in user space, say N.








@@ -27,7 +27,7 @@ config LAZY_FPU







          enhance system performance by reducing the context switch









	  frequency of the FPU register.



















	  For nomal case, say Y.









	  For normal case, say Y.



















config SUPPORT_DENORMAL_ARITHMETIC









	bool "Denormal arithmetic support"








@@ -36,7 +36,7 @@ config SUPPORT_DENORMAL_ARITHMETIC







	help









	  Say Y here to enable arithmetic of denormalized number. Enabling









	  this feature can enhance the precision for tininess number.









	  However, performance loss in float pointe calculations is









	  However, performance loss in float point calculations is









	  possibly significant due to additional FPU exception.



















	  If the calculated tolerance for tininess number is not critical,








@@ -73,7 +73,7 @@ choice







	  the cache aliasing issue. The rest cpus(N13, N10 and D10) are









	  implemented as VIPT data cache. It may cause the cache aliasing issue









	  if its cache way size is larger than page size. You can specify the









	  CPU type direcly or choose CPU_V3 if unsure.









	  CPU type directly or choose CPU_V3 if unsure.



















          A kernel built for N10 is able to run on N15, D15, N13, N10 or D10.









          A kernel built for N15 is able to run on N15 or D15.
































arch/nds32/boot/dts/Makefile



+0
−2






























Original line number
Diff line number
Diff line







@@ -5,5 +5,3 @@ else







BUILTIN_DTB :=









endif









obj-$(CONFIG_OF) += $(BUILTIN_DTB)


















clean-files := *.dtb *.dtb.S
























arch/nds32/kernel/perf_event_cpu.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1119,7 +1119,7 @@ static void cpu_pmu_init(struct nds32_pmu *cpu_pmu)







		on_each_cpu(cpu_pmu->reset, cpu_pmu, 1);









}



















const static struct of_device_id cpu_pmu_of_device_ids[] = {









static const struct of_device_id cpu_pmu_of_device_ids[] = {









	{.compatible = "andestech,nds32v3-pmu",









	 .data = device_pmu_init},









	{},


































































CRA Git | Maintained and supported by SUSTech CRA and CCSE