Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull more MIPS updates from Ralf Baechle: "This is the secondnd batch of MIPS patches for 4.7. Summary: CPS: - Copy EVA configuration when starting secondary VPs. EIC: - Clear Status IPL. Lasat: - Fix a few off by one bugs. lib: - Mark intrinsics notrace. Not only are the intrinsics uninteresting, it would cause infinite recursion. MAINTAINERS: - Add file patterns for MIPS BRCM device tree bindings. - Add file patterns for mips device tree bindings. MT7628: - Fix MT7628 pinmux typos. - wled_an pinmux gpio. - EPHY LEDs pinmux support. Pistachio: - Enable KASLR VDSO: - Build microMIPS VDSO for microMIPS kernels. - Fix aliasing warning by building with `-fno-strict-aliasing' for debugging but also tracing them might result in recursion. Misc: - Add missing FROZEN hotplug notifier transitions. - Fix clk binding example for varioius PIC32 devices. - Fix cpu interrupt controller node-names in the DT files. - Fix XPA CPU feature separation. - Fix write_gc0_* macros when writing zero. - Add inline asm encoding helpers. - Add missing VZ accessor microMIPS encodings. - Fix little endian microMIPS MSA encodings. - Add 64-bit HTW fields and fix its configuration. - Fix sigreturn via VDSO on microMIPS kernel. - Lots of typo fixes. - Add definitions of SegCtl registers and use them" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (49 commits) MIPS: Add missing FROZEN hotplug notifier transitions MIPS: Build microMIPS VDSO for microMIPS kernels MIPS: Fix sigreturn via VDSO on microMIPS kernel MIPS: devicetree: fix cpu interrupt controller node-names MIPS: VDSO: Build with `-fno-strict-aliasing' MIPS: Pistachio: Enable KASLR MIPS: lib: Mark intrinsics notrace MIPS: Fix 64-bit HTW configuration MIPS: Add 64-bit HTW fields MAINTAINERS: Add file patterns for mips device tree bindings MAINTAINERS: Add file patterns for mips brcm device tree bindings MIPS: Simplify DSP instruction encoding macros MIPS: Add missing tlbinvf/XPA microMIPS encodings MIPS: Fix little endian microMIPS MSA encodings MIPS: Add missing VZ accessor microMIPS encodings MIPS: Add inline asm encoding helpers MIPS: Spelling fix lets -> let's MIPS: VR41xx: Fix typo MIPS: oprofile: Fix typo MIPS: math-emu: Fix typo ...
Showing
- Documentation/devicetree/bindings/gpio/microchip,pic32-gpio.txt 1 addition, 1 deletion...ntation/devicetree/bindings/gpio/microchip,pic32-gpio.txt
- Documentation/devicetree/bindings/mips/cpu_irq.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/mips/cpu_irq.txt
- Documentation/devicetree/bindings/mmc/microchip,sdhci-pic32.txt 1 addition, 1 deletion...ntation/devicetree/bindings/mmc/microchip,sdhci-pic32.txt
- Documentation/devicetree/bindings/pinctrl/microchip,pic32-pinctrl.txt 1 addition, 1 deletion...n/devicetree/bindings/pinctrl/microchip,pic32-pinctrl.txt
- Documentation/devicetree/bindings/serial/microchip,pic32-uart.txt 1 addition, 1 deletion...ation/devicetree/bindings/serial/microchip,pic32-uart.txt
- Documentation/devicetree/bindings/watchdog/microchip,pic32-dmt.txt 2 additions, 2 deletions...tion/devicetree/bindings/watchdog/microchip,pic32-dmt.txt
- Documentation/devicetree/bindings/watchdog/microchip,pic32-wdt.txt 2 additions, 2 deletions...tion/devicetree/bindings/watchdog/microchip,pic32-wdt.txt
- MAINTAINERS 2 additions, 0 deletionsMAINTAINERS
- arch/mips/Kconfig 1 addition, 0 deletionsarch/mips/Kconfig
- arch/mips/boot/dts/ingenic/jz4740.dtsi 1 addition, 1 deletionarch/mips/boot/dts/ingenic/jz4740.dtsi
- arch/mips/boot/dts/ralink/mt7620a.dtsi 1 addition, 1 deletionarch/mips/boot/dts/ralink/mt7620a.dtsi
- arch/mips/boot/dts/ralink/rt2880.dtsi 1 addition, 1 deletionarch/mips/boot/dts/ralink/rt2880.dtsi
- arch/mips/boot/dts/ralink/rt3050.dtsi 1 addition, 1 deletionarch/mips/boot/dts/ralink/rt3050.dtsi
- arch/mips/boot/dts/ralink/rt3883.dtsi 1 addition, 1 deletionarch/mips/boot/dts/ralink/rt3883.dtsi
- arch/mips/boot/dts/xilfpga/nexys4ddr.dts 1 addition, 1 deletionarch/mips/boot/dts/xilfpga/nexys4ddr.dts
- arch/mips/cavium-octeon/smp.c 1 addition, 1 deletionarch/mips/cavium-octeon/smp.c
- arch/mips/include/asm/asmmacro.h 50 additions, 49 deletionsarch/mips/include/asm/asmmacro.h
- arch/mips/include/asm/hazards.h 4 additions, 4 deletionsarch/mips/include/asm/hazards.h
- arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h 1 addition, 1 deletionarch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h
- arch/mips/include/asm/mach-au1x00/gpio-au1300.h 1 addition, 1 deletionarch/mips/include/asm/mach-au1x00/gpio-au1300.h
Please register or sign in to comment