summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2016-07-08x86/mce/AMD: Increase size of the bank_map typeAravind Gopalakrishnan
Change bank_map type from 'char' to 'int' since we now have more than eight banks in a system. Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com> Signed-off-by: Yazen Ghannam <Yazen.Ghannam@amd.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Andy Lutomirski <luto@kernel.org> Cc: Aravind Gopalakrishnan <aravindksg.lkml@gmail.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/1467968983-4874-2-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-08Merge tag 'v4.7-rc6' into ras/core, to pick up fixes before merging new changesIngo Molnar
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-08powerpc: Add MTD_BLOCK to powernv_defconfigMichael Neuling
This is so we can use the powernv_flash mtd driver as an block device. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2016-07-08powerpc/pseries: start rtasd before PCI probingGreg Kurz
A strange behaviour is observed when comparing PCI hotplug in QEMU, between x86 and pseries. If you consider the following steps: - start a VM - add a PCI device via the QEMU monitor before the rtasd has started (for example starting the VM in paused state, or hotplug during FW or boot loader) - resume the VM execution The x86 kernel detects the PCI device, but the pseries one does not. This happens because the rtasd kernel worker is currently started under device_initcall, while PCI probing happens earlier under subsys_initcall. As a consequence, if we have a pending RTAS event at boot time, a message is printed and the event is dropped. This patch moves all the initialization of rtasd to arch_initcall, which is run before subsys_call: this way, logging_enabled is true when the RTAS event pops up and it is not lost anymore. The proc fs bits stay at device_initcall because they cannot be run before fs_initcall. Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2016-07-08x86/platform/intel-mid: Enable spidev on Intel Edison boardsAndy Shevchenko
Intel Edison board provides one of the SPI bus for user's connected devices. Append platform data to get spidev enumerated over it. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Dan O'Donovan <dan@emutex.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1467677690-90007-1-git-send-email-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-08x86/platform/intel-mid: Extend PWRMU to support PenwellAndy Shevchenko
Intel Penwell is one of the first SoCs in Intel MID series. It has slightly older version of PWRMU IP, though it is compatible with one found on Intel Tangier. Since we are not using (yet) any advanced stuff in the driver we may safely re-use what it's done for Intel Tangier for now. Extend PWRMU driver to support Intel Penwell by adding PCI ID and re-using existing ->set_initial_state() function. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1467749348-100518-2-git-send-email-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-08x86/pci, x86/platform/intel_mid_pci: Remove duplicate power off codeAndy Shevchenko
Intel MID platforms (Moorestown, Medfield, Clovertrail, Merrifield) are sharing the code in the intel_mid_pci.c module. There is no need to power off specific Moorestown devices after the following commit: 5823d0893ec2 ("x86/platform/intel-mid: Add Power Management Unit driver") ... because the condition in mrfld_power_off_dev() is true for any platform from the above list. Remove duplicate power off certain devices on Intel Moorestown and rename the affected functions to show that they are applied to any of Intel MID platforms. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1467749348-100518-1-git-send-email-andriy.shevchenko@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-07Merge tag 'acpi-4.7-rc7' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm Pull ACPI fixes from Rafael Wysocki: "All of these fix recent regressions in ACPICA, in the ACPI PCI IRQ management code and in the ACPI AML debugger. Specifics: - Fix a lock ordering issue in ACPICA introduced by a recent commit that attempted to fix a deadlock in the dynamic table loading code which in turn appeared after changes related to the handling of module-level AML also made in this cycle (Lv Zheng). - Fix a recent regression in the ACPI IRQ management code that may cause PCI drivers to be unable to register an IRQ if that IRQ happens to be shared with a device on the ISA bus, like the parallel port, by reverting one commit entirely and restoring the previous behavior in two other places (Sinan Kaya). - Fix a recent regression in the ACPI AML debugger introduced by the commit that removed incorrect usage of IS_ERR_VALUE() from multiple places (Lv Zheng)" * tag 'acpi-4.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / debugger: Fix regression introduced by IS_ERR_VALUE() removal ACPICA: Namespace: Fix namespace/interpreter lock ordering ACPI,PCI,IRQ: separate ISA penalty calculation Revert "ACPI, PCI, IRQ: remove redundant code in acpi_irq_penalty_init()" ACPI,PCI,IRQ: factor in PCI possible
2016-07-07ARM: configs: lpc18xx: enable adc and dac iio driversJoachim Eastwood
Enable ADC and DAC IIO drivers for LPC18xx/43xx SoCs. Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-07Merge tag 'pxa-dt-4.7' of https://github.com/rjarzmik/linux into next/dtOlof Johansson
This device-tree pxa update brings : - pin control nodes for pxa2xx and pxa3xx - the LCD controller for pxa2xx - the missing pxa3xx pulse width modulator nodes - an USB Host fix for pxa3xx * tag 'pxa-dt-4.7' of https://github.com/rjarzmik/linux: ARM: dts: pxa3xx: add pincontrol helpers ARM: dts: pxa: add pinctrl to pxa3xx ARM: dts: pxa: fix the ohci clock for pxa3xx ARM: dts: add pincontroller to pxa27x ARM: dts: pxa: add pxa3xx pwm nodes ARM: dts: pxa: add pxa framebuffer device Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-07Merge branches 'acpica-fixes', 'acpi-pci-fixes' and 'acpi-debug-fixes'Rafael J. Wysocki
* acpica-fixes: ACPICA: Namespace: Fix namespace/interpreter lock ordering * acpi-pci-fixes: ACPI,PCI,IRQ: separate ISA penalty calculation Revert "ACPI, PCI, IRQ: remove redundant code in acpi_irq_penalty_init()" ACPI,PCI,IRQ: factor in PCI possible * acpi-debug-fixes: ACPI / debugger: Fix regression introduced by IS_ERR_VALUE() removal
2016-07-07Merge branches 'pm-cpuidle-fixes' and 'pm-sleep-fixes'Rafael J. Wysocki
* pm-cpuidle-fixes: cpuidle: Fix last_residency division * pm-sleep-fixes: x86/power/64: Fix kernel text mapping corruption during image restoration
2016-07-07arm64: Enable workaround for Cavium erratum 27456 on thunderx-81xxGanapatrao Kulkarni
Cavium erratum 27456 commit 104a0c02e8b1 ("arm64: Add workaround for Cavium erratum 27456") is applicable for thunderx-81xx pass1.0 SoC as well. Adding code to enable to 81xx. Signed-off-by: Ganapatrao Kulkarni <gkulkarni@cavium.com> Reviewed-by: Andrew Pinski <apinski@cavium.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-07-07ARM: iop: Fix indentationJungseung Lee
Fix indentation in iop3xx_std_desc Signed-off-by: Jungseung Lee <js07.lee@samsung.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-07Merge tag 'renesas-arm64-dt2-for-v4.8' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64 Merge "Second Round of Renesas ARM64 Based SoC DT Updates for v4.8" from Simon Horman: * Add support for r8a7796/salvator-x (R-Car Gen 3 M3-W) * Add CAN support to r8a7795 (R-Car Gen 3 H3) * tag 'renesas-arm64-dt2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: dts: r8a7796/salvator-x: Enable watchdog timer arm64: dts: r8a7796: Add RWDT node arm64: dts: r8a7796: Use SYSC "always-on" PM Domain arm64: dts: r8a7796: Add SYSC PM Domains arm64: dts: salvator-x: add Salvator-X board on R8A7796 SoC arm64: dts: r8a7796: Add Renesas R8A7796 SoC support arm64: dts: r8a7795: Add CAN FD support arm64: dts: r8a7795: Add missing blank lines between cpu nodes clk: renesas: r8a7795: Add THS/TSC clock clk: renesas: r8a7795: Add DRIF clock clk: renesas: r8a7795: Correct lvds clock parent clk: renesas: r8a7795: Provide FDP1 clocks clk: renesas: Add R8A7792 support clk: renesas: mstp: Document R8A7792 support clk: renesas: rcar-gen2: Document R8A7792 support clk: renesas: cpg-mssr: Add support for R-Car M3-W clk: renesas: cpg-mssr: Extract common R-Car Gen3 support code clk: renesas: Add r8a7796 CPG Core Clock Definitions clk: renesas: cpg-mssr: Document r8a7796 support
2016-07-07arm: meson: explicitly select clk driversMichael Turquette
The AmLogic clock controller code is used by both arm and arm64 architectures. Explicitly select the core code for all Meson (32-bit arm) builds, and also select the Meson8b driver when that machine is built. Signed-off-by: Michael Turquette <mturquette@baylibre.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-07arm64: amlogic: select gxbb clk driverMichael Turquette
The AmLogic clock controller code is used by both arm and arm64 architectures. Explicitly select the core code for all Meson (arm64) builds, and also select the GXBB driver, since that's the way arm64 does things. Signed-off-by: Michael Turquette <mturquette@baylibre.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-07Revert "ARM64: DTS: meson-gxbb: switch ethernet to real clock"Arnd Bergmann
This reverts commit f3abd6296168, which caused a build regression: arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi:48:41: fatal error: dt-bindings/clock/gxbb-clkc.h: No such file or directory We should apply this patch one merge window later, once the clk branch is merged as well. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-07ARM: save and reset the address limit when entering an exceptionRussell King
When we enter an exception, the current address limit should not apply to the exception context: if the exception context wishes to access kernel space via the user accessors (eg, perf code), it must explicitly request such access. Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2016-07-07arm64: kernel: Save and restore UAO and addr_limit on exception entryJames Morse
If we take an exception while at EL1, the exception handler inherits the original context's addr_limit and PSTATE.UAO values. To be consistent always reset addr_limit and PSTATE.UAO on (re-)entry to EL1. This prevents accidental re-use of the original context's addr_limit. Based on a similar patch for arm from Russell King. Cc: <stable@vger.kernel.org> # 4.6- Acked-by: Will Deacon <will.deacon@arm.com> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: James Morse <james.morse@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-07-07ARM: tango: add Suspend-to-RAM supportMarc Gonzalez
Ask firmware to put RAM in self-refresh mode and power system down. echo mem > /sys/power/state See Documentation/power/states.txt Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-07Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux ↵Arnd Bergmann
into next/soc Merge "the second part of the Broadcom ARM-based SoC changes" from Florian Fainelli: - Florian updates the DEBUG_UART_BCM5301X entry to cover both NS and NSP SoCs since they both have the same location * tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux: ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
2016-07-07kbuild, x86: Track generated headers with generated-yJames Hogan
Track generated header files which aren't already in genhdr-y, alongside generic-y wrappers in the */include/generated/[uapi/]asm/ directories. Currently only x86 generates extra headers in these directories, for the purposes of enumerating system calls for different ABIs, and xen hypercalls. This will allow the asm-generic wrapper handling code to remove stale wrappers when files are removed from generic-y, without also removing these headers which are generated separately. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: James Hogan <james.hogan@imgtec.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Jonathan Corbet <corbet@lwn.net> Cc: linux-kbuild@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: Michal Marek <mmarek@suse.com> Link: http://lkml.kernel.org/r/1466808144-23209-2-git-send-email-james.hogan@imgtec.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2016-07-07Merge tag 'arm-soc/for-4.8/soc-arm64-part2' of ↵Arnd Bergmann
http://github.com/Broadcom/stblinux into next/arm64 Merge "Broadcom ARM64-based SoC changes for 4.8 second part" from Florian Fainelli: - Eric updates the bcm2836 interrupt controller driver not to rely on ARM/Linux specific functions in preparation for using it on ARM64 - Eric also adds a Kconfig entry for the BCM2835 Raspberry Pi family in the ARM64 Kconfig.platforms file - Eric cherry picked a patch from Alexander Graf with Acks from ARM64 maintainers to support different DMA and bus offsets, required for the Raspberry Pi 3 SoC * tag 'arm-soc/for-4.8/soc-arm64-part2' of http://github.com/Broadcom/stblinux: arm64: Add platform selection for BCM2835. arm64: Allow for different DMA and CPU bus offsets irqchip: bcm2835: Avoid arch/arm-specific handle_IRQ
2016-07-07Merge tag 'arm-soc/for-4.8/devicetree-arm64-part2' of ↵Arnd Bergmann
http://github.com/Broadcom/stblinux into next/dt64 Merge "Broadcom ARM64 Device Tree changes for 4.8 (part 2)" from Florian Fainelli: This pull request contains the second part of the Broadcom ARM64-based SoCs changes for 4.8. Please note that this pull request contains changes from the ARM 32-bits port and ARM 64-bits port as well: - Lubomir updates all BCM2835 (Raspberry Pi family) Device Tree source files with their proper information about the on-board USB Ethernet adapter so there is appropriate binding between this USB device and a device_node (useful for MAC address fetching and stuff), this commit is also present for the ARM DT pull request - Eric adds support for the Raspberry Pi 3 aka BCM2837 and provides the binding information and the basic SoC DT include file required to boot to a prompt - Gerd updates the Raspberry Pi 3 DT with Ethernet information based on the earlier change from Lubomir * tag 'arm-soc/for-4.8/devicetree-arm64-part2' of http://github.com/Broadcom/stblinux: ARM: bcm2837: dt: Add the ethernet to the device trees ARM: bcm2835: Add devicetree for the Raspberry Pi 3. dt-bindings: Add root properties for Raspberry Pi 3 ARM: bcm2835: dt: Add the ethernet to the device trees
2016-07-07Merge branch 'clockevents/4.8' of ↵Thomas Gleixner
http://git.linaro.org/people/daniel.lezcano/linux into timers/core Pull the clockevents/clocksource tree from Daniel Lezcano: - Convert the clocksource-probe init functions to return a value in order to prepare the consolidation of the drivers using the DT. It is a big patchset but went through 01.org (kbuild bot), linux next and kernel-ci (continuous integration) (Daniel Lezcano) - Fix a bad error handling by returning the right value for cadence_ttc (Christophe Jaillet) - Fix typo in the Kconfig for the Samsung pwm (Alexandre Belloni) - Change functions to static for armada-370-xp and digicolor (Ben Dooks) - Add support for the rk3399 SoC timer by adding bindings and a slight change in the base address. Take the opportunity to add the DYNIRQ flag (Huang Tao) - Fix endian accessors for the Samsung pwm timer (Matthew Leach) - Add Oxford Semiconductor RPS Dual Timer driver (Neil Armstrong) - Add a kernel parameter to swich on/off the event stream feature of the arch arm timer (Will Deacon)
2016-07-07x86: remove duplicate turbo ratio limit MSRsSrinivas Pandruvada
Remove MSR_NHM_TURBO_RATIO_LIMIT and MSR_IVT_TURBO_RATIO_LIMIT as they are duplicate. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2016-07-07Merge branch 'pm-cpufreq' into pm-cpuRafael J. Wysocki
2016-07-07Merge tag 'arm-soc/for-4.8/devicetree-part2' of ↵Arnd Bergmann
http://github.com/Broadcom/stblinux into next/dt Merge "additional Broadcom ARM-based SoC Device Tree changes" from Florian Fainelli: - Lubomir updates all BCM2835 (Raspberry Pi family) Device Tree source files with their proper information about the on-board USB Ethernet adapter so there is appropriate binding between this USB device and a device_node (useful for MAC address fetching and stuff) - Raveendra adds the ADC controller Device Tree nodes to the Cygnus SoC device tree include files - Rafal updates the BCM5301x Device Tree by separating how we specify the NAND chip-select information in a first change and then fixes the NAND controller ECC configuration for the D-Link DIR-885L - Florian adds support for the BCM953012ER reference board, adds the HW random number generator DT node and adds proper memory node information to the BCM958625HR reference board * tag 'arm-soc/for-4.8/devicetree-part2' of http://github.com/Broadcom/stblinux: ARM: dts: NSP: Specify RAM amount for BCM958625HR board ARM: BCM5301X: Fix NAND ECC parameters for D-Link DIR-885L ARM: BCM5301X: Specify NAND chip select and ECC in separated files ARM: dts: Cygnus: Add Broadcom iproc-static-adc DT node ARM: dts: BCM5301x: Add BCM953012ER board ARM: dts: BCM5301x: Add RNG Device Tree node ARM: bcm2835: dt: Add the ethernet to the device trees
2016-07-07Merge tag 'amlogic-dt64-2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64 Merge "Amlogic 64-bit DT updates" from Kevin Hilman: - add RNG and new clock driver support * tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM64: DTS: meson-gxbb: switch ethernet to real clock arm64: dts: gxbb clock controller ARM64: dts: meson-gxbb: Add Hardware Random Generator node dt-bindings: hwrng: Add Amlogic Meson Hardware Random Generator bindings
2016-07-07arm64: dts: hi6220: Add pl031 RTC supportZhangfei Gao
Add pl031 rtc0 and rtc1 support to hi6220 dtsi Cc: Michael Turquette <mturquette@baylibre.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Wei Xu <xuwei5@hisilicon.com> Cc: Guodong Xu <guodong.xu@linaro.org> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org> [jstultz: Forward ported and tweaked commit description, added rtc1 entry as suggested by Guodong] Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2016-07-07Merge tag 'hisi-armv7-soc-for-4.8-v3' of ↵Arnd Bergmann
git://github.com/hisilicon/linux-hisi into next/soc Merge "ARM: mach-hisi: Hisilicon SoC updates for 4.8" from Wei Xu: - Consolidate the hisilicon armv7 SoCs machine entries - Avoid the compiling warning by making unexported symbols static * tag 'hisi-armv7-soc-for-4.8-v3' of git://github.com/hisilicon/linux-hisi: ARM: hisi: consolidate the hisilicon machine entries ARM: hisi: make unexported symbols static
2016-07-07Merge tag 'hisi-armv7-soc-dt-for-4.8-v2' of ↵Arnd Bergmann
git://github.com/hisilicon/linux-hisi into next/dt Merge "ARM: DT: Hisilicon ARMv7 SoC Hi3519 DT updates for 4.8" from Wei Xu: - Add device tree bindings for hi3519 sysctrl - Add dts files for hi3519 - Tidy up DTB makefile entries to keep the list sorted * tag 'hisi-armv7-soc-dt-for-4.8-v2' of git://github.com/hisilicon/linux-hisi: ARM: dts: add dts files for Hi3519 and tidy up the makefile entries ARM: dt-bindings: add device tree bindings for Hi3519 sysctrl
2016-07-07Merge tag 'sunxi-dt-for-4.8' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt Merge "Allwinner DT changes for 4.8" from Maxime Ripard: The usual amount of DT patches, among which: - I2S support - Support for the AXP809 in the relevant boards (A80 based) - New boards: Banapi M1+, Banapi M2+, Allwinner Parrot (R16 EVB), - The other patches to enable various controllers on our boards, most notably USB OTG * tag 'sunxi-dt-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (54 commits) ARM: dts: sun5i: Enable otg on the auxtex t004 ARM: sun5i: Allow PLL3 2x fixed factor clock to change PLL3 rate ARM: sun7i: Add DAI nodes ARM: sun7i: Add mod1 clock nodes ARM: dts: sun5i: Add mmc1 / sdio-wifi node to mk802 ARM: dts: sun5i: Add axp152 pmic node to mk802 ARM: dts: sun5i: Enable otg on the mk802 ARM: dts: sun7i: Add BCM53125 switch nodes to the lamobo-r1 board ARM: sun8i: Add Parrot Board DTS ARM: dts: sun5i: q8-common: Enable USB-based WiFi ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board ARM: dts: sun8i-q8-common: Add support for USB wifi controllers ARM: dts: sun9i: a80-optimus: Order nodes by alphabetical order ARM: dts: sun9i: cubieboard4: Order nodes by alphabetical order ARM: dts: sun7i: Add NFC node to Allwinner A20 SoC ARM: dts: sun4i: Add NFC node to Allwinner A10 SoC ARM: dts: sun6i: Add pmic / regulator nodes to Mele M9 dts ARM: dts: sun6i: Add pmic / regulator nodes to Mele A1000G quad dts ARM: dts: sun6i: The blue led on the Mele M9 is a power led ARM: dts: sun6i: The blue led on the Mele A1000G quad is a power led ...
2016-07-07Merge tag 'sunxi-defconfig-for-4.8' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/defconfig Merge "Allwinner defconfig changes for 4.8" from Maxime Ripard: Two patches to enable the DRM driver in the sunxi and multi_v7 defconfig. * tag 'sunxi-defconfig-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: sunxi: Enable sun4i DRM driver ARM: multi_v7: Enable sun4i DRM driver
2016-07-07Merge tag 'omap-for-v4.8/soc-pt2-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Merge "Few more omap SoC changes for v4.8 merge window" from Tony Lindgren: - Fix a make randconfig build error for recent SMP kexec changes - A series of clock related fixes to prepare things for moving device clkctrl register handling to drivers/clk * tag 'omap-for-v4.8/soc-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: AM33xx: fix module_wait_ready without clkctrl register ARM: OMAP2+: clockdomain: add usecounting support to autoidle APIs ARM: OMAP2+: timer: change order of hwmod data handling ARM: OMAP2+: hwmod: fetch main_clk based on hwmod name ARM: OMAP2+: omap_device: create clock alias purely from DT data ARM: OMAP2+: Fix build with CONFIG_SMP and CONFIG_PM is not set
2016-07-07Merge tag 'omap-for-v4.8/ir-rx51-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers Merge "omap ir-rx51 driver fixes for multiarch for v4.8 merge window" from Tony Lindgren: Fix a long time regression for ir-rx51 driver for n900 device tree booting. This driver has been unusable with multiarch because of the hardware timer access. With the recent PWM changes, we can finally fix the driver for multiarch and device tree support. And naturally there is no rush for these for the -rc cycle, these can wait for the merge window. The PWM changes have been acked by Thierry. For the media changes I did not get an ack from Mauro but he was Cc'd in the discussion and these changes do not conflict with other media changes. After this series we can drop the remaining omap3 legacy booting board files finally. * tag 'omap-for-v4.8/ir-rx51-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ir-rx51: use hrtimer instead of dmtimer ir-rx51: add DT support to driver ir-rx51: use PWM framework instead of OMAP dmtimer pwm: omap-dmtimer: Allow for setting dmtimer clock source ir-rx51: Fix build after multiarch changes broke it
2016-07-07Merge tag 'mvebu-dt64-4.8-1' of git://git.infradead.org/linux-mvebu into ↵Arnd Bergmann
next/dt64 Merge "mvebu dt64 for 4.8 (part 1)" from Gregory CLEMENT: - update dt with mv-xor-v2 found in the Armada 7K/8K SoCs - update dt with the clocks found in the Armada 3700 SoCs * tag 'mvebu-dt64-4.8-1' of git://git.infradead.org/linux-mvebu: arm64: dts: marvell: add peripherals clocks for Armada 37xx arm64: dts: marvell: add tbg clocks for Armada 37xx arm64: dts: marvell: Add xtal clock support for Armada 3700 arm64: dts: marvell: add XOR engine description for Armada 7K/8K CP arm64: dts: marvell: adjust to the latest mv-xor-v2 DT binding
2016-07-07Merge tag 'mvebu-arm64-4.8-1' of git://git.infradead.org/linux-mvebu into ↵Arnd Bergmann
next/arm64 Merge "mvebu arm64 for 4.8" from Gregory CLEMENT: enable Armada 3700 clock drivers * tag 'mvebu-arm64-4.8-1' of git://git.infradead.org/linux-mvebu: arm64: marvell: enable Armada 3700 clock drivers
2016-07-07Merge tag 'reset-for-4.8-3' of git://git.pengutronix.de/git/pza/linux into ↵Arnd Bergmann
next/drivers Merge "Reset controller changes for v4.8, part 3" from Philipp Zabel: - change request API to be more explicit about the difference between exclusive and shared resets (the former guarantee the reset line is asserted immediately when reset_control_assert is called, the latter are refcounted and do not guarantee this). - add Hisilicon hi6220 media subsystem reset controller support - add TI SYSCON based reset controller support * tag 'reset-for-4.8-3' of git://git.pengutronix.de/git/pza/linux: reset: add TI SYSCON based reset driver Documentation: dt: reset: Add TI syscon reset binding reset: hisilicon: Add hi6220 media subsystem reset support reset: hisilicon: Change to syscon register access arm64: dts: hi6220: Add media subsystem reset dts reset: hisilicon: Add media reset controller binding reset: TRIVIAL: Add line break at same place for similar APIs reset: Supply *_shared variant calls when using *_optional APIs reset: Supply *_shared variant calls when using of_* API reset: Ensure drivers are explicit when requesting reset lines reset: Reorder inline reset_control_get*() wrappers
2016-07-07powerpc/pci: Assign fixed PHB number based on device-tree propertiesGuilherme G. Piccoli
The domain/PHB field of PCI addresses has its value obtained from a global variable, incremented each time a new domain (represented by struct pci_controller) is added on the system. The domain addition process happens during boot or due to PHB hotplug add. As recent kernels are using predictable naming for network interfaces, the network stack is more tied to PCI naming. This can be a problem in hotplug scenarios, because PCI addresses will change if devices are removed and then re-added. This situation seems unusual, but it can happen if a user wants to replace a NIC without rebooting the machine, for example. This patch changes the way PCI domain values are generated: now, we use device-tree properties to assign fixed PHB numbers to PCI addresses when available (meaning pSeries and PowerNV cases). We also use a bitmap to allow dynamic PHB numbering when device-tree properties are not used. This bitmap keeps track of used PHB numbers and if a PHB is released (by hotplug operations for example), it allows the reuse of this PHB number, avoiding PCI address to change in case of device remove and re-add soon after. No functional changes were introduced. Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Reviewed-by: Ian Munsie <imunsie@au1.ibm.com> Acked-by: Gavin Shan <gwshan@linux.vnet.ibm.com> [mpe: Drop unnecessary machine_is(pseries) test] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2016-07-07Merge tag 'at91-ab-4.8-defconfig2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig Merge "Defconfig changes for 4.8 #2:" from Alexandre Belloni: - Addition of the sama5d2 xplained PMIC: ACT8945A * tag 'at91-ab-4.8-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: multi_v7_defconfig: add ACT8945A ARM: at91/defconfig: Add ACT8945A driver
2016-07-07ARM: dts: Ux500: fix up TVK sensor dataLinus Walleij
- Fix the I2C address and supply line names for the AK8974 - Sets up the interrupt lines to the different components as they actually are connected, I was confused for some time by the fact that several lines were connected with <NM> 0 Ohm resistors, which means NOT MOUNTED and is thus not 0 Ohm at all but infinite ohms, i.e. not connected at all. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-07-07powerpc/kernel: Drop unused extern for current_setMichael Ellerman
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2016-07-07Merge tag 'v4.7-next-dts' of https://github.com/mbgg/linux-mediatek into ↵Arnd Bergmann
next/dt64 Merge "ARM: mediatek: dts 64 bit updates for v4.8" from Matthias Brugger: - Add nodes for the DISP function ports - Add dt-bindings for mt6755 - Add basic support for mt6755 SoC * tag 'v4.7-next-dts' of https://github.com/mbgg/linux-mediatek: arm64: dts: mediatek: add mt6755 support Document: DT: Add bindings for mediatek MT6755 SoC Platform arm64: dts: mt8173: Add display subsystem related nodes
2016-07-07ARM: hisi: consolidate the hisilicon machine entriesJiancheng Xue
The original patch was to add compatible string for Hi3519 soc and do some cleanup. Since the generic machine entry could meet most of the cases, so I did a further cleanup to reuse it and just keep one machine entry that needs map_io here. Signed-off-by: Jiancheng Xue <xuejiancheng@huawei.com> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2016-07-07timers, x86/mce: Initialize MCE restart timer as pinnedThomas Gleixner
Pinned timers must carry the pinned attribute in the timer structure itself, so convert the code to the new API. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Arjan van de Ven <arjan@infradead.org> Cc: Chris Mason <clm@fb.com> Cc: Eric Dumazet <edumazet@google.com> Cc: George Spelvin <linux@sciencehorizons.net> Cc: Josh Triplett <josh@joshtriplett.org> Cc: Len Brown <lenb@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@redhat.com> Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160704094341.215783439@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-07timers, x86/apic/uv: Initialize the UV heartbeat timer as pinnedThomas Gleixner
Pinned timers must carry the pinned attribute in the timer structure itself, so convert the code to the new API. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Arjan van de Ven <arjan@infradead.org> Cc: Chris Mason <clm@fb.com> Cc: Eric Dumazet <edumazet@google.com> Cc: George Spelvin <linux@sciencehorizons.net> Cc: Josh Triplett <josh@joshtriplett.org> Cc: Len Brown <lenb@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@redhat.com> Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160704094341.133837204@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-07-07arm64: dts: r8a7796/salvator-x: Enable watchdog timerGeert Uytterhoeven
Enable the Watchdog Timer (WDT) controller on the Renesas Salvator-X board equipped with an R-Car M3-W (r8a7796) SoC. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-07-07arm64: dts: r8a7796: Add RWDT nodeGeert Uytterhoeven
Add a device node for the Watchdog Timer (WDT) controller on the Renesas R-Car M3-W (r8a7796) SoC. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>