Skip to content

Commit 2309d07

Browse files
committed
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
2 parents 6a96566 + a7f96fc commit 2309d07

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,6 +1049,7 @@ F: drivers/clk/analogbits/*
10491049
F: include/linux/clk/analogbits*
10501050

10511051
ANDES ARCHITECTURE
1052+
M: Nick Hu <[email protected]>
10521053
M: Greentime Hu <[email protected]>
10531054
M: Vincent Chen <[email protected]>
10541055
T: git https://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git

arch/nds32/Kconfig.cpu

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ config FPU
1313
default n
1414
help
1515
If FPU ISA is used in user space, this configuration shall be Y to
16-
enable required support in kerenl such as fpu context switch and
16+
enable required support in kernel such as fpu context switch and
1717
fpu exception handler.
1818

1919
If no FPU ISA is used in user space, say N.
@@ -27,7 +27,7 @@ config LAZY_FPU
2727
enhance system performance by reducing the context switch
2828
frequency of the FPU register.
2929

30-
For nomal case, say Y.
30+
For normal case, say Y.
3131

3232
config SUPPORT_DENORMAL_ARITHMETIC
3333
bool "Denormal arithmetic support"
@@ -36,7 +36,7 @@ config SUPPORT_DENORMAL_ARITHMETIC
3636
help
3737
Say Y here to enable arithmetic of denormalized number. Enabling
3838
this feature can enhance the precision for tininess number.
39-
However, performance loss in float pointe calculations is
39+
However, performance loss in float point calculations is
4040
possibly significant due to additional FPU exception.
4141

4242
If the calculated tolerance for tininess number is not critical,
@@ -73,7 +73,7 @@ choice
7373
the cache aliasing issue. The rest cpus(N13, N10 and D10) are
7474
implemented as VIPT data cache. It may cause the cache aliasing issue
7575
if its cache way size is larger than page size. You can specify the
76-
CPU type direcly or choose CPU_V3 if unsure.
76+
CPU type directly or choose CPU_V3 if unsure.
7777

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

arch/nds32/boot/dts/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ else
55
BUILTIN_DTB :=
66
endif
77
obj-$(CONFIG_OF) += $(BUILTIN_DTB)
8-
9-
clean-files := *.dtb *.dtb.S

arch/nds32/kernel/perf_event_cpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ static void cpu_pmu_init(struct nds32_pmu *cpu_pmu)
11191119
on_each_cpu(cpu_pmu->reset, cpu_pmu, 1);
11201120
}
11211121

1122-
const static struct of_device_id cpu_pmu_of_device_ids[] = {
1122+
static const struct of_device_id cpu_pmu_of_device_ids[] = {
11231123
{.compatible = "andestech,nds32v3-pmu",
11241124
.data = device_pmu_init},
11251125
{},

0 commit comments

Comments
 (0)