summaryrefslogtreecommitdiffstats
path: root/arch
AgeCommit message (Collapse)Author
2014-03-17Merge tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux into ↵Arnd Bergmann
next/soc Merge "Allwinner core additions for 3.15" from Maxime Ripard: Just a minor commit to adjust the restart code to take into account the new compatibles * tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux: ARM: sunxi: Add the new watchog compatibles to the reboot code Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux ↵Arnd Bergmann
into next/boards Merge "Allwinner defconfig additions for 3.15" from Maxime Ripard: Enables SPI and SID drivers in sunxi defconfig * tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux: ARM: sunxi: Enable A31 SPI and SID in the defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17ARM: fix duplicate symbols in multi_v5_defconfigArnd Bergmann
A couple of lines in multi_v5_defconfig appear twice, causing a harmless Kconfig warning. This removes one of the two copies. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17ASoC: fsi: fixup compile error for simple-cardKuninori Morimoto
This patches fixes c7a507eea1db1430476289f525f9c853d5d485e8 (ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags) commit's compie error arch/arm/mach-shmobile/board-mackerel.c:512:2: \ error: unknown field 'fmt' specified in initializer Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Mark Brown <broonie@linaro.org>
2014-03-17Revert "dts: socfpga: Add support for SD/MMC on the SOCFPGA platform"Chris Ball
This reverts commit d9c3f5df539a8a74cc830b35838670fe0541fed1, which should not have been merged via mmc-next. It's in arm-soc instead now.
2014-03-17Merge back earlier 'pm-cpufreq' material.Rafael J. Wysocki
2014-03-17Merge branch 'acpi-config'Rafael J. Wysocki
* acpi-config: ACPI: Remove Kconfig symbol ACPI_PROCFS ACPI / APEI: Remove X86 redundant dependency for APEI GHES. ACPI: introduce CONFIG_ACPI_REDUCED_HARDWARE_ONLY
2014-03-17metag: Use irq_set_affinity instead of homebrewn codeThomas Gleixner
There is no point in having an incomplete copy of irq_set_affinity() for the hotplug irq migration code. Use the core function instead and while at it switch to for_each_active_irq() Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: James Hogan <james.hogan@imgtec.com> Cc: metag <linux-metag@vger.kernel.org> Signed-off-by: James Hogan <james.hogan@imgtec.com>
2014-03-17KVM: x86: handle missing MPX in nested virtualizationPaolo Bonzini
When doing nested virtualization, we may be able to read BNDCFGS but still not be allowed to write to GUEST_BNDCFGS in the VMCS. Guard writes to the field with vmx_mpx_supported(), and similarly hide the MSR from userspace if the processor does not support the field. We could work around this with the generic MSR save/load machinery, but there is only a limited number of MSR save/load slots and it is not really worthwhile to waste one for a scenario that should not happen except in the nested virtualization case. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-17KVM: x86: Add nested virtualization support for MPXPaolo Bonzini
This is simple to do, the "host" BNDCFGS is either 0 or the guest value. However, both controls have to be present. We cannot provide MPX if we only have one of the "load BNDCFGS" or "clear BNDCFGS" controls. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-17KVM: x86: introduce kvm_supported_xcr0()Paolo Bonzini
XSAVE support for KVM is already using host_xcr0 & KVM_SUPPORTED_XCR0 as a "dynamic" version of KVM_SUPPORTED_XCR0. However, this is not enough because the MPX bits should not be presented to the guest unless kvm_x86_ops confirms the support. So, replace all instances of host_xcr0 & KVM_SUPPORTED_XCR0 with a new function kvm_supported_xcr0() that also has this check. Note that here: if (xstate_bv & ~KVM_SUPPORTED_XCR0) return -EINVAL; if (xstate_bv & ~host_cr0) return -EINVAL; the code is equivalent to if ((xstate_bv & ~KVM_SUPPORTED_XCR0) || (xstate_bv & ~host_cr0) return -EINVAL; i.e. "xstate_bv & (~KVM_SUPPORTED_XCR0 | ~host_cr0)" which is in turn equal to "xstate_bv & ~(KVM_SUPPORTED_XCR0 & host_cr0)". So we should also use the new function there. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-17Merge tag 'kvm-s390-20140317' of ↵Paolo Bonzini
git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD Two patches: - one regression fix for reducing the amount of ucontrol userspace exits - get rid of BUG_ONs in hot inner loops
2014-03-17Merge tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
Merge "mvebu dt changes for v3.15 (incremental #5)" from Jason Cooper: - mvebu - 38x - add 2GHz fixed clock, core divider clock, and nand controller - 385 - add nand controller and partitions to 385-DB board * tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Enable NAND controller in Armada 385-DB ARM: mvebu: Add support for NAND controller in Armada 38x SoC ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
Merge "mvebu dt changes for v3.15 (incremental #4)" from Jason Cooper: - dove - add system controller node - drop pinctrl PMU reg property _before_ it hits mainline and becomes ABI - mvebu - XP/370 - change default PCIe apertures - switch GP and DB boards internal registers to 0xf1000000 - correct RAM size on Matrix board - 385 - correct phy connection type for DB board - add RD board * tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu: ARM: dove: drop pinctrl PMU reg property ARM: mvebu: add Device Tree for the Armada 385 RD board ARM: mvebu: use the correct phy connection mode on Armada 385 DB ARM: mvebu: the Armada XP Matrix board has 4 GB ARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000 ARM: mvebu: switch the Armada XP DB to use internal registers at 0xf1000000 ARM: mvebu: change the default PCIe apertures for Armada 370/XP ARM: dove: add system controller node Conflicts: arch/arm/boot/dts/Makefile Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17KVM: x86 emulator: emulate MOVAPDIgor Mammedov
Add emulation for 0x66 prefixed instruction of 0f 28 opcode that has been added earlier. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-17KVM: x86 emulator: emulate MOVAPSIgor Mammedov
HCK memory driver test fails when testing 32-bit Windows 8.1 with baloon driver. tracing KVM shows error: reason EXIT_ERR rip 0x81c18326 info 0 0 x/10i 0x81c18326-20 0x0000000081c18312: add %al,(%eax) 0x0000000081c18314: add %cl,-0x7127711d(%esi) 0x0000000081c1831a: rolb $0x0,0x80ec(%ecx) 0x0000000081c18321: and $0xfffffff0,%esp 0x0000000081c18324: mov %esp,%esi 0x0000000081c18326: movaps %xmm0,(%esi) 0x0000000081c18329: movaps %xmm1,0x10(%esi) 0x0000000081c1832d: movaps %xmm2,0x20(%esi) 0x0000000081c18331: movaps %xmm3,0x30(%esi) 0x0000000081c18335: movaps %xmm4,0x40(%esi) which points to MOVAPS instruction currently no emulated by KVM. Fix it by adding appropriate entries to opcode table in KVM's emulator. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-03-17Merge branch 'mvebu/soc3' into next/dtArnd Bergmann
The dts Makefile has a bunch of nasty conflicts, attempt to resolve these now to avoid trouble later. Conflicts: arch/arm/boot/dts/Makefile Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'mvebu-defconfig-3.15-2' of git://git.infradead.org/linux-mvebu ↵Arnd Bergmann
into next/boards Merge "mvebu defconfig changes for v3.15 (incremental pull #2)" from Jason Cooper - add multi_v5_defconfig - add mvebu_v5_defconfig - kirkwood: add HP T5325 devices * tag 'mvebu-defconfig-3.15-2' of git://git.infradead.org/linux-mvebu: ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig ARM: config: Add mvebu_v5_defconfig ARM: config: Add a multi_v5_defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17KVM: s390: Optimize ucontrol pathChristian Borntraeger
Since commit 7c470539c95630c1f2a10f109e96f249730b75eb (s390/kvm: avoid automatic sie reentry) we will run through the C code of KVM on host interrupts instead of just reentering the guest. This will result in additional ucontrol exits (at least HZ per second). Let handle a 0 intercept in the kernel and dont return to userspace, even if in ucontrol mode. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> CC: stable@vger.kernel.org
2014-03-17KVM: s390: Removing untriggerable BUG_ONsDominik Dingel
The BUG_ON in kvm-s390.c is unreachable, as we get the vcpu per common code, which itself does this from the private_data field of the file descriptor, and there is no KVM_UNCREATE_VCPU. The __{set,unset}_cpu_idle BUG_ONs are not triggerable because the vcpu creation code already checks against KVM_MAX_VCPUS. Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
2014-03-17Merge tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
Merge "mvebu dt changes for v3.15 (incremental pull #3)" from Jason Cooper: - mvebu - merge armada 375, 380, 385 boards (mvebu/dt-3xx) - kirkwood - Add many Synology NAS boards - add board HP T5325 - add L2 cache node - add system-controller node - add audio node - dove - add pinctrl and global-config register Depends: - tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes) - removed dove PMU interrupt controller Conflicts: - mvebu/soc (arch/arm/boot/dts/Makefile) - add/add conflict. - move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD) * tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu: ARM: kirkwood: Add dts file describing HP T5325 thin client ARM: kirkwood: Add i2c alias so setting bus number ARM: kirkwood: Add audio node to kirkwood.dtsi ARM: mvebu: select dtbs from MACH_ARMADA_* ARM: dove: add global-config register node ARM: dove: add additional pinctrl registers ARM: mvebu: Instantiate system controller in kirkwood.dtsi ARM: kirkwood: Instantiate L2 cache from DT. ARM: mvebu: use macros for interrupt flags on Armada 375/38x ARM: mvebu: use GIC_{SPI,PPI} in Armada 375/38x DTs ARM: mvebu: use C preprocessor include for Armada 375/38x DTs ARM: Kirkwood: Add support for many Synology NAS devices DT: i2c: Trivial: Add sii,s35390a DT: Vendor prefixes: Add ricoh, qnap, sii and synology ARM: dove: dt: revert PMU interrupt controller node ARM: mvebu: add Device Tree for the Armada 385 DB board ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs ARM: mvebu: add Device Tree for the Armada 375 DB board ARM: mvebu: add Device Tree description of the Armada 375 SoC ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260 Conflicts: Documentation/devicetree/bindings/vendor-prefixes.txt arch/arm/boot/dts/Makefile Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu into ↵Arnd Bergmann
next/soc Merge "mvebu soc changes for v3.15 (incremental #3)" from Jason Cooper: - dove - move devicetree code from mach-dove/ to mach-mvebu/ :-) * tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu: ARM: mvebu: move DT Dove to MVEBU Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'mvebu-soc-3.15-2' of git://git.infradead.org/linux-mvebu into ↵Arnd Bergmann
next/soc Merge "mvebu soc changes for v3.15 (incremental pull #2)" from Jason Cooper: - mvebu - Add Armada 375, 380 and 385 SoCs - kirkwood - move kirkwood DT support to mach-mvebu - add mostly DT support for HP T5325 thin client * tag 'mvebu-soc-3.15-2' of git://git.infradead.org/linux-mvebu: ARM: kirkwood: Add HP T5325 thin client ARM: kirkwood: select dtbs based on SoC ARM: kirkwood: Remove redundant kexec code ARM: mvebu: Armada 375/38x depend on MULTI_V7 ARM: mvebu: Simplify headers and make local ARM: mvebu: Enable mvebu-soc-id on Kirkwood ARM: mvebu: Let kirkwood use the system controller for restart ARM: mvebu: Move kirkwood DT boards into mach-mvebu ARM: MM Enable building Feroceon L2 cache controller with ARCH_MVEBU ARM: Fix default CPU selection for ARCH_MULTI_V5 ARM: MM: Add DT binding for Feroceon L2 cache ARM: orion: Move cache-feroceon-l2.h out of plat-orion ARM: mvebu: Add ARCH_MULTI_V7 to SoCs ARM: kirkwood: ioremap memory control register ARM: kirkwood: ioremap the cpu_config register before using it. ARM: kirkwood: Separate board-dt from common and pcie code. ARM: kirkwood: Drop printing the SoC type and revision ARM: kirkwood: Convert mv88f6281gtw_ge switch setup to DT ARM: kirkwood: Give pm.c its own header file. ARM: mvebu: Rename the ARCH_MVEBU menu option Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'socfpga_updates_for_3.15_v2' of ↵Arnd Bergmann
git://git.rocketboards.org/linux-socfpga-next into next/drivers Merge "SOCFPGA updates for 3.15 version 2" from Dinh Nguyen: *Update SOCFPGA DTS to include ethernet, sd/mmc, and clock fixes *Add stmmac ethernet glue layer *Update socfpga_defconfig to include sd/mmc, and micrel_phy * tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-socfpga-next: dts: socfpga: Add sysmgr node so the gmac can use to reference dts: socfpga: Add support for SD/MMC on the SOCFPGA platform dts: socfpga: Update clock entry to support multiple parents ARM: socfpga: Update socfpga_defconfig dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac. net: stmmac: Add SOCFPGA glue driver Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into next/dtArnd Bergmann
Merge "Two more dt related efm32 fixes" from Uwe Kleine-König: * tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux: ARM: efm32: properly namespace i2c location property ARM: efm32: fix unit address part in USART2 device nodes' names Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge branch 'efm32/cleanup' into next/dtArnd Bergmann
Dependency for efm32/dt branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'renesas-clock4-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers Merge "Fourth Round of Renesas ARM Based SoC Clock Updates for v3.15" from Simon Horman: r8a7791 (R-Car M2) SoC * Correct SCIFA3-5 clocks * tag 'renesas-clock4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7791: Fix SCIFA3-5 clocks Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17Merge tag 'renesas-soc3-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Third Round of Renesas ARM Based SoC Updates for v3.15" from Simon Horman: Fix warnings due to improper printk formats in shared APMU code. * tag 'renesas-soc3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: APMU: Fix warnings due to improper printk formats Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17Merge tag 'renesas-clock3-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers Merge "Third Round of Renesas ARM Based SoC Clock Updates for v3.15" from Simon Horman: r7s72100 (RZ/A1H) SoC * Correct bus clock calculation * tag 'renesas-clock3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r7s72100: fix bus clock calculation Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17Merge tag 'renesas-clock2-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers Merge "Second Round of Renesas ARM Based SoC Clock Updates for v3.15" from Simon Horman: r8a7790 (R-Car H2) SoC - Add sound SCU clock support r8a7791 (R-Car M2) SoC - Remove legacy clock aliases for DT devices * tag 'renesas-clock2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7790: add sound SCU clock support ARM: shmobile: r8a7791: Remove legacy clock aliases for DT devices Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17Merge tag 'renesas-dt4-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Fourth Round of Renesas ARM Based SoC DT Updates for v3.15" from Simon Horman: * r8a7791 (R-Car M2) based koelsch board - Add SDHI devices - Add ethernet * r8a7791 (R-Car M2) SoC - Correct clock index for i2c5 * r8a7790 (R-Car H2) based lager board - Add ethernet * tag 'renesas-dt4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Add SDHI devices for Koelsch DTS ARM: shmobile: Add SDHI devices to r8a7791 DTSI ARM: shmobile: r8a7791: fix clock index for i2c5 ARM: shmobile: koelsch: add Ether DT support ARM: shmobile: r8a7791: add Ether DT support ARM: shmobile: lager: add Ether DT support ARM: shmobile: r8a7790: add Ether DT support Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17Merge tag 'renesas-soc2-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Second Round of Renesas ARM Based SoC Updates for v3.15" from Simon Horman: * R-Car Gen2 SoCs: r8a7791 (R-Car M2) and r8a7790 (R-Car H2) - Remove __init from rcar_gen2_read_mode_pins() * r8a7791 (R-Car M2) - Use 64-bit dma_addr_t * r8a7790 (R-Car H2) - Add CA15-SCU, CA7-SCU - Add SYSC setup code - Use 64-bit dma_addr_t * tag 'renesas-soc2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Move SYSC base variable to inside ifdefs ARM: shmobile: Remove __init from rcar_gen2_read_mode_pins() ARM: shmobile: r8a7790 CA15-SCU enablement ARM: shmobile: r8a7790 CA7-SCU enablement ARM: shmobile: r8a7790 SYSC setup code ARM: shmobile: Break out R-Car SYSC PM code ARM: shmobile: Use 64-bit dma_addr_t on r8a7790/r8a7791 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17Merge tag 'renesas-clock-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers Merge "Renesas ARM Based SoC Clock Updates for v3.15" from Simon Horman: * r7s72100 SoC (RZ/A1H) - Add clock for SH Ethernet - Add RSPI clocks * r8a7791 (R-Car M2) - Add QSPI and SDHI clocks * r8a7790 (R-Car H2) - Add audio clock - Remove legacy DT clocks - Correct SYS DMAC clock defines * tag 'renesas-clock-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Remove legacy r8a7790 DT clocks ARM: shmobile: Add r8a7791 legacy SDHI clocks ARM: shmobile: r8a7790: Correct SYS DMAC clock defines ARM: shmobile: r7s72100: Add clock for r7s72100-ether ARM: shmobile: r8a7791 clock: add QSPI clocks ARM: shmobile: r7s72100 clock: Add RSPI clocks for DT ARM: shmobile: r7s72100 clock: Add RSPI clocks ARM: shmobile: r8a7790: add audio clock ARM: shmobile: r8a7778: add audio clock in new style Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17Merge tag 'renesas-dt3-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Third Round of Renesas ARM Based SoC DT Updates for v3.15" from Simon Horman: * r7s72100 SoC (RZ/A1H) - Add nodes for i2c controllers to DT * r7s72100 (RZ/A1H) based Genmai board - genmai: adapt dts to use native i2c driver * r8a7791 SoC (R-Car M2) - Remove superfluous interrupt-parents * r8a7791 (R-Car M2) based Koelsch board - Add i2c2 bus to DT - Add DU device to DT * r8a7790 SoC (R-Car H2) - Add i2c aliases - Remove superfluous interrupt-parents - Add QSPI node * r8a7790 SoC (R-Car M2) based Lager - Add DU, SDHI0/1 and QSPI to DT * r8a7778 SoC (R-Car M1) - Remove duplicate i2c nodes * tag 'renesas-dt3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: genmai: adapt dts to use native i2c driver ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt ARM: shmobile: r8a7791: add i2c master nodes to dtsi ARM: shmobile: r8a7790: add i2c aliases to dtsi ARM: shmobile: r8a7790: remove superfluous interrupt-parents ARM: shmobile: r8a7791: remove superfluous interrupt-parents ARM: shmobile: koelsch-reference: Add DU device to DTS ARM: shmobile: lager: Add DU device to DTS ARM: shmobile: r8a7778 dtsi: Remove duplicate i2c nodes ARM: shmobile: lager: add SDHI0/2 support on DTS ARM: shmobile: lager dts: Add QSPI nodes ARM: shmobile: r8a7790 dtsi: Add QSPI node Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17Merge tag 'renesas-defconfig3-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards Merge "Third Round of Renesas ARM Based SoC Defconfig Updates for v3.15" from Simon Horman: * r7s72100 (RZ/A1H) based Genmai board - update defconfig for I2C usage * r8a7791 (R-Car M2) based Koelsch board - Enable SDHI, GPIO and regulators in defconfig * r8a7790 (R-Car H2) based Lager board - Enable RSPI and MTD_M25P80 * emev2 (Emma Mobile) based KZM9D board - Remove legacy KZM9D defconfig * Multiplatform - Add defconfig for shmobile multiplatform * tag 'renesas-defconfig3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r7s72100: update defconfig for I2C usage ARM: shmobile: koelsch: Enable SDHI, GPIO and regulators in defconfig ARM: shmobile: Get rid of legacy KZM9D defconfig ARM: shmobile: Add defconfig for shmobile multiplatform ARM: shmobile: lager defconfig: Enable RSPI and MTD_M25P80 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17Merge tag 'renesas-boards3-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards Merge "Third Round of Renesas ARM Based SoC Boards Updates for v3.15" from Simon Horman: * r7s72100 SoC (RZ/A1H) based Genmai board - Set proper DMA masks for Ether device * r8a7791 (R-Car M2) based Koelsch board - Remove Koelsch DT reference legacy clock bits - Set proper DMA masks for Ether device - Add DU device to koelsch-reference - Refactor clock lookup hack in koelsch-reference - Add SDHI devices * r8a7790 (R-Car H2) based Lager board - Remove Lager DT reference legacy clock bits - Set proper DMA masks for Ether device - Add internal USB PCI support - Add QSPI pinmux - Sdd SDHI0/2 support * emev2 (Emma Mobile EV2) based kzm9d board - Remove KZM9D board code * r8a7778 (R-Car M1) based bock-w board - Set proper DMA masks for Ether device * r8a7740 (R-Mobile A1) based Armadillo 800 EVA board - Set proper DMA masks for Ether device * tag 'renesas-boards3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Remove Lager DT reference legacy clock bits ARM: shmobile: Remove Koelsch DT reference legacy clock bits ARM: shmobile: Remove KZM9D board code ARM: shmobile: Genmai: set proper DMA masks for Ether device ARM: shmobile: Koelsch: set proper DMA masks for Ether device ARM: shmobile: Lager: set proper DMA masks for Ether device ARM: shmobile: BOCK-W: set proper DMA masks for Ether device ARM: shmobile: Armadillo 800 EVA: set proper DMA masks for Ether device ARM: shmobile: koelsch-reference: Add DU device ARM: shmobile: koelsch-reference: Refactor clock lookup hack ARM: shmobile: lager-reference: Add DU device ARM: shmobile: lager-reference: Refactor clock lookup hack ARM: shmobile: lager: Add internal USB PCI support ARM: shmobile: lager legacy: Add QSPI pinmux ARM: shmobile: lager: add SDHI0/2 support ARM: shmobile: Add SDHI devices for legacy Koelsch Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-16Merge branch 'perf-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull perf fixes from Ingo Molnar: "Misc smaller fixes" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86: Fix leak in uncore_type_init failure paths perf machine: Use map as success in ip__resolve_ams perf symbols: Fix crash in elf_section_by_name perf trace: Decode architecture-specific signal numbers
2014-03-14Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller
Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-14Merge branch 'x86-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 fixes from Peter Anvin: "Two x86 fixes: Suresh's eager FPU fix, and a fix to the NUMA quirk for AMD northbridges. This only includes Suresh's fix patch, not the "mostly a cleanup" patch which had __init issues" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/amd/numa: Fix northbridge quirk to assign correct NUMA node x86, fpu: Check tsk_used_math() in kernel_fpu_end() for eager FPU
2014-03-15MIPS: Octeon: Fix fall through on bar type OCTEON_DMA_BAR_TYPE_SMALLColin Ian King
Bar type OCTEON_DMA_BAR_TYPE_SMALL assigns lo and hi addresses and then falls through to OCTEON_DMA_BAR_TYPE_BIG that re-assignes lo and hi addresses with totally different values. Add a break so we don't fall through. Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: David Daney <ddaney@caviumnetworks.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/6529/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2014-03-14ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flagsKuninori Morimoto
SND_SOC_DAIFMT_CBx_CFx means "codec" side master/slave mode. Then, FSI will be master mode if it was SND_SOC_DAIFMT_CBS_CFS. This patch fixup platform settings too. Then, it tidyups SND_SOC_DAIFMT_INV settings. Acked-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2014-03-14arm64: mm: Route pmd thp functions through pte equivalentsSteve Capper
Rather than have separate hugetlb and transparent huge page pmd manipulation functions, re-wire our thp functions to simply call the pte equivalents. This allows THP to take advantage of the new PTE_WRITE logic introduced in: c2c93e5 arm64: mm: Introduce PTE_WRITE To represent splitting THPs we use the PTE_SPECIAL bit as this is not used for pmds. Signed-off-by: Steve Capper <steve.capper@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2014-03-14arm64: rwsem: use asm-generic rwsem implementationWill Deacon
asm-generic offers an atomic-add based rwsem implementation, which can avoid the need for heavier, spinlock-based synchronisation on the fast path. This patch makes use of the optimised implementation for arm64 CPUs. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2014-03-14arm64: enable generic CPU feature modalias matching for this architectureArd Biesheuvel
This enables support for the generic CPU feature modalias implementation that wires up optional CPU features to udev based module autoprobing. A file <asm/cpufeature.h> is provided that maps CPU feature numbers to elf_hwcap bits, which is the standard way on arm64 to advertise optional CPU features both internally and to user space. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> [catalin.marinas@arm.com: removed unnecessary "!!"] Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2014-03-14MIPS: FPU: Fix conflict of register usageHuacai Chen
In _restore_fp_context/_restore_fp_context32, t0 is used for both CP0_Status and CP1_FCSR. This is a mistake and cause FP exeception on boot, so fix it. Signed-off-by: Huacai Chen <chenhc@lemote.com> Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> Tested-by: Andreas Barth <aba@ayous.org> Cc: John Crispin <john@phrozen.org> Cc: Steven J. Hill <Steven.Hill@imgtec.com> Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: linux-mips@linux-mips.org Cc: Fuxin Zhang <zhangfx@lemote.com> Cc: Zhangjin Wu <wuzhangjin@gmail.com> Patchwork: https://patchwork.linux-mips.org/patch/6507/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2014-03-14MIPS: Replace CONFIG_MIPS64 and CONFIG_MIPS32_R2Paul Bolle
Commit 597ce1723e0f ("MIPS: Support for 64-bit FP with O32 binaries") introduced references to two undefined Kconfig macros. CONFIG_MIPS32_R2 should clearly be replaced with CONFIG_CPU_MIPS32_R2. And CONFIG_MIPS64 should be replaced with CONFIG_64BIT. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/6522/ Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2014-03-14ARM: dts: bcm28155-ap: leave camldo1 on to fix rebootMatt Porter
The BCM28155-AP board has a bootloader that expects the camldo1 regulator to be enabled on entry. Currently, the camldo1 regulator is disabled when no longer in use as is the case during a reboot / warm reset. This causes the early bootloader to hang upon entry. Add regulator-always-on to the camldo1 constraint to fix reboot. Reported-by: Alex Elder <elder@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org> Tested-by: Alex Elder <elder@linaro.org>
2014-03-14ARM: dts: add bcm590xx pmu support and enable for bcm28155-apMatt Porter
Add a dtsi to support the BCM590xx PMUs used by the BCM281xx family of SoCs. Enable regulators for use with the dwc2 and sdhci on bcm28155-ap. Signed-off-by: Tim Kryger <tim.kryger@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org> Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
2014-03-14ARM: dts: bcm21664: Add device tree files.Markus Mayer
Add device tree files for the Broadcom BCM21664 SoC. Signed-off-by: Markus Mayer <markus.mayer@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
2014-03-14ARM: restrict BCM_KONA_UART to ARCH_BCM_MOBILEFlorian Fainelli
Low-level debugging using the Broadcom Kona UART only makes sense on the ARCH_BCM_MOBILE platform and would otherwise prevent ARCH_BCM_63XX from picking up the right UART implementation by default. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Tim Kryger <tim.kryger@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-17 17:31:33 +0000