Merge tag 'mips_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips

0f002fdd · Linus Torvalds <[email protected]> · 2017-02-21 14:21:11 -08:00

Pull MIPS updates from James Hogan:
 "Here's the main MIPS pull request for 4.11.

  It contains a few new features such as IRQ stacks, cacheinfo support,
  and KASLR for Octeon CPUs, and a variety of smaller improvements and
  fixes including devicetree additions, kexec cleanups, microMIPS stack
  unwinding fixes, and a bunch of build fixes to clean up continuous
  integration builds.

  Its all been in linux-next for at least a couple of days, most of it
  far longer.

  Miscellaneous:
   - Add IRQ stacks
   - Add cacheinfo support
   - Add "uzImage.bin" zboot target
   - Unify performance counter definitions
   - Export various (mainly assembly) symbols alongside their
     definitions
   - Audit and remove unnecessary uses of module.h

  kexec & kdump:
   - Lots of improvements and fixes
   - Add correct copy_regs implementations
   - Add debug logging of new kernel information

  Security:
   - Use Makefile.postlink to insert relocations into vmlinux
   - Provide plat_post_relocation hook (used for Octeon KASLR)
   - Add support for tuning mmap randomisation
   - Relocate DTB

  microMIPS:
   - A load of unwind fixes
   - Add some missing .insn to fix link errors

  MIPSr6:
   - Fix MULTU/MADDU/MSUBU sign extension in r2 emulation
   - Remove r2_emul_return and use ERETNC unconditionally on MIPSr6
   - Allow pre-r6 emulation on SMP MIPSr6 kernels

  Cache management:
   - Treat physically indexed dcache as non-aliasing
   - Add return errors to protected cache ops for KVM
   - CM3: Ensure L1 & L2 cache ECC checking matches
   - CM3: Indicate inclusive caches
   - I6400: Treat dcache as physically indexed

  Memory management:
   - Ensure bootmem doesn't corrupt reserved memory
   - Export some TLB exception generation functions for KVM

  OF:
   - NULL check initial_boot_params before use in of_scan_flat_dt()
   - Fix unaligned access in of_alias_scan()

  SMP:
   - CPS: Don't BUG if a CPU fails to start

  Other fixes:
   - Fix longstanding 64-bit IP checksum carry bug
   - Fix KERN_CONT fallout in cpu-bugs64.c and sync-r4k.c
   - Update defconfigs for NF_CT_PROTO_DCCP, DPLITE,
     CPU_FREQ_STAT,SCSI_DH changes
   - Disable certain builtin compiler options, stack-check (whole
     kernel), asynchronous-unwind-tables (VDSO).
   - A bunch of build fixes from kernelci.org testing
   - Various other minor cleanups & corrections

  BMIPS:
   - Migrate interrupts during bmips_cpu_disable
   - BCM47xx: Add Luxul devices
   - BCM47xx: Fix Asus WL-500W button inversion
   - BCM7xxx: Add SPI device nodes

  Generic (multiplatform):
   - Add kexec DTB passing
   - Fix big endian
   - Add cpp_its_S in ksym_dep_filter to silence build warning

  IP22:
   - Reformat inline assembler code to modern standards
   - Fix binutils 2.25 build error

  IP27:
   - Fix duplicate CAC_BASE definition build error
   - Disable qlge driver to workaround broken compiler

  Lantiq:
   - Refresh defconfig and activate more drivers
   - Lock DMA register access
   - Fix cascading IRQ setup
   - Fix build of VPE loader
   - xway: Fix ethernet packet header corruption over reboot

  Loongson1
   - Add watchdog support
   - 1B: Reduce DEFAULT_MEMSIZE to 64MB
   - 1B: Change OSC clock name to match rest of kernel
   - 1C: Remove ARCH_WANT_OPTIONAL_GPIOLIB

  Octeon:
   - Add KASLR support
   - Support Octeon III USB controller
   - Fix large copy_from_user corner case
   - Enable devtmpfs in defconfig

  Netlogic:
   - Fix non-default XLR build error due to netlogic,xlp-pic code
   - Fix assembler warning from smpboot.S

  pic32mzda:
   - Fix linker error when early printk is disabled

  Pistachio:
   - Add base device tree
   - Add Ci40 "Marduk" device tree

  Ralink:
   - Support raw appended DTB
   - Add missing I2C & I2S clocks
   - Add missing pinmux and fix pinmux function name typo
   - Add missing clk_round_rate()
   - Clean up prom_init()
   - MT7621: Set SoC type
   - MT7621: Support highmem

  TXx9:
   - Modernize printing of kernel messages and resolve KERN_CONT fallout
   - 7segled: use permission-specific DEVICE_ATTR variants

  XilFPGA:
   - Add IRQ controller and UART IRQ
   - Add AXI I2C and emaclite to DT & defconfig"

* tag 'mips_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips: (148 commits)
  MIPS: VDSO: Explicitly use -fno-asynchronous-unwind-tables
  MIPS: BCM47XX: Fix button inversion for Asus WL-500W
  MIPS: DTS: Add img directory to Makefile
  MIPS: ip27: Disable qlge driver in defconfig
  MIPS: pic32mzda: Fix linker error for pic32_get_pbclk()
  MIPS: Lantiq: Keep ethernet enabled during boot
  MIPS: OCTEON: Fix copy_from_user fault handling for large buffers
  MIPS: Fix special case in 64 bit IP checksumming.
  MIPS: OCTEON: Enable DEVTMPFS
  MIPS: lantiq: Set physical_memsize
  MIPS: sysmips: Remove duplicated include from syscall.c
  Kbuild: Add cpp_its_S in ksym_dep_filter
  MIPS: Audit and remove any unnecessary uses of module.h
  MIPS: Unify perf counter register definitions
  MIPS: Disable stack checks on MIPS kernels
  MIPS: OCTEON: Platform support for OCTEON III USB controller
  MIPS: Lantiq: Fix cascaded IRQ setup
  MIPS: sync-r4k: Fix KERN_CONT fallout
  MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch
  MIPS: Fix distclean with Makefile.postlink
  ...

