summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-07Merge tag 'omap-for-v4.17/dt-sdhci-signed' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Pull "Device tree changes for dra7 sdhci for v4.17" from Tony Lindgren: This series from Sekhar Nori and Kishon Vijay Abraham I adds sdhci related nodes for dra7. To support higher transfer speeds, the iodelay pinmux controller needs to be also configured. Note that as these changes need SDHCI_OMAP to be enabled to avoid breaking booting for various systems, these changes are based on two defconfig changes to enable SDHCI_OMAP in the defconfig files. * tag 'omap-for-v4.17/dt-sdhci-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am57xx-idk: Select pull down for mmc1_clk line in default mode ARM: dts: dra71-evm: Select pull down for mmc1_clk line in default mode ARM: dts: dra71-evm: Correct evm_sd regulator max voltage ARM: dts: dra76-evm: Add "vqmmc-supply" property for mmc2 ARM: dts: am57xx-idk: Add "vqmmc-supply" property for mmc2 ARM: dts: dra7-evm: Add "vqmmc-supply" property for mmc2 ARM: dts: dra7-evm: Remove mmc specific pinmux ARM: dts: am57xx-beagle-x15: Add "vqmmc-supply" property for mmc2 ARM: dts: dra76-evm: Add pinctrl data for higher speed MMC/SD modes ARM: dts: dra76-evm: Shift to using common IOdelay data ARM: dts: dra76x: Create a common file with MMC/SD IOdelay data ARM: omap2plus_defconfig: Enable CONFIG_MMC_SDHCI_OMAP ARM: multi_v7_defconfig: Enable CONFIG_MMC_SDHCI_OMAP
2018-03-07Merge tag 'keystone_dts_for_4.17' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt Pull "ARM: Keystone DTS for 4.17" from Santosh Shilimkar: - Andrew's various DTS warning fixes - clock address separator fix - EDAC support for EMIF - serial dts node unit address format fix * tag 'keystone_dts_for_4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: dts: keystone-k2g: Fix unit-address formatting for serial nodes dt-bindings: memory: ti-emif: add edac support under emif ARM: dts: keystone-k2e-clocks: Fix missing unit address separator ARM: dts: keystone-k2g: Move usb-phy nodes out of soc0 ARM: dts: keystone-k2g: Move keystone_dsp_gpio to under device-state-control ARM: dts: keystone-k2g: Move keystone_irq to under device-state-control ARM: dts: keystone-k2hk: Move keystone_dsp_gpio to under device-state-control ARM: dts: keystone-k2l: Move keystone_dsp_gpio to under device-state-control ARM: dts: keystone-k2e: Move keystone_dsp_gpio to under device-state-control ARM: dts: keystone: Move reset-controller to under device-state-control ARM: dts: keystone: Move keystone_irq to under device-state-control
2018-03-07Merge tag 'omap-for-v4.17/dt-signed' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Pull "Device tree changes for omap variants for v4.17" from Tony Lindgren: This series of changes updates the device tree files for omaps: - Nokia N9 support for magnetometer - Update at24 to use atmel as manufacturer for am335x-boneblue - Add support for am33xx based PDU001 board - Update Droid 4 touchscreen for reset-gpios and add audio codec and soundcard - Remove unused dra7 cooling level nodes - A series of changes to configure am335x and am437x for PM - Add pinmuxing for i2c2 and 3 for LogicPD boards - Add EMIF interrupt infor for am437x and am335x - Add missing omap3 sound-dai-cells * tag 'omap-for-v4.17/dt-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (21 commits) ARM: dts: omap4-droid4: add soundcard ARM: dts: motorola-cpcap-mapphone: add audio-codec ARM: dts: omap3: Add missing #sound-dai-cells ARM: dts: am43xx: add emif interrupt info ARM: dts: am33xx: add emif interrupt info ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD SOM-LV ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD torpedo ARM: dts: am4372: Mark omap_l3_noc with ti,no-idle ARM: dts: am4372: Mark emif with ti,no-idle ARM: dts: am33xx: Mark emif with ti,no-idle ARM: dts: am4372: Add soc node ARM: dts: am33xx: Add pm-sram phandle to soc node ARM: dts: am4372: Update emif node ARM: dts: am33xx: Update emif node ARM: dts: am4372: Reserve pm code and data regions in ocmcram sram node ARM: dts: am33xx: Reserve pm code and data regions in ocmcram sram node ARM: dts: omap: Remove "cooling-{min|max}-level" for CPU nodes ARM: dts: omap4-droid4: update touchscreen ARM: dts: am33xx: add PDU001 board ARM: dts: use 'atmel' as at24 manufacturer in am335x-boneblue ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-07Merge tag 'juno-updates-4.17' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt Pull "ARMv8 Vexpress/Juno DT updates for v4.17" from Sudeep Holla: 1. Extends support for missing 3 GICv2m MSI frames 2. Fixes the incorrect GICv2m frame size(64kB instead of 4kB) * tag 'juno-updates-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: arm64: dts: juno: fix size of GICv2m MSI frames arm64: dts: juno: Describe the full GICv2m region
2018-03-07arm64: dts: replace 'linux,stdout-path' with 'stdout-path'Rob Herring
'linux,stdout-path' has been deprecated for some time in favor of 'stdout-path'. Now dtc will warn on occurrences of 'linux,stdout-path'. Search and replace the one occurrence with 'stdout-path'. Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-07arm: dts: replace 'linux,stdout-path' with 'stdout-path'Rob Herring
'linux,stdout-path' has been deprecated for some time in favor of 'stdout-path'. Now dtc will warn on occurrences of 'linux,stdout-path'. Search and replace all the of occurrences with 'stdout-path'. Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-07arm64: dts: Add SC2731 PMIC dts file for Spreadtrum SC9860Baolin Wang
The Spreadtrum SC9860 platform has one SC2731 PMIC, and the SC2731 PMIC integrates all mobile handset power management, audio codec, battery management and user interface support function in a single chip. This patch adds the SC2731 dts file, as well as adding the RTC and regulator device node for this PMIC. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-07arm64: dts: Add DMA device node for Spreadtrum SC9860Baolin Wang
The Spreadtrum SC9860 platform has two DMA controllers, one is located on the ap-ahb system, and another one is located on the agcp system. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-07arm64: dts: Add watchdog device node for Spreadtrum SC9860Baolin Wang
Add the watchdog device node for Spreadtrum SC9860 platform to watch the system's stability. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-07arm64: dts: Add timer node for Spreadtrum SC9860Baolin Wang
We will use one always-on timer to be the broadcast device, thus add the timer device node for Spreadtrum SC9860 platform. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-07arm64: dts: Add pin controller node for Spreadtrum SC9860Baolin Wang
This patch adds the pin controller device node for Spreadtrum SC9860 platform. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-07arm64: dts: Add ADI device node for Spreadtrum SC9860Baolin Wang
We will access the PMIC through ADI controller, thus this patch adds the ADI device node for Spreadtrum SC9860 platform. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-07arm64: dts: Add hwspinlock node for Spreadtrum SC9860Baolin Wang
The Spreadtrum SC9860 platform only has one hardware spinlock device, which is located on AON system of Spreadtrum SC9860 platform. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-07Merge tag 'davinci-for-v4.17/dt' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt Pull "DaVinci DT support enhancements for v4.17" from Sekhar Nori: * Lego EV3 gains firmware recovery mode support * Miscellaneous non-critical clean-up * tag 'davinci-for-v4.17/dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: dts: da850-evm: add chosen and SPI alias ARM: dts: da850-lego-ev3: use a correct fallback for at24 compatible ARM: dts: da850-lego-ev3: Add node for reboot modes
2018-03-07Merge tag 'sti-dt-for-v4.17-round1' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt Pull "STi dts update" from Patrice Chotard: Fix all DT dtc warnings when building with W=1 For most of implicated node, the addition of a fake reg property fixes these warnings. For others nodes, their location in device tree have been updated. * tag 'sti-dt-for-v4.17-round1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/pchotard/sti: ARM: dts: STi: Remove unused clk_ext2f_a9 clock ARM: dts: STi: Update clocks node location ARM: dts: STi: Update sound related nodes location ARM: dts: STi: Add fake reg property for usb2_picophyX nodes ARM: dts: STi: Add fake reg for restart, powerdown and picophy/softreset ARM: dts: STi: Add fake reg property for remote processors ARM: dts: STi: Add fake reg property for irq-syscfg ARM: dts: STi: Add fake reg property for miphy28lp_phy ARM: dts: STi: Add fake reg property for sti-display-subsystem ARM: dts: STi: Move leds node outside soc node ARM: dts: STi: Fix bindings notation
2018-03-06arm: dts: add Nuvoton NPCM750 device treeBrendan Higgins
Add a common device tree for all Nuvoton NPCM750 BMCs and a board specific device tree for the NPCM750 (Poleg) evaluation board. Signed-off-by: Brendan Higgins <brendanhiggins@google.com> Reviewed-by: Tomer Maimon <tmaimon77@gmail.com> Reviewed-by: Avi Fishman <avifishman70@gmail.com> Reviewed-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Rob Herring <robh@kernel.org> Tested-by: Tomer Maimon <tmaimon77@gmail.com> Tested-by: Avi Fishman <avifishman70@gmail.com> Tested-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-06ARM: dts: artpec: add node for hardware crypto acceleratorNiklas Cassel
Add node for the hardware crypto acceleration used in the artpec6 SoC. Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-06ARM: dts: artpec: add disabled node for PCIe endpoint modeNiklas Cassel
The PCIe controller in the artpec6 SoC supports both root complex and endpoint mode, however, the controller can only be used in one of the modes. Both pci nodes are disabled by default. A DTS file can enable one of them, depending on what mode it wants to run. Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-06ARM: dts: artpec: add and utilize nbpfaxi DMA controllersNiklas Cassel
Add nodes for the nbpfaxi DMA controllers used in the artpec6 SoC, and start using them for the exising UARTs. Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-06ARM: dts: artpec: add and utilize artpec6 pin controllerNiklas Cassel
Add node for the pin controller used in the artpec6 SoC, and start using it for the exising UARTs. Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-06ARM: dts: artpec: migrate ethernet to stmmac bindingNiklas Cassel
The snps,dwc-qos-ethernet binding is still supported as a glue layer in the stmmac driver. However, since the snps,dwc-qos-ethernet binding is now deprecated, migrate to stmmac's native binding. At the same time, enable features supported by the stmmac driver, such as PTP, LPI, and an additional tx queue. Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-06ARM: dts: artpec: remove 0x prefix from clkctrl unit addressNiklas Cassel
Remove 0x prefix from clkctrl unit address. This silences the following dtc warning: Warning (unit_address_format): Node /clkctrl@0xf8000000 unit name should not have leading "0x" Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-06ARM: dts: artpec: use 1 GiB RAMNiklas Cassel
There has never been an artpec6 devboard produced with less than 1 GiB RAM. Increase the default value to 1 GiB RAM, so that we can netboot with large initramfs without going OOM. Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-06ARM: dts: artpec: disable Accelerator Coherency PortNiklas Cassel
Accesses via 0x80000000 go through the ACP instead of using the DDR directly. Unfortunately the ACP has proven to be the cause of complete system hangs. Disabling the ACP makes these problems go away. Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-05ARM: dts: keystone-k2g: Fix unit-address formatting for serial nodesSuman Anna
The unit addresses on couple of serial nodes have a leading 0 resulting in couple of warning messages around simple-bus unit address format errors when compiled with W=1. Fix the same. Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
2018-03-05dt-bindings: memory: ti-emif: add edac support under emifTero Kristo
Certain revisions of the TI EMIF IP contain ECC support in them. Reflect this in the DT binding. Also, add interrupts property as a required property for the emif controller, as all revisions of the emif IP contain interrupt support; this might remain unused by the kernel driver though. Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Tero Kristo <t-kristo@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
2018-03-05ARM: dts: keystone-k2e-clocks: Fix missing unit address separatorSuman Anna
Commit 95d8b41c765b ("ARM: dts: keystone-k2e-clocks: Add missing unit name to clock nodes that have regs") fixed the unit names on various clock nodes but missed out adding the unit address separator on the clkhyperlink0 clock node. Fix the same. Fixes: 95d8b41c765b ("ARM: dts: keystone-k2e-clocks: Add missing unit name to clock nodes that have regs") Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
2018-03-05ARM: dts: keystone-k2g: Move usb-phy nodes out of soc0Andrew F. Davis
The two usb-phy nodes are not memory-mapped devices on the SoC but rather dummy phys for SoCs with transparent autonomous NOP phys. Move these to outside soc0 to their own node like done elsewhere. Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
2018-03-05ARM: dts: keystone-k2g: Move keystone_dsp_gpio to under device-state-controlAndrew F. Davis
The keystone_irq node describes a device that is a member of the device state control module address space. As such, it should not be a member of soc0 bus but instead a sub-node of device-state-control. This move also fixes a warning about not having a reg property. Now that this is a sub-node of device-state-control, a syscon type node, we add this reg property but relative to the syscon base, this way when the dt-binding/driver are updated we can drop the non-standard gpio,syscon-dev property completely and simply use get_resource() in the driver. Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
2018-03-05ARM: dts: keystone-k2g: Move keystone_irq to under device-state-controlAndrew F. Davis
The keystone_irq node describes a device that is a member of the device state control module address space. As such, it should not be a member of soc0 bus but instead a sub-node of device-state-control. This move also fixes a warning about not having a reg property. Now that this is a sub-node of device-state-control, a syscon type node, we add this reg property but relative to the syscon base, this way when the dt-binding/driver are updated we can drop the non-standard ti,syscon-dev property completely and simply use get_resource() in the driver. Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
2018-03-05ARM: dts: keystone-k2hk: Move keystone_dsp_gpio to under device-state-controlAndrew F. Davis
The keystone_irq node describes a device that is a member of the device state control module address space. As such, it should not be a member of soc0 bus but instead a sub-node of device-state-control. This move also fixes warnings about not having a reg property. Now that this is a sub-node of device-state-control, a syscon type node, we add this reg property but relative to the syscon base, this way when the dt-binding/driver are updated we can drop the non-standard gpio,syscon-dev property completely and simply use get_resource() in the driver. Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
2018-03-05ARM: dts: keystone-k2l: Move keystone_dsp_gpio to under device-state-controlAndrew F. Davis
The keystone_irq node describes a device that is a member of the device state control module address space. As such, it should not be a member of soc0 bus but instead a sub-node of device-state-control. This move also fixes warnings about not having a reg property. Now that this is a sub-node of device-state-control, a syscon type node, we add this reg property but relative to the syscon base, this way when the dt-binding/driver are updated we can drop the non-standard gpio,syscon-dev property completely and simply use get_resource() in the driver. Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
2018-03-05ARM: dts: keystone-k2e: Move keystone_dsp_gpio to under device-state-controlAndrew F. Davis
The keystone_irq node describes a device that is a member of the device state control module address space. As such, it should not be a member of soc0 bus but instead a sub-node of device-state-control. This move also fixes a warning about not having a reg property. Now that this is a sub-node of device-state-control, a syscon type node, we add this reg property but relative to the syscon base, this way when the dt-binding/driver are updated we can drop the non-standard gpio,syscon-dev property completely and simply use get_resource() in the driver. Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
2018-03-05ARM: dts: keystone: Move reset-controller to under device-state-controlAndrew F. Davis
The keystone_irq node describes a device that is a member of the device state control module address space. As such, it should not be a member of soc0 bus but instead a sub-node of device-state-control. This move also fixes a warning about not having a reg property. Now that this is a sub-node of device-state-control, a syscon type node, we add this reg property but relative to the syscon base, this way when the dt-binding/driver are updated we can drop the non-standard ti,syscon-dev property completely and simply use get_resource() in the driver. Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
2018-03-05ARM: dts: keystone: Move keystone_irq to under device-state-controlAndrew F. Davis
The keystone_irq node describes a device that is a member of the device state control module address space. As such, it should not be a member of soc0 bus but instead a sub-node of device-state-control. This move also fixes a warning about not having a reg property. Now that this is a sub-node of device-state-control, a syscon type node, we add this reg property but relative to the syscon base, this way when the dt-binding/driver are updated we can drop the non-standard ti,syscon-dev property completely and simply use get_resource() in the driver. Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: Nishanth Menon <nm@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
2018-03-04Linux 4.16-rc4v4.16-rc4Linus Torvalds
2018-03-04Merge branch 'x86/urgent' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 fixes from Thomas Gleixner: "A small set of fixes for x86: - Add missing instruction suffixes to assembly code so it can be compiled by newer GAS versions without warnings. - Switch refcount WARN exceptions to UD2 as we did in general - Make the reboot on Intel Edison platforms work - A small documentation update so text and sample command match" * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: Documentation, x86, resctrl: Make text and sample command match x86/platform/intel-mid: Handle Intel Edison reboot correctly x86/asm: Add instruction suffixes to bitops x86/entry/64: Add instruction suffix x86/refcounts: Switch to UD2 for exceptions
2018-03-04Merge branch 'x86-pti-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86/pti fixes from Thomas Gleixner: "Three fixes related to melted spectrum: - Sync the cpu_entry_area page table to initial_page_table on 32 bit. Otherwise suspend/resume fails because resume uses initial_page_table and triggers a triple fault when accessing the cpu entry area. - Zero the SPEC_CTL MRS on XEN before suspend to address a shortcoming in the hypervisor. - Fix another switch table detection issue in objtool" * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/cpu_entry_area: Sync cpu_entry_area to initial_page_table objtool: Fix another switch table detection issue x86/xen: Zero MSR_IA32_SPEC_CTRL before suspend
2018-03-04Merge branch 'timers-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull timer fixes from Thomas Gleixner: "A small set of fixes from the timer departement: - Add a missing timer wheel clock forward when migrating timers off a unplugged CPU to prevent operating on a stale clock base and missing timer deadlines. - Use the proper shift count to extract data from a register value to prevent evaluating unrelated bits - Make the error return check in the FSL timer driver work correctly. Checking an unsigned variable for less than zero does not really work well. - Clarify the confusing comments in the ARC timer code" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: timers: Forward timer base before migrating timers clocksource/drivers/arc_timer: Update some comments clocksource/drivers/mips-gic-timer: Use correct shift count to extract data clocksource/drivers/fsl_ftm_timer: Fix error return checking
2018-03-04Merge branch 'irq-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull irq fixlet from Thomas Gleixner: "Just a documentation update for the missing device tree property of the R-Car M3N interrupt controller" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: dt-bindings/irqchip/renesas-irqc: Document R-Car M3-N support
2018-03-04Merge tag 'for-4.16-rc3-tag' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux Pull btrfs fixes from David Sterba: - when NR_CPUS is large, a SRCU structure can significantly inflate size of the main filesystem structure that would not be possible to allocate by kmalloc, so the kvalloc fallback is used - improved error handling - fix endiannes when printing some filesystem attributes via sysfs, this is could happen when a filesystem is moved between different endianity hosts - send fixes: the NO_HOLE mode should not send a write operation for a file hole - fix log replay for for special files followed by file hardlinks - fix log replay failure after unlink and link combination - fix max chunk size calculation for DUP allocation * tag 'for-4.16-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: Btrfs: fix log replay failure after unlink and link combination Btrfs: fix log replay failure after linking special file and fsync Btrfs: send, fix issuing write op when processing hole in no data mode btrfs: use proper endianness accessors for super_copy btrfs: alloc_chunk: fix DUP stripe size handling btrfs: Handle btrfs_set_extent_delalloc failure in relocate_file_extent_cluster btrfs: handle failure of add_pending_csums btrfs: use kvzalloc to allocate btrfs_fs_info
2018-03-03Merge branch 'i2c/for-current-fixed' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux Pull i2c fixes from Wolfram Sang: "A driver fix and a documentation fix (which makes dependency handling for the next cycle easier)" * 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: octeon: Prevent error message on bus error dt-bindings: at24: sort manufacturers alphabetically
2018-03-03Merge branch 'libnvdimm-fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm Pull libnvdimm fixes from Dan Williams: "A 4.16 regression fix, three fixes for -stable, and a cleanup fix: - During the merge window support for the new ACPI NVDIMM Platform Capabilities structure disabled support for "deep flush", a force-unit- access like mechanism for persistent memory. Restore that mechanism. - VFIO like RDMA is yet one more memory registration / pinning interface that is incompatible with Filesystem-DAX. Disable long term pins of Filesystem-DAX mappings via VFIO. - The Filesystem-DAX detection to prevent long terms pins mistakenly also disabled Device-DAX pins which are not subject to the same block- map collision concerns. - Similar to the setup path, softlockup warnings can trigger in the shutdown path for large persistent memory namespaces. Teach for_each_device_pfn() to perform cond_resched() in all cases. - Boaz noticed that the might_sleep() in dax_direct_access() is stale as of the v4.15 kernel. These have received a build success notification from the 0day robot, and the longterm pin fixes have appeared in -next. However, I recently rebased the tree to remove some other fixes that need to be reworked after review feedback. * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: memremap: fix softlockup reports at teardown libnvdimm: re-enable deep flush for pmem devices via fsync() vfio: disable filesystem-dax page pinning dax: fix vma_is_fsdax() helper dax: ->direct_access does not sleep anymore
2018-03-03Merge tag 'kbuild-fixes-v4.16' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild Pull Kbuild fixes from Masahiro Yamada: - suppress sparse warnings about unknown attributes - fix typos and stale comments - fix build error of arch/sh - fix wrong use of ld-option vs cc-ldoption - remove redundant GCC_PLUGINS_CFLAGS assignment - fix another memory leak of Kconfig - fix line number in error messages of Kconfig - do not write confusing CONFIG_DEFCONFIG_LIST out to .config - add xstrdup() to Kconfig to handle memory shortage errors - show also a Debian package name if ncurses is missing * tag 'kbuild-fixes-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: MAINTAINERS: take over Kconfig maintainership kconfig: fix line number in recursive inclusion error message Coccinelle: memdup: Fix typo in warning messages kconfig: Update ncurses package names for menuconfig kbuild/kallsyms: trivial typo fix kbuild: test --build-id linker flag by ld-option instead of cc-ldoption kbuild: drop superfluous GCC_PLUGINS_CFLAGS assignment kconfig: Don't leak choice names during parsing sh: fix build error for empty CONFIG_BUILTIN_DTB_SOURCE kconfig: set SYMBOL_AUTO to the symbol marked with defconfig_list kconfig: add xstrdup() helper kbuild: disable sparse warnings about unknown attributes Makefile: Fix lying comment re. silentoldconfig
2018-03-03Merge tag 'media/v4.16-3' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media Pull media fixes from Mauro Carvalho Chehab: - some build fixes with randconfigs - an m88ds3103 fix to prevent an OOPS if the chip doesn't provide the right version during probe (with can happen if the hardware hangs) - a potential out of array bounds reference in tvp5150 - some fixes and improvements in the DVB memory mapped API (added for kernel 4.16) * tag 'media/v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: media: vb2: Makefile: place vb2-trace together with vb2-core media: Don't let tvp5150_get_vbi() go out of vbi_ram_default array media: dvb: update buffer mmaped flags and frame counter media: dvb: add continuity error indicators for memory mapped buffers media: dmxdev: Fix the logic that enables DMA mmap support media: dmxdev: fix error code for invalid ioctls media: m88ds3103: don't call a non-initalized function media: au0828: add VIDEO_V4L2 dependency media: dvb: fix DVB_MMAP dependency media: dvb: fix DVB_MMAP symbol name media: videobuf2: fix build issues with vb2-trace media: videobuf2: Add VIDEOBUF2_V4L2 Kconfig option for VB2 V4L2 part
2018-03-03Merge tag 'linux-watchdog-4.16-fixes-1' of ↵Linus Torvalds
git://www.linux-watchdog.org/linux-watchdog Pull watchdog fixes from Wim Van Sebroeck: - rave-sp: add NVMEM dependency - build fixes for i6300esb_wdt, xen_wdt and sp5100_tco * tag 'linux-watchdog-4.16-fixes-1' of git://www.linux-watchdog.org/linux-watchdog: watchdog: sp5100_tco.c: fix potential build failure watchdog: xen_wdt: fix potential build failure watchdog: i6300esb: fix build failure watchdog: rave-sp: add NVMEM dependency
2018-03-02Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds
Pull KVM fixes from Radim Krčmář: "x86: - fix NULL dereference when using userspace lapic - optimize spectre v1 mitigations by allowing guests to use LFENCE - make microcode revision configurable to prevent guests from unnecessarily blacklisting spectre v2 mitigation feature" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: x86: fix vcpu initialization with userspace lapic KVM: X86: Allow userspace to define the microcode version KVM: X86: Introduce kvm_get_msr_feature() KVM: SVM: Add MSR-based feature support for serializing LFENCE KVM: x86: Add a framework for supporting MSR-based features
2018-03-02memremap: fix softlockup reports at teardownDan Williams
The cond_resched() currently in the setup path needs to be duplicated in the teardown path. Rather than require each instance of for_each_device_pfn() to open code the same sequence, embed it in the helper. Link: https://github.com/intel/ixpdimm_sw/issues/11 Cc: "Jérôme Glisse" <jglisse@redhat.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Christoph Hellwig <hch@lst.de> Cc: <stable@vger.kernel.org> Fixes: 71389703839e ("mm, zone_device: Replace {get, put}_zone_device_page()...") Signed-off-by: Dan Williams <dan.j.williams@intel.com>
2018-03-02libnvdimm: re-enable deep flush for pmem devices via fsync()Dave Jiang
Re-enable deep flush so that users always have a way to be sure that a write makes it all the way out to media. Writes from the PMEM driver always arrive at the NVDIMM since movnt is used to bypass the cache, and the driver relies on the ADR (Asynchronous DRAM Refresh) mechanism to flush write buffers on power failure. The Deep Flush mechanism is there to explicitly write buffers to protect against (rare) ADR failure. This change prevents a regression in deep flush behavior so that applications can continue to depend on fsync() as a mechanism to trigger deep flush in the filesystem-DAX case. Fixes: 06e8ccdab15f4 ("acpi: nfit: Add support for detect platform CPU cache...") Reviewed-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
2018-03-03MAINTAINERS: take over Kconfig maintainershipMasahiro Yamada
I have recently picked up Kconfig patches to my tree without any declaration. Making it official now. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org>