Skip to content

Commit ac2224a

Browse files
torvaldstorvalds
committed
Merge tag 'mips_6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS updates from Thomas Bogendoerfer: "Just cleanups and fixes" * tag 'mips_6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: MIPS: TXx9: Do PCI error checks on own line arch/mips/configs/*_defconfig cleanup MIPS: VDSO: Conditionally export __vdso_gettimeofday() Mips: loongson3_defconfig: Enable ast drm driver by default mips: remove <asm/export.h> mips: replace #include <asm/export.h> with #include <linux/export.h> mips: remove unneeded #include <asm/export.h> MIPS: Loongson64: Fix more __iomem attributes MIPS: loongson32: Remove regs-rtc.h MIPS: loongson32: Remove regs-clk.h MIPS: More explicit DT include clean-ups MIPS: Fixup explicit DT include clean-up Revert MIPS: Loongson: Fix build error when make modules_install MIPS: Only fiddle with CHECKFLAGS if `need-compiler' MIPS: Fix CONFIG_CPU_DADDI_WORKAROUNDS `modules_install' regression MIPS: Explicitly include correct DT includes
2 parents dd1386d + e7513ec commit ac2224a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+149
-252
lines changed

‎arch/mips/Makefile

+10-6
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,16 @@ endif
181181
cflags-$(CONFIG_CAVIUM_CN63XXP1) += -Wa,-mfix-cn63xxp1
182182
cflags-$(CONFIG_CPU_BMIPS) += -march=mips32 -Wa,-mips32 -Wa,--trap
183183

184-
cflags-$(CONFIG_CPU_LOONGSON2E) += $(call cc-option,-march=loongson2e) -Wa,--trap
185-
cflags-$(CONFIG_CPU_LOONGSON2F) += $(call cc-option,-march=loongson2f) -Wa,--trap
186-
cflags-$(CONFIG_CPU_LOONGSON64) += $(call cc-option,-march=loongson3a,-march=mips64r2) -Wa,--trap
184+
cflags-$(CONFIG_CPU_LOONGSON2E) += -march=loongson2e -Wa,--trap
185+
cflags-$(CONFIG_CPU_LOONGSON2F) += -march=loongson2f -Wa,--trap
187186
# Some -march= flags enable MMI instructions, and GCC complains about that
188187
# support being enabled alongside -msoft-float. Thus explicitly disable MMI.
189188
cflags-$(CONFIG_CPU_LOONGSON2EF) += $(call cc-option,-mno-loongson-mmi)
189+
ifdef CONFIG_CPU_LOONGSON64
190+
cflags-$(CONFIG_CPU_LOONGSON64) += -Wa,--trap
191+
cflags-$(CONFIG_CC_IS_GCC) += -march=loongson3a
192+
cflags-$(CONFIG_CC_IS_CLANG) += -march=mips64r2
193+
endif
190194
cflags-$(CONFIG_CPU_LOONGSON64) += $(call cc-option,-mno-loongson-mmi)
191195

192196
cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,)
@@ -299,8 +303,8 @@ ifdef CONFIG_64BIT
299303
endif
300304
endif
301305

302-
ifeq ($(KBUILD_SYM32)$(call cc-option-yn,-msym32), yy)
303-
cflags-y += -msym32 -DKBUILD_64BIT_SYM32
306+
ifeq ($(KBUILD_SYM32), y)
307+
cflags-$(KBUILD_SYM32) += -msym32 -DKBUILD_64BIT_SYM32
304308
else
305309
ifeq ($(CONFIG_CPU_DADDI_WORKAROUNDS), y)
306310
$(error CONFIG_CPU_DADDI_WORKAROUNDS unsupported without -msym32)
@@ -341,7 +345,7 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
341345

342346
KBUILD_LDFLAGS += -m $(ld-emul)
343347

344-
ifdef CONFIG_MIPS
348+
ifdef need-compiler
345349
CHECKFLAGS += $(shell $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -dM -E -x c /dev/null | \
346350
grep -E -vw '__GNUC_(MINOR_|PATCHLEVEL_)?_' | \
347351
sed -e "s/^\#define /-D'/" -e "s/ /'='/" -e "s/$$/'/" -e 's/\$$/&&/g')

‎arch/mips/bmips/setup.c

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <linux/of.h>
1717
#include <linux/of_clk.h>
1818
#include <linux/of_fdt.h>
19-
#include <linux/of_platform.h>
2019
#include <linux/libfdt.h>
2120
#include <linux/smp.h>
2221
#include <asm/addrspace.h>

‎arch/mips/cavium-octeon/flash_setup.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
#include <linux/semaphore.h>
1313
#include <linux/mtd/mtd.h>
1414
#include <linux/mtd/map.h>
15-
#include <linux/of_platform.h>
15+
#include <linux/of.h>
16+
#include <linux/platform_device.h>
1617
#include <linux/mtd/partitions.h>
1718

1819
#include <asm/octeon/octeon.h>

‎arch/mips/cavium-octeon/octeon-memcpy.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* Mnemonic names for arguments to memcpy/__copy_user
1414
*/
1515