Commit: 0f002fddbe150ec3f2afce3fc09de5bda3096c72
Parents: 252b95c0 · cfd75c2d

Merge commit. Changes below are compared with the first parent: 252b95c0.

Changes

253 files changed · +4091 −1030

File	Status	Add	Del	Content
Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt	added	+10	−0	View file
MAINTAINERS	modified	+7	−1	View file
arch/mips/Kconfig	modified	+29	−12	View file
arch/mips/Makefile	modified	+21	−14	View file
arch/mips/Makefile.postlink	added	+35	−0	View file
arch/mips/alchemy/board-gpr.c	modified	+0	−1	View file
arch/mips/alchemy/common/dbdma.c	modified	+1	−1	View file
arch/mips/alchemy/common/dma.c	modified	+1	−1	View file
arch/mips/alchemy/common/gpiolib.c	modified	+0	−1	View file
arch/mips/alchemy/common/prom.c	modified	+0	−1	View file
arch/mips/alchemy/common/usb.c	modified	+1	−1	View file
arch/mips/alchemy/common/vss.c	modified	+1	−1	View file
arch/mips/alchemy/devboards/bcsr.c	modified	+2	−1	View file
arch/mips/ar7/clock.c	modified	+1	−1	View file
arch/mips/ar7/gpio.c	modified	+2	−1	View file
arch/mips/ar7/memory.c	modified	+0	−1	View file
arch/mips/ar7/platform.c	modified	+0	−1	View file
arch/mips/ar7/prom.c	modified	+1	−1	View file
arch/mips/ath79/clock.c	modified	+6	−4	View file
arch/mips/ath79/common.c	modified	+1	−1	View file
arch/mips/bcm47xx/board.c	modified	+9	−0	View file
arch/mips/bcm47xx/buttons.c	modified	+80	−2	View file
arch/mips/bcm47xx/leds.c	modified	+81	−0	View file
arch/mips/bcm63xx/clk.c	modified	+2	−1	View file
arch/mips/bcm63xx/cpu.c	modified	+1	−1	View file
arch/mips/bcm63xx/cs.c	modified	+2	−1	View file
arch/mips/bcm63xx/gpio.c	modified	+1	−1	View file
arch/mips/bcm63xx/irq.c	modified	+0	−1	View file
arch/mips/bcm63xx/reset.c	modified	+2	−1	View file
arch/mips/bcm63xx/timer.c	modified	+2	−1	View file
arch/mips/boot/compressed/Makefile	modified	+7	−3	View file
arch/mips/boot/dts/Makefile	modified	+1	−0	View file
arch/mips/boot/dts/brcm/bcm7125.dtsi	modified	+46	−3	View file
arch/mips/boot/dts/brcm/bcm7346.dtsi	modified	+43	−0	View file
arch/mips/boot/dts/brcm/bcm7358.dtsi	modified	+43	−0	View file
arch/mips/boot/dts/brcm/bcm7360.dtsi	modified	+43	−0	View file
arch/mips/boot/dts/brcm/bcm7362.dtsi	modified	+43	−0	View file
arch/mips/boot/dts/brcm/bcm7420.dtsi	modified	+46	−3	View file
arch/mips/boot/dts/brcm/bcm7425.dtsi	modified	+43	−0	View file
arch/mips/boot/dts/brcm/bcm7435.dtsi	modified	+43	−0	View file
arch/mips/boot/dts/brcm/bcm97125cbmb.dts	modified	+4	−0	View file
arch/mips/boot/dts/brcm/bcm97346dbsmb.dts	modified	+4	−0	View file
arch/mips/boot/dts/brcm/bcm97358svmb.dts	modified	+36	−0	View file
arch/mips/boot/dts/brcm/bcm97360svmb.dts	modified	+36	−0	View file
arch/mips/boot/dts/brcm/bcm97362svmb.dts	modified	+4	−0	View file
arch/mips/boot/dts/brcm/bcm97420c.dts	modified	+4	−0	View file
arch/mips/boot/dts/brcm/bcm97425svmb.dts	modified	+36	−0	View file
arch/mips/boot/dts/brcm/bcm97435svmb.dts	modified	+4	−0	View file
arch/mips/boot/dts/img/Makefile	added	+9	−0	View file
arch/mips/boot/dts/img/pistachio.dtsi	added	+924	−0	View file
arch/mips/boot/dts/img/pistachio_marduk.dts	added	+163	−0	View file
arch/mips/boot/dts/xilfpga/nexys4ddr.dts	modified	+63	−0	View file
arch/mips/cavium-octeon/Makefile	modified	+1	−0	View file
arch/mips/cavium-octeon/crypto/octeon-crypto.c	modified	+1	−1	View file
arch/mips/cavium-octeon/dma-octeon.c	modified	+5	−10	View file
arch/mips/cavium-octeon/executive/cvmx-bootmem.c	modified	+1	−1	View file
arch/mips/cavium-octeon/executive/cvmx-helper-errata.c	modified	+1	−1	View file
arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c	modified	+1	−2	View file
arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c	modified	+1	−2	View file
arch/mips/cavium-octeon/executive/cvmx-helper-spi.c	modified	+1	−2	View file
arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c	modified	+1	−2	View file
arch/mips/cavium-octeon/executive/cvmx-helper.c	modified	+1	−46	View file
arch/mips/cavium-octeon/executive/cvmx-sysinfo.c	modified	+1	−1	View file
arch/mips/cavium-octeon/octeon-memcpy.S	modified	+17	−8	View file
arch/mips/cavium-octeon/octeon-platform.c	modified	+1	−0	View file
arch/mips/cavium-octeon/octeon-usb.c	added	+552	−0	View file
arch/mips/cavium-octeon/setup.c	modified	+23	−0	View file
arch/mips/cavium-octeon/smp.c	modified	+20	−4	View file
arch/mips/configs/cavium_octeon_defconfig	modified	+1	−0	View file
arch/mips/configs/ip22_defconfig	modified	+2	−2	View file
arch/mips/configs/ip27_defconfig	modified	+1	−2	View file
arch/mips/configs/lemote2f_defconfig	modified	+1	−1	View file
arch/mips/configs/loongson1b_defconfig	modified	+4	−0	View file
arch/mips/configs/loongson1c_defconfig	modified	+4	−0	View file
arch/mips/configs/malta_defconfig	modified	+2	−2	View file
arch/mips/configs/malta_kvm_defconfig	modified	+2	−2	View file
arch/mips/configs/malta_kvm_guest_defconfig	modified	+2	−2	View file
arch/mips/configs/maltaup_xpa_defconfig	modified	+2	−2	View file
arch/mips/configs/nlm_xlp_defconfig	modified	+1	−1	View file
arch/mips/configs/nlm_xlr_defconfig	modified	+1	−1	View file
arch/mips/configs/xilfpga_defconfig	modified	+36	−1	View file
arch/mips/configs/xway_defconfig	modified	+13	−8	View file
arch/mips/dec/prom/identify.c	modified	+1	−1	View file
arch/mips/dec/setup.c	modified	+1	−1	View file
arch/mips/dec/wbflush.c	modified	+1	−3	View file
arch/mips/emma/markeins/setup.c	modified	+1	−1	View file
arch/mips/generic/Makefile	modified	+1	−0	View file
arch/mips/generic/init.c	modified	+13	−0	View file
arch/mips/generic/kexec.c	added	+44	−0	View file
arch/mips/include/asm/Kbuild	modified	+2	−0	View file
arch/mips/include/asm/asm-prototypes.h	added	+5	−0	View file
arch/mips/include/asm/asm.h	modified	+6	−4	View file
arch/mips/include/asm/bootinfo.h	modified	+13	−0	View file
arch/mips/include/asm/checksum.h	modified	+2	−0	View file
arch/mips/include/asm/elf.h	modified	+9	−0	View file
arch/mips/include/asm/highmem.h	modified	+0	−3	View file
arch/mips/include/asm/i8259.h	modified	+0	−1	View file
arch/mips/include/asm/irq.h	modified	+12	−0	View file
arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h	modified	+9	−0	View file
arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h	modified	+13	−2	View file
arch/mips/include/asm/mach-ip27/spaces.h	modified	+4	−2	View file
arch/mips/include/asm/mach-loongson32/loongson1.h	modified	+5	−4	View file
arch/mips/include/asm/mach-loongson32/platform.h	modified	+5	−4	View file
arch/mips/include/asm/mach-loongson32/regs-rtc.h	added	+23	−0	View file
arch/mips/include/asm/mach-ralink/mt7620.h	modified	+6	−1	View file
arch/mips/include/asm/mips-cm.h	modified	+7	−0	View file
arch/mips/include/asm/mipsregs.h	modified	+33	−0	View file
arch/mips/include/asm/octeon/cvmx-gpio-defs.h	modified	+6	−2	View file
arch/mips/include/asm/octeon/cvmx-helper-rgmii.h	modified	+1	−2	View file
arch/mips/include/asm/octeon/cvmx-helper-sgmii.h	modified	+1	−2	View file
arch/mips/include/asm/octeon/cvmx-helper-spi.h	modified	+1	−2	View file
arch/mips/include/asm/octeon/cvmx-helper-xaui.h	modified	+1	−2	View file
arch/mips/include/asm/octeon/cvmx-helper.h	modified	+1	−13	View file
arch/mips/include/asm/pgalloc.h	modified	+1	−15	View file
arch/mips/include/asm/r4kcache.h	modified	+39	−22	View file
arch/mips/include/asm/smp.h	modified	+1	−9	View file
arch/mips/include/asm/stackframe.h	modified	+11	−8	View file
arch/mips/include/asm/switch_to.h	modified	+12	−6	View file
arch/mips/include/asm/thread_info.h	modified	+0	−1	View file
arch/mips/include/asm/tlbex.h	added	+26	−0	View file
arch/mips/include/asm/uaccess.h	modified	+18	−0	View file
arch/mips/include/asm/uasm.h	modified	+5	−0	View file
arch/mips/include/asm/unaligned.h	deleted	+0	−28	View before deletion
arch/mips/jazz/jazzdma.c	modified	+1	−1	View file
arch/mips/jz4740/gpio.c	modified	+1	−1	View file
arch/mips/jz4740/prom.c	modified	+0	−1	View file
arch/mips/jz4740/timer.c	modified	+2	−1	View file
arch/mips/kernel/Makefile	modified	+2	−2	View file
arch/mips/kernel/asm-offsets.c	modified	+1	−1	View file
arch/mips/kernel/cacheinfo.c	added	+87	−0	View file
arch/mips/kernel/cpu-bugs64.c	modified	+12	−12	View file
arch/mips/kernel/crash.c	modified	+1	−1	View file
arch/mips/kernel/entry.S	modified	+0	−18	View file
arch/mips/kernel/genex.S	modified	+76	−5	View file
arch/mips/kernel/irq.c	modified	+11	−0	View file
arch/mips/kernel/linux32.c	modified	+3	−8	View file
arch/mips/kernel/machine_kexec.c	modified	+22	−0	View file
arch/mips/kernel/mcount.S	modified	+3	−0	View file
arch/mips/kernel/mips-mt-fpaff.c	modified	+3	−2	View file
arch/mips/kernel/mips-r2-to-r6-emul.c	modified	+6	−6	View file
arch/mips/kernel/mips_ksyms.c	deleted	+0	−94	View before deletion
arch/mips/kernel/perf_event_mipsxx.c	modified	+23	−32	View file
arch/mips/kernel/process.c	modified	+157	−57	View file
arch/mips/kernel/prom.c	modified	+7	−0	View file
arch/mips/kernel/ptrace.c	modified	+2	−32	View file
arch/mips/kernel/r2300_switch.S	modified	+2	−0	View file
arch/mips/kernel/r4k_switch.S	modified	+3	−0	View file
arch/mips/kernel/relocate.c	modified	+55	−1	View file
arch/mips/kernel/setup.c	modified	+91	−3	View file
arch/mips/kernel/smp-bmips.c	modified	+1	−1	View file
arch/mips/kernel/smp-cps.c	modified	+5	−2	View file
arch/mips/kernel/smp.c	modified	+9	−25	View file
arch/mips/kernel/sync-r4k.c	modified	+2	−2	View file
arch/mips/kernel/syscall.c	modified	+2	−10	View file
arch/mips/kernel/traps.c	modified	+60	−5	View file
arch/mips/kernel/uprobes.c	modified	+1	−1	View file
arch/mips/kernel/vmlinux.lds.S	modified	+1	−1	View file
arch/mips/lantiq/irq.c	modified	+17	−21	View file
arch/mips/lantiq/prom.c	modified	+6	−0	View file
arch/mips/lantiq/xway/dma.c	modified	+21	−20	View file
arch/mips/lantiq/xway/gptu.c	modified	+1	−2	View file
arch/mips/lantiq/xway/sysctrl.c	modified	+6	−6	View file
arch/mips/lasat/at93c.c	modified	+0	−1	View file
arch/mips/lasat/sysctl.c	modified	+0	−1	View file
arch/mips/lib/csum_partial.S	modified	+6	−0	View file
arch/mips/lib/memcpy.S	modified	+9	−0	View file
arch/mips/lib/memset.S	modified	+5	−0	View file
arch/mips/lib/strlen_user.S	modified	+4	−0	View file
arch/mips/lib/strncpy_user.S	modified	+7	−0	View file
arch/mips/lib/strnlen_user.S	modified	+7	−0	View file
arch/mips/loongson32/common/platform.c	modified	+28	−17	View file
arch/mips/loongson32/ls1b/board.c	modified	+4	−3	View file
arch/mips/loongson32/ls1c/board.c	modified	+4	−3	View file
arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c	modified	+1	−1	View file
arch/mips/loongson64/common/dma-swiotlb.c	modified	+6	−14	View file
arch/mips/loongson64/common/env.c	modified	+1	−1	View file
arch/mips/loongson64/common/setup.c	modified	+2	−1	View file
arch/mips/loongson64/common/uart_base.c	modified	+1	−1	View file
arch/mips/loongson64/lemote-2f/ec_kb3310b.c	modified	+2	−1	View file
arch/mips/loongson64/lemote-2f/irq.c	modified	+2	−1	View file
arch/mips/loongson64/lemote-2f/pm.c	modified	+1	−1	View file
arch/mips/loongson64/loongson-3/irq.c	modified	+1	−1	View file
arch/mips/loongson64/loongson-3/numa.c	modified	+1	−1	View file
arch/mips/loongson64/loongson-3/smp.c	modified	+0	−1	View file
arch/mips/mm/Makefile	modified	+1	−1	View file
arch/mips/mm/c-r4k.c	modified	+5	−1	View file
arch/mips/mm/init.c	modified	+3	−0	View file
arch/mips/mm/mmap.c	modified	+5	−5	View file
arch/mips/mm/page-funcs.S	modified	+3	−0	View file
arch/mips/mm/page.c	modified	+2	−0	View file
arch/mips/mm/pgtable-64.c	modified	+2	−0	View file
arch/mips/mm/pgtable.c	added	+25	−0	View file
arch/mips/mm/sc-ip22.c	modified	+34	−20	View file
arch/mips/mm/sc-mips.c	modified	+1	−0	View file
arch/mips/mm/tlbex.c	modified	+23	−21	View file
arch/mips/mti-malta/malta-platform.c	modified	+0	−1	View file
arch/mips/netlogic/common/irq.c	modified	+2	−2	View file
arch/mips/netlogic/common/smpboot.S	modified	+2	−2	View file
arch/mips/netlogic/xlp/wakeup.c	modified	+1	−1	View file
arch/mips/oprofile/op_model_mipsxx.c	modified	+13	−27	View file
arch/mips/pci/pci-tx4927.c	modified	+11	−11	View file
arch/mips/pci/pci-tx4938.c	modified	+15	−15	View file
arch/mips/pci/pci-tx4939.c	modified	+5	−5	View file
arch/mips/pic32/pic32mzda/Makefile	modified	+2	−3	View file
arch/mips/pmcs-msp71xx/msp_prom.c	modified	+1	−1	View file
arch/mips/pmcs-msp71xx/msp_time.c	modified	+0	−1	View file
arch/mips/ralink/Kconfig	modified	+1	−0	View file
arch/mips/ralink/clk.c	modified	+8	−1	View file
arch/mips/ralink/irq.c	modified	+2	−2	View file
arch/mips/ralink/mt7620.c	modified	+20	−12	View file
arch/mips/ralink/mt7621.c	modified	+1	−2	View file
arch/mips/ralink/of.c	modified	+12	−4	View file
arch/mips/ralink/prom.c	modified	+4	−5	View file
arch/mips/ralink/rt288x.c	modified	+1	−11	View file
arch/mips/ralink/rt305x.c	modified	+4	−12	View file
arch/mips/ralink/rt3883.c	modified	+3	−12	View file
arch/mips/ralink/timer.c	modified	+0	−14	View file
arch/mips/rb532/irq.c	modified	+0	−1	View file
arch/mips/rb532/prom.c	modified	+1	−1	View file
arch/mips/sgi-ip22/Platform	modified	+1	−1	View file
arch/mips/sgi-ip22/ip22-hpc.c	modified	+1	−1	View file
arch/mips/sgi-ip22/ip22-mc.c	modified	+2	−1	View file
arch/mips/sgi-ip22/ip22-nvram.c	modified	+1	−1	View file
arch/mips/sgi-ip22/ip22-reset.c	modified	+0	−1	View file
arch/mips/sgi-ip22/ip22-setup.c	modified	+0	−1	View file
arch/mips/sgi-ip27/ip27-berr.c	modified	+0	−2	View file
arch/mips/sgi-ip27/ip27-init.c	modified	+1	−1	View file
arch/mips/sgi-ip27/ip27-klnuma.c	modified	+1	−1	View file
arch/mips/sgi-ip27/ip27-memory.c	modified	+1	−1	View file
arch/mips/sgi-ip32/crime.c	modified	+1	−1	View file
arch/mips/sgi-ip32/ip32-irq.c	modified	+2	−2	View file
arch/mips/sibyte/bcm1480/setup.c	modified	+1	−1	View file
arch/mips/sibyte/sb1250/setup.c	modified	+1	−1	View file
arch/mips/txx9/generic/7segled.c	modified	+2	−2	View file
arch/mips/txx9/generic/pci.c	modified	+13	−15	View file
arch/mips/txx9/generic/setup.c	modified	+1	−1	View file
arch/mips/txx9/generic/setup_tx3927.c	modified	+3	−3	View file
arch/mips/txx9/generic/setup_tx4927.c	modified	+9	−11	View file
arch/mips/txx9/generic/setup_tx4938.c	modified	+13	−15	View file
arch/mips/txx9/generic/setup_tx4939.c	modified	+4	−4	View file
arch/mips/txx9/generic/smsc_fdc37m81x.c	modified	+7	−10	View file
arch/mips/txx9/jmr3927/prom.c	modified	+1	−1	View file
arch/mips/txx9/jmr3927/setup.c	modified	+5	−6	View file
arch/mips/txx9/rbtx4938/setup.c	modified	+7	−7	View file
arch/mips/vdso/Makefile	modified	+6	−2	View file
arch/mips/vr41xx/common/bcu.c	modified	+2	−1	View file
arch/mips/vr41xx/common/cmu.c	modified	+1	−1	View file
arch/mips/vr41xx/common/icu.c	modified	+1	−1	View file
arch/mips/vr41xx/common/irq.c	modified	+1	−1	View file
arch/mips/xilfpga/intc.c	modified	+2	−5	View file
drivers/of/base.c	modified	+1	−1	View file
drivers/of/fdt.c	modified	+6	−3	View file
scripts/Kbuild.include	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt

