From: Linus Torvalds Date: Sat, 27 Jun 2015 19:44:34 +0000 (-0700) Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus X-Git-Tag: v4.2-rc1~78 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=78c10e556ed904d5bfbd71e9cadd8ce8f25d6982;p=linux-2.6-block.git Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus Pull MIPS updates from Ralf Baechle: - Improvements to the tlb_dump code - KVM fixes - Add support for appended DTB - Minor improvements to the R12000 support - Minor improvements to the R12000 support - Various platform improvments for BCM47xx - The usual pile of minor cleanups - A number of BPF fixes and improvments - Some improvments to the support for R3000 and DECstations - Some improvments to the ATH79 platform support - A major patchset for the JZ4740 SOC adding support for the CI20 platform - Add support for the Pistachio SOC - Minor BMIPS/BCM63xx platform support improvments. - Avoid "SYNC 0" as memory barrier when unlocking spinlocks - Add support for the XWR-1750 board. - Paul's __cpuinit/__cpuinitdata cleanups. - New Malta CPU board support large memory so enable ZONE_DMA32. * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (131 commits) MIPS: spinlock: Adjust arch_spin_lock back-off time MIPS: asmmacro: Ensure 64-bit FP registers are used with MSA MIPS: BCM47xx: Simplify handling SPROM revisions MIPS: Cobalt Don't use module_init in non-modular MTD registration. MIPS: BCM47xx: Move NVRAM driver to the drivers/firmware/ MIPS: use for_each_sg() MIPS: BCM47xx: Don't select BCMA_HOST_PCI MIPS: BCM47xx: Add helper variable for storing NVRAM length MIPS: IRQ/IP27: Move IRQ allocation API to platform code. MIPS: Replace smp_mb with release barrier function in unlocks. MIPS: i8259: DT support MIPS: Malta: Basic DT plumbing MIPS: include errno.h for ENODEV in mips-cm.h MIPS: Define GCR_GIC_STATUS register fields MIPS: BPF: Introduce BPF ASM helpers MIPS: BPF: Use BPF register names to describe the ABI MIPS: BPF: Move register definition to the BPF header MIPS: net: BPF: Replace RSIZE with SZREG MIPS: BPF: Free up some callee-saved registers MIPS: Xtalk: Update xwidget.h with known Xtalk device numbers ... --- 78c10e556ed904d5bfbd71e9cadd8ce8f25d6982 diff --cc MAINTAINERS index c54a67434048,25a17aa20741..6aedd5072323 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2333,12 -2265,12 +2341,18 @@@ S: Supporte F: drivers/gpio/gpio-bcm-kona.c F: Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt + BROADCOM NVRAM DRIVER + M: Rafał Miłecki + L: linux-mips@linux-mips.org + S: Maintained + F: drivers/firmware/broadcom/* + +BROADCOM STB NAND FLASH DRIVER +M: Brian Norris +L: linux-mtd@lists.infradead.org +S: Maintained +F: drivers/mtd/nand/brcmnand/ + BROADCOM SPECIFIC AMBA DRIVER (BCMA) M: Rafał Miłecki L: linux-wireless@vger.kernel.org diff --cc drivers/clk/Makefile index 5b6af6a9319f,78029bd2444b..8732e4c5bf3c --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@@ -50,7 -50,7 +50,8 @@@ obj-$(CONFIG_ARCH_BERLIN) += berlin obj-$(CONFIG_ARCH_HI3xxx) += hisilicon/ obj-$(CONFIG_ARCH_HIP04) += hisilicon/ obj-$(CONFIG_ARCH_HIX5HD2) += hisilicon/ +obj-$(CONFIG_ARCH_MXC) += imx/ + obj-$(CONFIG_MACH_INGENIC) += ingenic/ obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/ ifeq ($(CONFIG_COMMON_CLK), y) obj-$(CONFIG_ARCH_MMP) += mmp/ diff --cc drivers/firmware/Makefile index 3001f1ae1062,210c6e0550d3..4a4b897f9314 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@@ -12,9 -12,9 +12,10 @@@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o obj-$(CONFIG_QCOM_SCM) += qcom_scm.o -CFLAGS_qcom_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) +obj-$(CONFIG_QCOM_SCM) += qcom_scm-32.o +CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) + obj-y += broadcom/ obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ obj-$(CONFIG_EFI) += efi/ obj-$(CONFIG_UEFI_CPER) += efi/ diff --cc drivers/irqchip/Kconfig index 8a7d7807b596,746daf37454c..120d81543e53 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@@ -160,10 -164,7 +165,15 @@@ config MIPS_GI bool select MIPS_CM + config INGENIC_IRQ + bool + depends on MACH_INGENIC + default y ++ +config RENESAS_H8300H_INTC + bool + select IRQ_DOMAIN + +config RENESAS_H8S_INTC + bool - select IRQ_DOMAIN ++ select IRQ_DOMAIN diff --cc drivers/irqchip/Makefile index 5c9adf1f554d,db014e8e12c9..b8d4e9691890 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@@ -47,6 -48,4 +48,7 @@@ obj-$(CONFIG_KEYSTONE_IRQ) += irq-keys obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.o +obj-$(CONFIG_RENESAS_H8300H_INTC) += irq-renesas-h8300h.o +obj-$(CONFIG_RENESAS_H8S_INTC) += irq-renesas-h8s.o +obj-$(CONFIG_ARCH_SA1100) += irq-sa11x0.o + obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o diff --cc drivers/phy/Makefile index 42f58e95aff0,75a37dc952f5..f344e1b2e825 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@@ -42,5 -40,4 +42,6 @@@ obj-$(CONFIG_PHY_STIH41X_USB) += phy-s obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs.o obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o +obj-$(CONFIG_PHY_TUSB1210) += phy-tusb1210.o +obj-$(CONFIG_PHY_BRCMSTB_SATA) += phy-brcmstb-sata.o + obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o diff --cc drivers/tty/serial/8250/Kconfig index a74a8e4717d4,43330ea95cfd..e1de1181b322 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@@ -351,9 -343,11 +351,18 @@@ config SERIAL_8250_MT657 If you have a Mediatek based board and want to use the serial port, say Y to this option. If unsure, say N. +config SERIAL_8250_UNIPHIER + tristate "Support for UniPhier on-chip UART" + depends on SERIAL_8250 && ARCH_UNIPHIER + help + If you have a UniPhier based board and want to use the on-chip + serial ports, say Y to this option. If unsure, say N. ++ + config SERIAL_8250_INGENIC + bool "Support for Ingenic SoC serial ports" + depends on SERIAL_8250_CONSOLE && OF_FLATTREE + select LIBFDT + select SERIAL_EARLYCON + help + If you have a system using an Ingenic SoC and wish to make use of + its UARTs, say Y to this option. If unsure, say N. diff --cc drivers/tty/serial/8250/Makefile index 6fa22ffad63d,98fba26e194a..706295913c34 --- a/drivers/tty/serial/8250/Makefile +++ b/drivers/tty/serial/8250/Makefile @@@ -22,6 -22,7 +22,9 @@@ obj-$(CONFIG_SERIAL_8250_DW) += 8250_d obj-$(CONFIG_SERIAL_8250_EM) += 8250_em.o obj-$(CONFIG_SERIAL_8250_OMAP) += 8250_omap.o obj-$(CONFIG_SERIAL_8250_FINTEK) += 8250_fintek.o +obj-$(CONFIG_SERIAL_8250_LPC18XX) += 8250_lpc18xx.o obj-$(CONFIG_SERIAL_8250_MT6577) += 8250_mtk.o +obj-$(CONFIG_SERIAL_8250_UNIPHIER) += 8250_uniphier.o + obj-$(CONFIG_SERIAL_8250_INGENIC) += 8250_ingenic.o + + CFLAGS_8250_ingenic.o += -I$(srctree)/scripts/dtc/libfdt