16+
#include <linux/export.h>
1617
#include <asm/asm.h>
1718
#include <asm/asm-offsets.h>
18-
#include <asm/export.h>
1919
#include <asm/regdef.h>
2020

2121
#define dst a0

‎arch/mips/cavium-octeon/octeon-platform.c

+2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
*/
99

1010
#include <linux/etherdevice.h>
11+
#include <linux/of.h>
1112
#include <linux/of_platform.h>
1213
#include <linux/of_fdt.h>
14+
#include <linux/platform_device.h>
1315
#include <linux/libfdt.h>
1416

1517
#include <asm/octeon/octeon.h>

‎arch/mips/configs/ip22_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ CONFIG_IP_NF_MATCH_TTL=m
127127
CONFIG_IP_NF_FILTER=m
128128
CONFIG_IP_NF_TARGET_REJECT=m
129129
CONFIG_IP_NF_MANGLE=m
130-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
131130
CONFIG_IP_NF_TARGET_ECN=m
132131
CONFIG_IP_NF_TARGET_TTL=m
133132
CONFIG_IP_NF_RAW=m

‎arch/mips/configs/loongson3_defconfig

+1
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ CONFIG_DRM_AMDGPU_USERPTR=y
283283
CONFIG_DRM_AMD_ACP=y
284284
CONFIG_DRM_AMD_DC=y
285285
CONFIG_DRM_AMD_DC_SI=y
286+
CONFIG_DRM_AST=m
286287
CONFIG_DRM_RADEON=m
287288
CONFIG_DRM_QXL=y
288289
CONFIG_DRM_VIRTIO_GPU=y

‎arch/mips/configs/malta_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ CONFIG_IP_NF_MATCH_TTL=m
127127
CONFIG_IP_NF_FILTER=m
128128
CONFIG_IP_NF_TARGET_REJECT=m
129129
CONFIG_IP_NF_MANGLE=m
130-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
131130
CONFIG_IP_NF_TARGET_ECN=m
132131
CONFIG_IP_NF_TARGET_TTL=m
133132
CONFIG_IP_NF_RAW=m

‎arch/mips/configs/malta_kvm_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ CONFIG_IP_NF_MATCH_TTL=m
131131
CONFIG_IP_NF_FILTER=m
132132
CONFIG_IP_NF_TARGET_REJECT=m
133133
CONFIG_IP_NF_MANGLE=m
134-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
135134
CONFIG_IP_NF_TARGET_ECN=m
136135
CONFIG_IP_NF_TARGET_TTL=m
137136
CONFIG_IP_NF_RAW=m