View file

diff --git a/Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt b/Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt
new file mode 100644
index 0000000..2d5126d
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt
@@ -0,0 +1,10 @@
+Imagination Technologies' Pistachio SoC based Marduk Board
+==========================================================
+
+Compatible string must be "img,pistachio-marduk", "img,pistachio"
+
+Hardware and other related documentation is available at
+https://docs.creatordev.io/ci40/
+
+It is also known as Creator Ci40. Marduk is legacy name and will
+be there for decades.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index d5dee50..0e542ed 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7707,6 +7707,12 @@ W:	http://www.kernel.org/doc/man-pages
 L:	[email protected]
 S:	Maintained
 
+MARDUK (CREATOR CI40) DEVICE TREE SUPPORT
+M:	Rahul Bedarkar <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	arch/mips/boot/dts/img/pistachio_marduk.dts
+
 MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
 M:	Andrew Lunn <[email protected]>
 M:	Vivien Didelot <[email protected]>
@@ -9795,7 +9801,7 @@ L:      [email protected]
 S:      Maintained
 F:      arch/mips/pistachio/
 F:      arch/mips/include/asm/mach-pistachio/
-F:      arch/mips/boot/dts/pistachio/
+F:      arch/mips/boot/dts/img/pistachio*
 F:      arch/mips/configs/pistachio*_defconfig
 
 PKTCDVD DRIVER

