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

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
parents dd1386dd e7513ecc

arch/mips/Makefile

+10 −6
Original line number Diff line number Diff line
@@ -181,12 +181,16 @@ endif 
cflags-$(CONFIG_CAVIUM_CN63XXP1) += -Wa,-mfix-cn63xxp1

cflags-$(CONFIG_CPU_BMIPS)	+= -march=mips32 -Wa,-mips32 -Wa,--trap



cflags-$(CONFIG_CPU_LOONGSON2E) += $(call cc-option,-march=loongson2e) -Wa,--trap

cflags-$(CONFIG_CPU_LOONGSON2F) += $(call cc-option,-march=loongson2f) -Wa,--trap

cflags-$(CONFIG_CPU_LOONGSON64) += $(call cc-option,-march=loongson3a,-march=mips64r2) -Wa,--trap

cflags-$(CONFIG_CPU_LOONGSON2E) += -march=loongson2e -Wa,--trap

cflags-$(CONFIG_CPU_LOONGSON2F) += -march=loongson2f -Wa,--trap

# Some -march= flags enable MMI instructions, and GCC complains about that

# support being enabled alongside -msoft-float. Thus explicitly disable MMI.

cflags-$(CONFIG_CPU_LOONGSON2EF) += $(call cc-option,-mno-loongson-mmi)

ifdef CONFIG_CPU_LOONGSON64

cflags-$(CONFIG_CPU_LOONGSON64)	+= -Wa,--trap

cflags-$(CONFIG_CC_IS_GCC) += -march=loongson3a

cflags-$(CONFIG_CC_IS_CLANG) += -march=mips64r2

endif

cflags-$(CONFIG_CPU_LOONGSON64) += $(call cc-option,-mno-loongson-mmi)



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

  endif



  ifeq ($(KBUILD_SYM32)$(call cc-option-yn,-msym32), yy)

    cflags-y += -msym32 -DKBUILD_64BIT_SYM32

  ifeq ($(KBUILD_SYM32), y)

    cflags-$(KBUILD_SYM32) += -msym32 -DKBUILD_64BIT_SYM32

  else

    ifeq ($(CONFIG_CPU_DADDI_WORKAROUNDS), y)

      $(error CONFIG_CPU_DADDI_WORKAROUNDS unsupported without -msym32)
@@ -341,7 +345,7 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables 


KBUILD_LDFLAGS		+= -m $(ld-emul)



ifdef CONFIG_MIPS

ifdef need-compiler

CHECKFLAGS += $(shell $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -dM -E -x c /dev/null | \

	grep -E -vw '__GNUC_(MINOR_|PATCHLEVEL_)?_' | \

	sed -e "s/^\#define /-D'/" -e "s/ /'='/" -e "s/$$/'/" -e 's/\$$/&&/g')

arch/mips/bmips/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/of.h>

#include <linux/of_clk.h>

#include <linux/of_fdt.h>

#include <linux/of_platform.h>

#include <linux/libfdt.h>

#include <linux/smp.h>

#include <asm/addrspace.h>

arch/mips/cavium-octeon/flash_setup.c

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 
#include <linux/semaphore.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/map.h>

#include <linux/of_platform.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/mtd/partitions.h>



#include <asm/octeon/octeon.h>

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

+1 −1
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
 * Mnemonic names for arguments to memcpy/__copy_user

 */



#include <linux/export.h>

#include <asm/asm.h>

#include <asm/asm-offsets.h>

#include <asm/export.h>

#include <asm/regdef.h>



#define dst a0

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

+2 −0
Original line number Diff line number Diff line
@@ -8,8 +8,10 @@ 
 */



#include <linux/etherdevice.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/of_fdt.h>

#include <linux/platform_device.h>

#include <linux/libfdt.h>



#include <asm/octeon/octeon.h>