‎arch/mips/configs/maltaup_xpa_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ CONFIG_IP_NF_MATCH_TTL=m
128128
CONFIG_IP_NF_FILTER=m
129129
CONFIG_IP_NF_TARGET_REJECT=m
130130
CONFIG_IP_NF_MANGLE=m
131-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
132131
CONFIG_IP_NF_TARGET_ECN=m
133132
CONFIG_IP_NF_TARGET_TTL=m
134133
CONFIG_IP_NF_RAW=m

‎arch/mips/configs/rm200_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ CONFIG_IP_NF_MATCH_TTL=m
9090
CONFIG_IP_NF_FILTER=m
9191
CONFIG_IP_NF_TARGET_REJECT=m
9292
CONFIG_IP_NF_MANGLE=m
93-
CONFIG_IP_NF_TARGET_CLUSTERIP=m
9493
CONFIG_IP_NF_TARGET_ECN=m
9594
CONFIG_IP_NF_TARGET_TTL=m
9695
CONFIG_IP_NF_RAW=m

‎arch/mips/include/asm/Kbuild

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ generated-y += unistd_nr_n32.h
77
generated-y += unistd_nr_n64.h
88
generated-y += unistd_nr_o32.h
99

10-
generic-y += export.h
1110
generic-y += kvm_para.h
1211
generic-y += mcs_spinlock.h
1312
generic-y += parport.h

‎arch/mips/include/asm/mach-loongson32/loongson1.h

-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
#define LS1X_NAND_BASE 0x1fe78000
4646
#define LS1X_CLK_BASE 0x1fe78030
4747

48-
#include <regs-clk.h>
4948
#include <regs-mux.h>
50-
#include <regs-rtc.h>
5149

5250
#endif /* __ASM_MACH_LOONGSON32_LOONGSON1_H */

‎arch/mips/include/asm/mach-loongson32/regs-clk.h

-81
This file was deleted.

‎arch/mips/include/asm/mach-loongson32/regs-rtc.h

-19
This file was deleted.

‎arch/mips/kernel/mcount.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Author: Wu Zhangjin <[email protected]>
1111
*/
1212

13-
#include <asm/export.h>
13+
#include <linux/export.h>
1414
#include <asm/regdef.h>
1515
#include <asm/stackframe.h>
1616
#include <asm/ftrace.h>

‎arch/mips/kernel/octeon_switch.S

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
* written by Carsten Langgaard, [email protected]
1212
*/
1313
#include <asm/asm.h>
14-
#include <asm/export.h>
1514
#include <asm/asm-offsets.h>
1615
#include <asm/mipsregs.h>
1716
#include <asm/regdef.h>

‎arch/mips/kernel/r2300_fpu.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
* Further modifications to make this work:
1212
* Copyright (c) 1998 Harald Koerfgen
1313
*/
14+
#include <linux/export.h>
1415
#include <asm/asm.h>
1516
#include <asm/asmmacro.h>
1617
#include <asm/errno.h>
17-
#include <asm/export.h>
1818
#include <asm/fpregdef.h>
1919
#include <asm/mipsregs.h>
2020
#include <asm/asm-offsets.h>

‎arch/mips/kernel/r2300_switch.S

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
*/
1414
#include <asm/asm.h>
1515
#include <asm/cachectl.h>
16-
#include <asm/export.h>
1716
#include <asm/fpregdef.h>
1817
#include <asm/mipsregs.h>
1918
#include <asm/asm-offsets.h>

‎arch/mips/kernel/r4k_fpu.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
* Copyright (C) 2000 MIPS Technologies, Inc.
1313
* Copyright (C) 1999, 2001 Silicon Graphics, Inc.
1414
*/
15+
#include <linux/export.h>
1516
#include <asm/asm.h>
1617
#include <asm/asmmacro.h>
1718
#include <asm/errno.h>
18-
#include <asm/export.h>
1919
#include <asm/fpregdef.h>
2020
#include <asm/mipsregs.h>
2121
#include <asm/asm-offsets.h>