arch/mips/Kconfig

View file

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e137eed..a008a9f 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -9,10 +9,13 @@ config MIPS
 	select HAVE_CONTEXT_TRACKING
 	select HAVE_GENERIC_DMA_COHERENT
 	select HAVE_IDE
+	select HAVE_IRQ_EXIT_ON_IRQ_STACK
 	select HAVE_OPROFILE
 	select HAVE_PERF_EVENTS
 	select PERF_USE_VMALLOC
 	select HAVE_ARCH_KGDB
+	select HAVE_ARCH_MMAP_RND_BITS if MMU
+	select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU && COMPAT
 	select HAVE_ARCH_SECCOMP_FILTER
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_CBPF_JIT if !CPU_MICROMIPS
@@ -94,6 +97,7 @@ config MIPS_GENERIC
 	select PCI_DRIVERS_GENERIC
 	select PINCTRL
 	select SMP_UP if SMP
+	select SWAP_IO_SPACE
 	select SYS_HAS_CPU_MIPS32_R1
 	select SYS_HAS_CPU_MIPS32_R2
 	select SYS_HAS_CPU_MIPS32_R6
@@ -478,6 +482,7 @@ config MACH_XILFPGA
 	select SYS_SUPPORTS_ZBOOT_UART16550
 	select USE_OF
 	select USE_GENERIC_EARLY_PRINTK_8250
+	select XILINX_INTC
 	help
 	  This enables support for the IMG University Program MIPSfpga platform.
 
@@ -909,6 +914,7 @@ config CAVIUM_OCTEON_SOC
 	select NR_CPUS_DEFAULT_16
 	select BUILTIN_DTB
 	select MTD_COMPLEX_MAPPINGS
+	select SYS_SUPPORTS_RELOCATABLE
 	help
 	  This option supports all of the Octeon reference boards from Cavium
 	  Networks. It builds a kernel that dynamically determines the Octeon
@@ -1427,7 +1433,6 @@ config CPU_LOONGSON1C
 	bool "Loongson 1C"
 	depends on SYS_HAS_CPU_LOONGSON1C
 	select CPU_LOONGSON1
-	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select LEDS_GPIO_REGISTER
 	help
 	  The Loongson 1C is a 32-bit SoC, which implements the MIPS32
@@ -2288,7 +2293,7 @@ config MIPS_MT_FPAFF
 
 config MIPSR2_TO_R6_EMULATOR
 	bool "MIPS R2-to-R6 emulator"
-	depends on CPU_MIPSR6 && !SMP
+	depends on CPU_MIPSR6
 	default y
 	help
 	  Choose this option if you want to run non-R6 MIPS userland code.
@@ -2296,8 +2301,6 @@ config MIPSR2_TO_R6_EMULATOR
 	  default. You can enable it using the 'mipsr2emu' kernel option.
 	  The only reason this is a build-time option is to save ~14K from the
 	  final kernel image.
-comment "MIPS R2-to-R6 emulator is only available for UP kernels"
-	depends on SMP && CPU_MIPSR6
 
 config MIPS_VPE_LOADER
 	bool "VPE loader support."
@@ -2572,7 +2575,7 @@ config SYS_SUPPORTS_NUMA
 
 config RELOCATABLE
 	bool "Relocatable kernel"