‎arch/mips/lantiq/irq.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/sched.h>
1111
#include <linux/irqchip.h>
1212
#include <linux/irqdomain.h>
13-
#include <linux/of_platform.h>
13+
#include <linux/of.h>
1414
#include <linux/of_address.h>
1515
#include <linux/of_irq.h>
1616

‎arch/mips/lantiq/xway/dcdc.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
*/
77

88
#include <linux/ioport.h>
9-
#include <linux/of_platform.h>
9+
#include <linux/mod_devicetable.h>
10+
#include <linux/platform_device.h>
1011

1112
#include <lantiq_soc.h>
1213

‎arch/mips/lantiq/xway/gptu.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
#include <linux/interrupt.h>
99
#include <linux/ioport.h>
1010
#include <linux/init.h>
11-
#include <linux/of_platform.h>
11+
#include <linux/mod_devicetable.h>
1212
#include <linux/of_irq.h>
13+
#include <linux/platform_device.h>
1314

1415
#include <lantiq_soc.h>
1516
#include "../clk.h"

‎arch/mips/lantiq/xway/sysctrl.c

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <linux/clkdev.h>
1111
#include <linux/spinlock.h>
1212
#include <linux/of.h>
13-
#include <linux/of_platform.h>
1413
#include <linux/of_address.h>
1514

1615
#include <lantiq_soc.h>

‎arch/mips/lantiq/xway/vmmc.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#include <linux/err.h>
88
#include <linux/export.h>
99
#include <linux/gpio/consumer.h>
10-
#include <linux/of_platform.h>
10+
#include <linux/mod_devicetable.h>
11+
#include <linux/platform_device.h>
1112
#include <linux/dma-mapping.h>
1213

1314
#include <lantiq_soc.h>

‎arch/mips/lib/csum_partial.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
* Copyright (C) 2014 Imagination Technologies Ltd.
1212
*/
1313
#include <linux/errno.h>
14+
#include <linux/export.h>
1415
#include <asm/asm.h>
1516
#include <asm/asm-offsets.h>
16-
#include <asm/export.h>
1717
#include <asm/regdef.h>
1818

1919
#ifdef CONFIG_64BIT

‎arch/mips/lib/memcpy.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
#undef CONFIG_CPU_HAS_PREFETCH
3333
#endif
3434

35+
#include <linux/export.h>
3536
#include <asm/asm.h>
3637
#include <asm/asm-offsets.h>
37-
#include <asm/export.h>
3838
#include <asm/regdef.h>
3939

4040
#define dst a0

‎arch/mips/lib/memset.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
* Copyright (C) 2007 by Maciej W. Rozycki
99
* Copyright (C) 2011, 2012 MIPS Technologies, Inc.
1010
*/
11+
#include <linux/export.h>
1112
#include <asm/asm.h>
1213
#include <asm/asm-offsets.h>
13-
#include <asm/export.h>
1414
#include <asm/regdef.h>
1515

1616
#if LONGSIZE == 4

‎arch/mips/lib/strncpy_user.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* Copyright (C) 2011 MIPS Technologies, Inc.
88
*/
99
#include <linux/errno.h>
10+
#include <linux/export.h>
1011
#include <asm/asm.h>
1112
#include <asm/asm-offsets.h>
12-
#include <asm/export.h>
1313
#include <asm/regdef.h>
1414

1515
#define EX(insn,reg,addr,handler) \

‎arch/mips/lib/strnlen_user.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
* Copyright (c) 1996, 1998, 1999, 2004 by Ralf Baechle
77
* Copyright (c) 1999 Silicon Graphics, Inc.
88
*/
9+
#include <linux/export.h>
910
#include <asm/asm.h>
1011
#include <asm/asm-offsets.h>
11-
#include <asm/export.h>
1212
#include <asm/regdef.h>
1313

1414
#define EX(insn,reg,addr,handler) \

0 commit comments

Comments
 (0)