-	depends on SYS_SUPPORTS_RELOCATABLE && (CPU_MIPS32_R2 || CPU_MIPS64_R2 || CPU_MIPS32_R6 || CPU_MIPS64_R6)
+	depends on SYS_SUPPORTS_RELOCATABLE && (CPU_MIPS32_R2 || CPU_MIPS64_R2 || CPU_MIPS32_R6 || CPU_MIPS64_R6 || CAVIUM_OCTEON_SOC)
 	help
 	  This builds a kernel image that retains relocation information
 	  so it can be loaded someplace besides the default 1MB.
@@ -2828,8 +2831,8 @@ config KEXEC
 	  made.
 
 config CRASH_DUMP
-	  bool "Kernel crash dumps"
-	  help
+	bool "Kernel crash dumps"
+	help
 	  Generate crash dump after being started by kexec.
 	  This should be normally only set in special crash dump kernels
 	  which are loaded in the main kernel with kexec-tools into
@@ -2839,11 +2842,11 @@ config CRASH_DUMP
 	  PHYSICAL_START.
 
 config PHYSICAL_START
-	  hex "Physical address where the kernel is loaded"
-	  default "0xffffffff84000000" if 64BIT
-	  default "0x84000000" if 32BIT
-	  depends on CRASH_DUMP
-	  help
+	hex "Physical address where the kernel is loaded"
+	default "0xffffffff84000000" if 64BIT
+	default "0x84000000" if 32BIT
+	depends on CRASH_DUMP
+	help
 	  This gives the CKSEG0 or KSEG0 address where the kernel is loaded.
 	  If you plan to use kernel for capturing the crash dump change
 	  this value to start of the reserved region (the "X" value as
@@ -3075,6 +3078,20 @@ config MMU
 	bool
 	default y
 
+config ARCH_MMAP_RND_BITS_MIN
+	default 12 if 64BIT
+	default 8
+
+config ARCH_MMAP_RND_BITS_MAX
+	default 18 if 64BIT
+	default 15
+
+config ARCH_MMAP_RND_COMPAT_BITS_MIN
+       default 8
+
+config ARCH_MMAP_RND_COMPAT_BITS_MAX
+       default 15
+
 config I8253
 	bool
 	select CLKSRC_I8253

arch/mips/Makefile

View file

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 1a6bac7..8ef9c02 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -131,6 +131,21 @@ cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= $(shell $(CC) -dumpmachine |grep -q 'mips.
 
 cflags-$(CONFIG_SB1XXX_CORELIS)	+= $(call cc-option,-mno-sched-prolog) \
 				   -fno-omit-frame-pointer
+
+# Some distribution-specific toolchains might pass the -fstack-check
+# option during the build, which adds a simple stack-probe at the beginning
+# of every function.  This stack probe is to ensure that there is enough
+# stack space, else a SEGV is generated.  This is not desirable for MIPS
+# as kernel stacks are small, placed in unmapped virtual memory, and do not
+# grow when overflowed.  Especially on SGI IP27 platforms, this check will
+# lead to a NULL pointer dereference in _raw_spin_lock_irq.
+#
+# In disassembly, this stack probe appears at the top of a function as:
+#    sd		zero,<offset>(sp)
+# Where <offset> is a negative value.
+#
+cflags-y += -fno-stack-check
+
 #
 # CPU-dependent compiler/assembler options for optimization.
 #
@@ -320,6 +335,9 @@ bootz-y			:= vmlinuz
 bootz-y			+= vmlinuz.bin
 bootz-y			+= vmlinuz.ecoff
 bootz-y			+= vmlinuz.srec
+ifeq ($(shell expr $(zload-y) \< 0xffffffff80000000 2> /dev/null), 0)
+bootz-y			+= uzImage.bin
+endif
 
 ifdef CONFIG_LASAT
 rom.bin rom.sw: vmlinux
@@ -327,10 +345,6 @@ rom.bin rom.sw: vmlinux
 		$(bootvars-y) $@
 endif
 
-CMD_RELOCS = arch/mips/boot/tools/relocs
-quiet_cmd_relocs = RELOCS  $<
-      cmd_relocs = $(CMD_RELOCS) $<
-
 #
 # Some machines like the Indy need 32-bit ELF binaries for booting purposes.
 # Other need ECOFF, so we build a 32-bit ELF binary for them which we then
@@ -339,11 +353,6 @@ quiet_cmd_relocs = RELOCS  $<
 quiet_cmd_32 = OBJCOPY $@
 	cmd_32 = $(OBJCOPY) -O $(32bit-bfd) $(OBJCOPYFLAGS) $< $@
 vmlinux.32: vmlinux
-ifeq ($(CONFIG_RELOCATABLE)$(CONFIG_64BIT),yy)
-# Currently, objcopy fails to handle the relocations in the elf64
-# So the relocs tool must be run here to remove them first
-	$(call cmd,relocs)
-endif
 	$(call cmd,32)
 
 #
@@ -359,9 +368,6 @@ all:	$(all-y)
 
 # boot
 $(boot-y): $(vmlinux-32) FORCE
-ifeq ($(CONFIG_RELOCATABLE)$(CONFIG_32BIT),yy)
-	$(call cmd,relocs)
-endif
 	$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) \
 		$(bootvars-y) arch/mips/boot/$@
 
@@ -395,11 +401,11 @@ dtbs_install:
 
 archprepare:
 ifdef CONFIG_MIPS32_N32
-	@echo '  Checking missing-syscalls for N32'
+	@$(kecho) '  Checking missing-syscalls for N32'
 	$(Q)$(MAKE) $(build)=. missing-syscalls missing_syscalls_flags="-mabi=n32"
 endif
 ifdef CONFIG_MIPS32_O32
-	@echo '  Checking missing-syscalls for O32'
+	@$(kecho) '  Checking missing-syscalls for O32'
 	$(Q)$(MAKE) $(build)=. missing-syscalls missing_syscalls_flags="-mabi=32"
 endif
 
@@ -433,6 +439,7 @@ define archhelp
 	echo '  uImage.gz            - U-Boot image (gzip)'
 	echo '  uImage.lzma          - U-Boot image (lzma)'
 	echo '  uImage.lzo           - U-Boot image (lzo)'
+	echo '  uzImage.bin          - U-Boot image (self-extracting)'
 	echo '  dtbs                 - Device-tree blobs for enabled boards'
 	echo '  dtbs_install         - Install dtbs to $(INSTALL_DTBS_PATH)'
 	echo

arch/mips/Makefile.postlink

View file

diff --git a/arch/mips/Makefile.postlink b/arch/mips/Makefile.postlink
new file mode 100644
index 0000000..4b7f5a6
--- /dev/null
+++ b/arch/mips/Makefile.postlink
@@ -0,0 +1,35 @@
+# ===========================================================================
+# Post-link MIPS pass
+# ===========================================================================
+#
+# 1. Insert relocations into vmlinux
+
+PHONY := __archpost
+__archpost:
+
+-include include/config/auto.conf
+include scripts/Kbuild.include
+
+CMD_RELOCS = arch/mips/boot/tools/relocs
+quiet_cmd_relocs = RELOCS $@
+      cmd_relocs = $(CMD_RELOCS) $@
+
+# `@true` prevents complaint when there is nothing to be done
+
+vmlinux: FORCE
+	@true
+ifeq ($(CONFIG_RELOCATABLE),y)
+	$(call if_changed,relocs)
+endif
+
+%.ko: FORCE
+	@true
+
+clean:
+	@true
+
+PHONY += FORCE clean
+
+FORCE:
+
+.PHONY: $(PHONY)

arch/mips/alchemy/board-gpr.c

View file

diff --git a/arch/mips/alchemy/board-gpr.c b/arch/mips/alchemy/board-gpr.c
index 79efe4c..6fb6b3f 100644
--- a/arch/mips/alchemy/board-gpr.c
+++ b/arch/mips/alchemy/board-gpr.c
@@ -236,7 +236,6 @@ static struct platform_device gpr_i2c_device = {
 static struct i2c_board_info gpr_i2c_info[] __initdata = {
 	{
 		I2C_BOARD_INFO("lm83", 0x18),
-		.type = "lm83"
 	}
 };
 

arch/mips/alchemy/common/dbdma.c

View file

diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c
index f2f264b..fc482d9 100644
--- a/arch/mips/alchemy/common/dbdma.c
+++ b/arch/mips/alchemy/common/dbdma.c
@@ -35,7 +35,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/syscore_ops.h>
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>

arch/mips/alchemy/common/dma.c

View file

diff --git a/arch/mips/alchemy/common/dma.c b/arch/mips/alchemy/common/dma.c
index 4fb6207..973049b 100644
--- a/arch/mips/alchemy/common/dma.c
+++ b/arch/mips/alchemy/common/dma.c
@@ -31,7 +31,7 @@
  */
 
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>

arch/mips/alchemy/common/gpiolib.c

View file

diff --git a/arch/mips/alchemy/common/gpiolib.c b/arch/mips/alchemy/common/gpiolib.c
index e6b90e7..7d5da5e 100644
--- a/arch/mips/alchemy/common/gpiolib.c
+++ b/arch/mips/alchemy/common/gpiolib.c
@@ -32,7 +32,6 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/gpio.h>
 #include <asm/mach-au1x00/gpio-au1000.h>

arch/mips/alchemy/common/prom.c

View file

diff --git a/arch/mips/alchemy/common/prom.c b/arch/mips/alchemy/common/prom.c
index 5340210..af312b5 100644
--- a/arch/mips/alchemy/common/prom.c
+++ b/arch/mips/alchemy/common/prom.c
@@ -33,7 +33,6 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/string.h>
 

arch/mips/alchemy/common/usb.c

View file

diff --git a/arch/mips/alchemy/common/usb.c b/arch/mips/alchemy/common/usb.c
index 297805a..634edd3 100644
--- a/arch/mips/alchemy/common/usb.c
+++ b/arch/mips/alchemy/common/usb.c
@@ -10,9 +10,9 @@
  */
 
 #include <linux/clk.h>
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/syscore_ops.h>
 #include <asm/cpu.h>

arch/mips/alchemy/common/vss.c

View file

diff --git a/arch/mips/alchemy/common/vss.c b/arch/mips/alchemy/common/vss.c
index d23b144..a7bd32e 100644
--- a/arch/mips/alchemy/common/vss.c
+++ b/arch/mips/alchemy/common/vss.c
@@ -6,7 +6,7 @@
  * for various media blocks are enabled/disabled.
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/spinlock.h>
 #include <asm/mach-au1x00/au1000.h>
 

arch/mips/alchemy/devboards/bcsr.c

View file

diff --git a/arch/mips/alchemy/devboards/bcsr.c b/arch/mips/alchemy/devboards/bcsr.c
index faeddf1..c1a2daa 100644
--- a/arch/mips/alchemy/devboards/bcsr.c
+++ b/arch/mips/alchemy/devboards/bcsr.c
@@ -9,7 +9,8 @@
 
 #include <linux/interrupt.h>
 #include <linux/irqchip/chained_irq.h>
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 #include <linux/spinlock.h>
 #include <linux/irq.h>
 #include <asm/addrspace.h>

arch/mips/ar7/clock.c

View file

diff --git a/arch/mips/ar7/clock.c b/arch/mips/ar7/clock.c
index 2460f9d..dda422a 100644
--- a/arch/mips/ar7/clock.c
+++ b/arch/mips/ar7/clock.c
@@ -21,7 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/delay.h>
 #include <linux/gcd.h>
 #include <linux/io.h>

arch/mips/ar7/gpio.c

View file

diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c
index ed5b3d2..4eee7e9 100644
--- a/arch/mips/ar7/gpio.c
+++ b/arch/mips/ar7/gpio.c
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/export.h>
 #include <linux/gpio.h>
 
 #include <asm/mach-ar7/ar7.h>

arch/mips/ar7/memory.c

View file

diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c
index 92dfa48..0332f05 100644
--- a/arch/mips/ar7/memory.c
+++ b/arch/mips/ar7/memory.c
@@ -19,7 +19,6 @@
 #include <linux/bootmem.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/module.h>
 #include <linux/pfn.h>
 #include <linux/proc_fs.h>
 #include <linux/string.h>

arch/mips/ar7/platform.c

View file

diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 58fca9a..df7acea 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -19,7 +19,6 @@
 
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>

arch/mips/ar7/prom.c

View file

diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c
index a23adc4..4fd8333 100644
--- a/arch/mips/ar7/prom.c
+++ b/arch/mips/ar7/prom.c
@@ -21,7 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/serial_reg.h>
 #include <linux/spinlock.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/string.h>
 #include <linux/io.h>
 #include <asm/bootinfo.h>

arch/mips/ath79/clock.c

View file

diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c
index cc3a1e3..fa84595 100644
--- a/arch/mips/ath79/clock.c
+++ b/arch/mips/ath79/clock.c
@@ -12,7 +12,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/clk.h>
@@ -45,7 +44,7 @@ static struct clk *__init ath79_add_sys_clkdev(
 	int err;
 
 	clk = clk_register_fixed_rate(NULL, id, NULL, 0, rate);
-	if (!clk)
+	if (IS_ERR(clk))
 		panic("failed to allocate %s clock structure", id);
 
 	err = clk_register_clkdev(clk, id, NULL);
@@ -508,16 +507,19 @@ static void __init ath79_clocks_init_dt_ng(struct device_node *np)
 		ar9330_clk_init(ref_clk, pll_base);
 	else {
 		pr_err("%s: could not find any appropriate clk_init()\n", dnfn);
-		goto err_clk;
+		goto err_iounmap;
 	}
 
 	if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) {
 		pr_err("%s: could not register clk provider\n", dnfn);
-		goto err_clk;
+		goto err_iounmap;
 	}
 
 	return;
 
+err_iounmap:
+	iounmap(pll_base);
+
 err_clk:
 	clk_put(ref_clk);
 

arch/mips/ath79/common.c

View file

diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c
index d071a3a..10a405d 100644
--- a/arch/mips/ath79/common.c
+++ b/arch/mips/ath79/common.c
@@ -13,7 +13,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/spinlock.h>
 

arch/mips/bcm47xx/board.c

View file

diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
index a88975a..8cbe60c 100644
--- a/arch/mips/bcm47xx/board.c
+++ b/arch/mips/bcm47xx/board.c
@@ -149,6 +149,15 @@ struct bcm47xx_board_type_list2 bcm47xx_board_list_boot_hw[] __initconst = {
 /* board_id */
 static const
 struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
+	{{BCM47XX_BOARD_LUXUL_ABR_4400_V1, "Luxul ABR-4400 V1"}, "luxul_abr4400_v1"},
+	{{BCM47XX_BOARD_LUXUL_XAP_310_V1, "Luxul XAP-310 V1"}, "luxul_xap310_v1"},
+	{{BCM47XX_BOARD_LUXUL_XAP_1210_V1, "Luxul XAP-1210 V1"}, "luxul_xap1210_v1"},
+	{{BCM47XX_BOARD_LUXUL_XAP_1230_V1, "Luxul XAP-1230 V1"}, "luxul_xap1230_v1"},
+	{{BCM47XX_BOARD_LUXUL_XAP_1240_V1, "Luxul XAP-1240 V1"}, "luxul_xap1240_v1"},
+	{{BCM47XX_BOARD_LUXUL_XAP_1500_V1, "Luxul XAP-1500 V1"}, "luxul_xap1500_v1"},
+	{{BCM47XX_BOARD_LUXUL_XBR_4400_V1, "Luxul XBR-4400 V1"}, "luxul_xbr4400_v1"},
+	{{BCM47XX_BOARD_LUXUL_XVW_P30_V1, "Luxul XVW-P30 V1"}, "luxul_xvwp30_v1"},
+	{{BCM47XX_BOARD_LUXUL_XWR_600_V1, "Luxul XWR-600 V1"}, "luxul_xwr600_v1"},
 	{{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"},
 	{{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},
 	{{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},

arch/mips/bcm47xx/buttons.c

View file

diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
index 52caa75..8a760d8 100644
--- a/arch/mips/bcm47xx/buttons.c
+++ b/arch/mips/bcm47xx/buttons.c
@@ -17,6 +17,12 @@
 		.active_low	= 1,					\
 	}
 
+#define BCM47XX_GPIO_KEY_H(_gpio, _code)				\
+	{								\
+		.code		= _code,				\
+		.gpio		= _gpio,				\
+	}
+
 /* Asus */
 
 static const struct gpio_keys_button
@@ -79,8 +85,8 @@ bcm47xx_buttons_asus_wl500gpv2[] __initconst = {
 
 static const struct gpio_keys_button
 bcm47xx_buttons_asus_wl500w[] __initconst = {
-	BCM47XX_GPIO_KEY(6, KEY_RESTART),
-	BCM47XX_GPIO_KEY(7, KEY_WPS_BUTTON),
+	BCM47XX_GPIO_KEY_H(6, KEY_RESTART),
+	BCM47XX_GPIO_KEY_H(7, KEY_WPS_BUTTON),
 };
 
 static const struct gpio_keys_button
@@ -302,6 +308,51 @@ bcm47xx_buttons_linksys_wrtsl54gs[] __initconst = {
 /* Luxul */
 
 static const struct gpio_keys_button
+bcm47xx_buttons_luxul_abr_4400_v1[] = {
+	BCM47XX_GPIO_KEY(14, KEY_RESTART),
+};
+
+static const struct gpio_keys_button
+bcm47xx_buttons_luxul_xap_310_v1[] = {
+	BCM47XX_GPIO_KEY(20, KEY_RESTART),
+};
+
+static const struct gpio_keys_button
+bcm47xx_buttons_luxul_xap_1210_v1[] = {
+	BCM47XX_GPIO_KEY(8, KEY_RESTART),
+};
+
+static const struct gpio_keys_button
+bcm47xx_buttons_luxul_xap_1230_v1[] = {
+	BCM47XX_GPIO_KEY(8, KEY_RESTART),
+};
+
+static const struct gpio_keys_button
+bcm47xx_buttons_luxul_xap_1240_v1[] = {
+	BCM47XX_GPIO_KEY(8, KEY_RESTART),
+};
+