summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-08-17Merge tag 'omap-for-v4.14/dt-v3-signed' of ↵Arnd Bergmann45-285/+1532
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Pull "Device tree changes for omaps for v4.14 merge window" from Tony Lindgren: - A series of changes for dra7 and am572 to use generic MMC vqmmc regulator - Clean-up tps65217 internal interrupts to define them only in tps65217.dtsi - Add dra7 iodelay pinctrl driver configuration - Add buzzer support for am437x-gp-evm - Disable HDMI CEC internal pull-ups as it seems that all boards have an external pull for these - Remove unnecessary interrupt-parent for omap3 - Configure droid 4 vaudio regulator initial mode and add vibrator - Enable NAND dma prefetch for am335x-evm, am437x and dra7 - Add pcie1 dt node for EP mode for am57x and dra7 - Add support for new dra76x SoCs and dra76x-evm * tag 'omap-for-v4.14/dt-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (25 commits) ARM: dts: nokia n900: update dts with camera support ARM: dts: Add support for dra76-evm ARM: dts: Add support for dra76x family of devices ARM: dts: DRA7: Add pcie1 dt node for EP mode ARM: dts: am335x: add support for Moxa UC-8100-ME-T open platform ARM: dts: dra7xx: Enable NAND dma prefetch by default ARM: dts: am437xx: Enable NAND dma prefetch by default ARM: dts: am335x-evm: Enable NAND dma prefetch by default ARM: dts: omap4-droid4: Add vibrator ARM: dts: motorola-cpcap-mapphone: set initial mode for vaudio ARM: dts: omap3: Remove needless interrupt-parent property ARM: dts: Disable HDMI CEC internal pull-ups ARM: dts: am437x-gp-evm: Add support for buzzer ARM: dts: Add dra7 iodelay configuration ARM: dts: tps65217: Add power button interrupt to the common tps65217.dtsi file ARM: dts: tps65217: Add charger interrupts to the common tps65217.dtsi file ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc" ARM: dts: am572x-idk: Fix GPIO polarity for MMC1 card detect ARM: dts: am571x-idk: Fix GPIO polarity for MMC1 card detect ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes ...
2017-08-17Merge tag 'mvebu-dt-4.14-1' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann29-32/+86
Pull "mvebu dt for 4.14 (part 1)" from Gregory CLEMENT: Add arm_global_timer node on Armada 38x Fix PCI bus dtc warnings on mvebu 32 bits device tree files * tag 'mvebu-dt-4.14-1' of git://git.infradead.org/linux-mvebu: ARM: dts: armada-38x: Add arm_global_timer node ARM: dts: marvell: fix PCI bus dtc warnings
2017-08-17Merge tag 'gemini-dts-1' of ↵Arnd Bergmann8-28/+543
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt Pull "Gemini DTS updates for ARM SoC take one" from Linus Walleij: * tag 'gemini-dts-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: dts: gemini: add pin control set-up for the SoC ARM: dts: Add DTS file for D-Link DIR-685 ARM: dts: gemini: Switch to using macros
2017-08-17Merge tag 'sunxi-dt-for-4.14' of ↵Arnd Bergmann9-8/+486
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt Pull "Allwinner dts changes for 4.14" from Chen-Yu Tsai: The usual improvement patches: - R_INTC interrupt controller compatible string update and device node addition - Battery charger enabled on the Cubietruck - New board: Bananapi M2 Magic - Ethernet and USB OTG enabled on the Beelink X2 - MMC enabled for A83T boards * tag 'sunxi-dt-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: ARM: dts: sun8i: a83t: h8homlet: Enable micro-SD card and onboard eMMC ARM: dts: sun8i: a83t: cubietruck-plus: Enable micro-SD card and eMMC ARM: dts: sun8i: a83t: Add pingroup for 8-bit eMMC on mmc2 ARM: dts: sun8i: a83t: Add MMC controller device nodes ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Beelink X2 ARM: dts: sun8i: h3: Enable USB OTG on the Beelink X2 ARM: dts: sun8i: Add BananaPI M2-Magic DTS ARM: dts: sun7i: enable battery power supply subnode on cubietruck ARM: dts: sun8i: a83t: Add device node for R_INTC interrupt controller ARM: dts: sun8i: a23/a33: Use new sun6i-a31-r-intc compatible for NMI/R_INTC ARM: dts: sun6i: a31: Use new sun6i-a31-r-intc compatible for NMI/R_INTC
2017-08-17Merge tag 'v4.14-rockchip-dts32-1' of ↵Arnd Bergmann27-49/+401
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Pull "Rockchip dts32 changes for 4.14" from Heiko Stübner: Removal of the deprectated num-slots property from all Rockchip dw-mmc nodes. The rv1108 gains support for sd-cards on the evaluation board and the general nodes get a bit of cosmetic. On rk3288 the evb gains support saradc and the adc-key connected to it while some more boards also get their mali gpu enabled (fennec, evb, tinker). The biggest set of changes can be found on the rk3228/rk3229 combo this time. It gets core support for efuse, sdmmc, sdio, io-domans and spdif as well as a separate rk3229.dtsi that will keep the slight differences between the two brothers rk3228/rk3229. The evaluation board also gets some attention and abled nodes (regulators, io-domains, emmc, tsadc keys) But I think the most interesting change is the cpu enable-method for it. Instead of using the older in-kernel method, we're now also moving to handling this in firmware via the psci interface on 32bit Rockchip socs. In a recently merged pull request [0] support for the rk3228/rk3229 was added to OP-TEE including the psci support and it seems supporting other 32bit Rockchip socs that way is also planned for the future. [0] https://github.com/OP-TEE/optee_os/pull/1666 * tag 'v4.14-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (23 commits) ARM: dts: rockchip: fix property-ordering in rv1108 mmc nodes ARM: dts: rockchip: enable sdmmc for rv1108 evb ARM: dts: rockchip: add efuse device node for rk3228 ARM: dts: rockchip: add gpio power-key for rk3229-evb ARM: dts: rockchip: enable tsadc for rk3229-evb ARM: dts: rockchip: enable eMMC for rk3229-evb ARM: dts: rockchip: enable io-domain for rk3229-evb ARM: dts: rockchip: add cpu-supply property for cpu node of rk3229-evb ARM: dts: rockchip: add regulator nodes for rk3229-evb ARM: dts: rockchip: add sdmmc and sdio nodes for rk3228 SoC ARM: dts: rockchip: fix compatible string for eMMC node of rk3228 SoC ARM: dts: rockchip: add cpu enable method for rk3228 SoC ARM: dts: rockchip: remove num-slots from all platforms ARM: dts: rockchip: Add io-domain node for rk3228 ARM: dts: rockchip: add basic dtsi file for RK3229 SoC ARM: dts: rockchip: enable adc key for rk3288-evb ARM: dts: rockchip: enable saradc for rk3288-evb ARM: dts: rockchip: enable ARM Mali GPU on rk3288-fennec ARM: dts: rockchip: enable ARM Mali GPU on rk3288-evb ARM: dts: rockchip: enable ARM Mali GPU on rk3288-tinker ...
2017-08-17Merge tag 'renesas-dt-for-v4.14' of ↵Arnd Bergmann14-13/+591
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Pull "Renesas ARM Based SoC DT Updates for v4.14" from Simon Horman: Changes of note: * Add pin controller support to the RZ/G1M (r8a7743) SoC and RZ/A1 (r7s72100) SoCs now that the driver is available in v4.13-rc1. * Add GPIO support to the RZ/G1M (r8a7743) SoC now that the driver is availabe in v4.13-rc1. * Enable MMCIF0 and Ethernet AVB support on the RZ/G1M (r8a7743) SoC and the iWave-RZG1M-20M Qseven SOM. This depends on newly added pin controller support noted above. * Use R-Car Gen 2 fallback binding for vin nodes This makes binding use consistent across R-Car Gen 2 SoCs. It does not have any run-time effect * Use SMP jump stub SRAM region from DT on R-Car Gen 2 SoCs Geert Uytterhoeven says, "The R-Car Gen2 platform code for CPU core bringup needs to copy a jump stub to on-SoC SRAM. Currently it uses a hardcoded address pointing to ICRAM1." * Add Inter Connect RAM to R-Car Gen 2 and RZ/G1 SoCs Geert Uytterhoeven says, "R-Car Gen2 and RZ/G1 SoCs contain two or three blocks of SRAM, which can be used for several purposes. One such purpose is holding a jump stub for CPU core bringup." * Use generic compatible string for I2C EEPROM for RZ/A1 (r7s72100) SoC and koelsch board. This is part of a tree-wide cleanup by Javier Martinez Canillas * tag 'renesas-dt-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (38 commits) ARM: dts: iwg20m: Correct indentation of mmcif0 properties ARM: dts: rskrza1: Add LED0 pin support ARM: dts: rskrza1: Add SDHI1 pin group ARM: dts: rskrza1: Add Ethernet pin group ARM: dts: rskrza1: Add SCIF2 pin group ARM: dts: genmai: Add ethernet pin group ARM: dts: genmai: Add user led device nodes ARM: dts: genmai: Add RIIC2 pin group ARM: dts: genmai: Add SCIF2 pin group ARM: dts: r7s72100: Add pin controller node ARM: dts: iwg20m: Add MMCIF0 support ARM: dts: r8a7794: Use R-Car Gen 2 fallback binding for vin nodes ARM: dts: r8a7791: Use R-Car Gen 2 fallback binding for vin nodes ARM: dts: r8a7790: Use R-Car Gen 2 fallback binding for vin nodes ARM: dts: r8a7743: Add MMCIF0 support ARM: dts: r8a7794: Reserve SRAM for the SMP jump stub ARM: dts: r8a7793: Reserve SRAM for the SMP jump stub ARM: dts: r8a7792: Reserve SRAM for the SMP jump stub ARM: dts: r8a7791: Reserve SRAM for the SMP jump stub ARM: dts: r8a7790: Reserve SRAM for the SMP jump stub ...
2017-08-17Merge tag 'renesas-dt-bindings-for-v4.14' of ↵Arnd Bergmann4-21/+62
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Pull "Renesas ARM Based SoC DT Bindings Updates for v4.14" from Simon Horman: * Document R-Car D3 (r8a77995) SoC and Draak board * Document reserved SRAM for the SMP jump stub on R-Car Gen2 and RZ/G1 SoCs Geert Uytterhoeven says, "+Renesas R-Car Gen2 and RZ/G1 SoCs need a small piece of SRAM for the jump stub +for secondary CPU bringup and CPU hotplug. +This memory is reserved by adding a child node to a "mmio-sram" node..." * Add a VSP channel index to DU vsps Laurent Pinchart says, "multiple LIF instances in the VSP. The current DT bindings don't support specifying that kind of SoC integration scheme. Extend them with a VSP channel index." * Add R-Car M3-W (r8a7796) HDMI TX DT bindings This is compatible with existing R-Car H3 (r8a7795) support * tag 'renesas-dt-bindings-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Document Renesas Draak board DT bindings ARM: shmobile: Document R-Car D3 SoC DT bindings dt-bindings: display: rcar-du: Add a VSP channel index to the vsps DT property dt-bindings: sram: Document renesas,smp-sram dt-bindings: display: renesas: Add R-Car M3-W HDMI TX DT bindings
2017-08-17Merge tag 'stm32-dt-for-v4.14-1' of ↵Arnd Bergmann8-11/+222
git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/dt Pull "STM32 DT updates for v4.14, round 1" from Alexandre Torgue: Highlights: ---------- -Add DMA support on STM32F746 -Add DMA support on STM32H743 -Add DAC support on STM32H743 -Add DAC support on STM32F429 -Add ADC support on STM32H743 -Enable ADC on stm32h743i-eval board -Add CEC support on STM32F7xx MCUs -Enable CEC on stm32f769-disco board -Remove rdinit from stm32f4 boards * tag 'stm32-dt-for-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: ARM: dts: stm32: Add DMA support for STM32H743 SoC ARM: dts: stm32: Add DMA support for STM32F746 SoC ARM: dts: stm32: enable ADC on stm32h743i-eval board ARM: dts: stm32: add ADC support on stm32h743 ARM: dts: stm32: Add DAC support on stm32h743 ARM: dts: stm32: Add DAC support on stm32f429 ARM: dts: stm32: enable CEC for stm32f769 discovery ARM: dts: stm32: add CEC for stm32f7 family ARM: dts: stm32: reorder stm32h743 nodes ARM: dts: stm32: Remove rdinit from bootargs on stm32f429-disco ARM: dts: stm32: Remove rdinit from bootargs on stm32f429i-eval ARM: dts: stm32: Remove rdinit from bootargs on stm32f469-disco
2017-08-16Merge tag 'samsung-dt-4.14' of ↵Arnd Bergmann17-90/+0
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt Pull "Samsung DTS ARM changes for v4.13" from Krzysztof Kozłowski: Remove deprecated and unneeded properties from Exynos boards. * tag 'samsung-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: Remove num-slots from exynos platforms ARM: dts: exynos: Remove the OF graph from DSI node
2017-08-14ARM: dts: nokia n900: update dts with camera supportPavel Machek1-0/+87
Add camera support to N900 dts. Also add a note about MMC & debugging. Signed-off-by: Pavel Machek <pavel@ucw.cz> Acked-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: Add support for dra76-evmLokesh Vutla5-248/+687
dra76-evm is a board based on TI's dra76 processor targeting for infotainment systems. Adding support for this platform. dra76-evm and dra7-evm has a similar layout except with few differences. So create a dra7-evm-common.dtsi with similarities on dra76-evm and dra7-evm. Include this common dtsi in both dra7-evm.dts and dra76-evm.dts Signed-off-by: Keerthy <j-keerthy@ti.com> Signed-off-by: Vignesh R <vigneshr@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: Add support for dra76x family of devicesLokesh Vutla1-0/+19
dra76 family is a high-performance, infotainment application device, based on OMAP architecture on a 28-nm technology. This contains most of the subsystems, peripherals that are available on dra74, dra72 family. This SoC mainly features Subsystems: - 2 x Cortex-A15 with max speed of 1.8GHz - 2 X DSP - 2 X Cortex-M4 IPU - ISS - CAL - DSS - VPE - VIP Connectivity peripherals: - 1 USB3.0 and 3 USB2.0 subsystems - 2 x SATA - 2 x PCI Express Gen2 - 3-port Gigabit ethernet switch - 2 x CAN - MCAN Adding basic dts support for DRA76 family while reusing the data available in dra7.dtsi, dra74x.dtsi. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: DRA7: Add pcie1 dt node for EP modeKishon Vijay Abraham I6-3/+51
Add pcie1 dt node in order for the controller to operate in endpoint mode. However since none of the dra7 based boards have slots configured to operate in endpoint mode, keep EP mode disabled. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: am335x: add support for Moxa UC-8100-ME-T open platformSZ Lin3-0/+529
Add support for Moxa UC-8100-ME-T open platform The UC-8100-ME-T computing platform is designed for embedded data acquisition industrial applications The features of UC-8100-ME-T series are: * eMMC * SPI flash * SD slot * 2x LAN * 2 RS-232/422/485 ports, software-selectable * Mini PCIe form factor with USB signal * USB host * EEPROM * TPM * Watchdog * RTC * User gpio-keys * User LEDs * User button Signed-off-by: SZ Lin <sz.lin@moxa.com> Acked-by: Rob Herring <robh@kernel.org> [tony@atomide.com: fix unit adress as suggested by Rob] Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: dra7xx: Enable NAND dma prefetch by defaultFranklin S Cooper Jr2-0/+2
Currently the default method of prefetch polled shows the highest possible read and write speed when minimal non NAND background activity is being done. But it is also very CPU intensive to reach these high speeds (CPU load of 99% via mtd performance tests). While DMA prefetch only uses 50% of the CPU to achieve around 23% less in top read and write performance. However, as the non NAND CPU load increases the read and write performance takes a large hit when using polled prefetch. Therefore, prefetch dma mode ends up outperforming prefetch polled in general "system level" test. So switch to using dma prefetch by default since it is likely what most users would prefer. Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com> Acked-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: am437xx: Enable NAND dma prefetch by defaultFranklin S Cooper Jr2-0/+2
Currently the default method of prefetch polled shows the highest possible read and write speed when minimal non NAND background activity is being done. But it is also very CPU intensive to reach these high speeds (CPU load of 99% via mtd performance tests). While DMA prefetch only uses 50% of the CPU to achieve around 23% less in top read and write performance. However, as the non NAND CPU load increases the read and write performance takes a large hit when using polled prefetch. Therefore, prefetch dma mode ends up outperforming prefetch polled in general "system level" test. So switch to using dma prefetch by default since it is likely what most users would prefer. Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com> Acked-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: am335x-evm: Enable NAND dma prefetch by defaultFranklin S Cooper Jr1-0/+1
Currently the default method of prefetch polled shows the highest possible read and write speed when minimal non NAND background activity is being done. But it is also very CPU intensive to reach these high speeds (CPU load of 99% via mtd performance tests). While DMA prefetch only uses 50% of the CPU to achieve around 23% less in top read and write performance. However, as the non NAND CPU load increases the read and write performance takes a large hit when using polled prefetch. Therefore, prefetch dma mode ends up outperforming prefetch polled in general "system level" test. So switch to using dma prefetch by default since it is likely what most users would prefer. Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com> Acked-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: omap4-droid4: Add vibratorSebastian Reichel1-0/+40
Add vibrator to Droid4's device tree. Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: motorola-cpcap-mapphone: set initial mode for vaudioSebastian Reichel1-0/+1
Set default mode for vaudio, which may be left in standby mode if the system is booted via kexec from Android. Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: omap3: Remove needless interrupt-parent propertyKarthik Tummala1-4/+0
All nodes inhert "interrupt-parent" property from root node. Removed the aforementioned property from usbhsohci, usbhsehci, ssi_port1, ssi_port2 nodes to avoid duplication. Signed-off-by: Karthik Tummala <karthik@techveda.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: Disable HDMI CEC internal pull-upsTony Lindgren8-8/+8
Devices using an external encoder, ESD protection and level shifter such as tpd12s015 or ip4791cz12 have the CEC pull in the encoder chip. And on var-som-om44, there is external pull up resistor R30. So the internal CEC pull-up resistor needs to be disabled as otherwise the external and internal pull are parallel making the pull value much smaller than intended. This leads into the CEC not working as reported by Hans Verkuil <hverkuil@xs4all.nl>. Reported-by: Hans Verkuil <hverkuil@xs4all.nl> Cc: Dmitry Lifshitz <lifshitz@compulab.co.il> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-14ARM: dts: am437x-gp-evm: Add support for buzzerFaiz Abbas1-0/+14
Add support for onboard gpio buzzer. It works using the gpio-beeper driver. Pinmux entries for GPIO controlling the buzzer are also added. Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-10ARM: dts: Add dra7 iodelay configurationTony Lindgren2-0/+11
Add dra7 iodelay configuration. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
2017-08-10ARM: dts: tps65217: Add power button interrupt to the common tps65217.dtsi fileEnric Balletbo i Serra3-2/+1
The interrupt for power button is static data that comes from the datasheet, there is no reason to need to define this value on every board so seams reasonable put this information into the common tps65217 file. Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-10ARM: dts: tps65217: Add charger interrupts to the common tps65217.dtsi fileEnric Balletbo i Serra3-4/+2
The interrupt specifiers for USB and AC charger input are static data that comes from the datasheet, there is no reason to need to define these values on every board so seem reasonable put this information into the common tps65217 file. Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-10Merge branch 'omap-for-v4.14/mmc-regulator' into omap-for-v4.14/dtTony Lindgren20-19/+80
2017-08-10ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"Kishon Vijay Abraham I15-15/+15
Replace deprecated "vmmc_aux" with the generic "vqmmc" binding for MMC IO supply. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-10Merge tag 'v4.13-rc1' into omap-for-v4.14/mmc-regulatorTony Lindgren10738-214368/+812910
Linux v4.13-rc1
2017-08-10ARM: dts: am572x-idk: Fix GPIO polarity for MMC1 card detectKishon Vijay Abraham I1-1/+1
The GPIO polarity for MMC1 card detect is set to '0' which means active-high. However the polarity should be active-low. Fix it here. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-10ARM: dts: am571x-idk: Fix GPIO polarity for MMC1 card detectKishon Vijay Abraham I1-1/+1
The GPIO polarity for MMC1 card detect is set to '0' which means active-high. However the polarity should be active-low. Fix it here. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-08-08ARM: dts: gemini: add pin control set-up for the SoCLinus Walleij7-1/+322
This adds the basic pin control muliplexing settings for the Gemini SoC: parallel (NOR) flash, SATA, optional IDE, PCI and UART. We also select the right GPIO groups on all applicable systems so that GPIO keys/LEDs work smoothly. We can then build upon this for more complex systems. Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2017-08-08ARM: dts: Add DTS file for D-Link DIR-685Linus Walleij2-0/+192
This adds a device tree file for the Gemini-based D-Link DIR-685 router, supporting all devices that are currently supported in the main DTSI SoC file. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2017-08-08ARM: dts: gemini: Switch to using macrosLinus Walleij1-27/+29
The macros for reset and clock lines were merged during the merge window, this switches the Gemini to use these macros rather than numerical defines. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2017-08-07Linux 4.13-rc4v4.13-rc4Linus Torvalds1-1/+1
2017-08-07Merge tag 'platform-drivers-x86-v4.13-4' of ↵Linus Torvalds1-2/+2
git://git.infradead.org/linux-platform-drivers-x86 Pull x86 platform driver fix from Darren Hart: "Fix loop preventing some platforms from waking up via the power button in s2idle: - intel-vbtn: match power button on press rather than release" * tag 'platform-drivers-x86-v4.13-4' of git://git.infradead.org/linux-platform-drivers-x86: platform/x86: intel-vbtn: match power button on press rather than release
2017-08-06Merge tag 'ext4_for_linus_stable' of ↵Linus Torvalds13-196/+290
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 Pull ext4 fixes from Ted Ts'o: "A large number of ext4 bug fixes and cleanups for v4.13" * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: fix copy paste error in ext4_swap_extents() ext4: fix overflow caused by missing cast in ext4_resize_fs() ext4, project: expand inode extra size if possible ext4: cleanup ext4_expand_extra_isize_ea() ext4: restructure ext4_expand_extra_isize ext4: fix forgetten xattr lock protection in ext4_expand_extra_isize ext4: make xattr inode reads faster ext4: inplace xattr block update fails to deduplicate blocks ext4: remove unused mode parameter ext4: fix warning about stack corruption ext4: fix dir_nlink behaviour ext4: silence array overflow warning ext4: fix SEEK_HOLE/SEEK_DATA for blocksize < pagesize ext4: release discard bio after sending discard commands ext4: convert swap_inode_data() over to use swap() on most of the fields ext4: error should be cleared if ea_inode isn't added to the cache ext4: Don't clear SGID when inheriting ACLs ext4: preserve i_mode if __ext4_set_acl() fails ext4: remove unused metadata accounting variables ext4: correct comment references to ext4_ext_direct_IO()
2017-08-06Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2-0/+3
Pull MIPS fixes from Ralf Baechle: "This fixes two build issues for ralink platforms, both due to missing #includes which used to be included indirectly via other headers" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: ralink: mt7620: Add missing header MIPS: ralink: Fix build error due to missing header
2017-08-06Fix compat_sys_sigpending breakageDmitry V. Levin1-4/+7
The latest change of compat_sys_sigpending in commit 8f13621abced ("sigpending(): move compat to native") has broken it in two ways. First, it tries to write 4 bytes more than userspace expects: sizeof(old_sigset_t) == sizeof(long) == 8 instead of sizeof(compat_old_sigset_t) == sizeof(u32) == 4. Second, on big endian architectures these bytes are being written in the wrong order. This bug was found by strace test suite. Reported-by: Anatoly Pugachev <matorola@gmail.com> Inspired-by: Eugene Syromyatnikov <evgsyr@gmail.com> Fixes: 8f13621abced ("sigpending(): move compat to native") Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Acked-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-08-06ext4: fix copy paste error in ext4_swap_extents()Maninder Singh1-1/+1
This bug was found by a static code checker tool for copy paste problems. Signed-off-by: Maninder Singh <maninder1.s@samsung.com> Signed-off-by: Vaneet Narang <v.narang@samsung.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2017-08-06ext4: fix overflow caused by missing cast in ext4_resize_fs()Jerry Lee1-1/+2
On a 32-bit platform, the value of n_blcoks_count may be wrong during the file system is resized to size larger than 2^32 blocks. This may caused the superblock being corrupted with zero blocks count. Fixes: 1c6bd7173d66 Signed-off-by: Jerry Lee <jerrylee@qnap.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@vger.kernel.org # 3.7+
2017-08-06ext4, project: expand inode extra size if possibleMiao Xie3-24/+85
When upgrading from old format, try to set project id to old file first time, it will return EOVERFLOW, but if that file is dirtied(touch etc), changing project id will be allowed, this might be confusing for users, we could try to expand @i_extra_isize here too. Reported-by: Zhang Yi <yi.zhang@huawei.com> Signed-off-by: Miao Xie <miaoxie@huawei.com> Signed-off-by: Wang Shilong <wshilong@ddn.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2017-08-06ext4: cleanup ext4_expand_extra_isize_ea()Miao Xie1-9/+5
Clean up some goto statement, make ext4_expand_extra_isize_ea() clearer. Signed-off-by: Miao Xie <miaoxie@huawei.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Wang Shilong <wshilong@ddn.com>
2017-08-06ext4: restructure ext4_expand_extra_isizeMiao Xie2-40/+36
Current ext4_expand_extra_isize just tries to expand extra isize, if someone is holding xattr lock or some check fails, it will give up. So rename its name to ext4_try_to_expand_extra_isize. Besides that, we clean up unnecessary check and move some relative checks into it. Signed-off-by: Miao Xie <miaoxie@huawei.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Wang Shilong <wshilong@ddn.com>
2017-08-06ext4: fix forgetten xattr lock protection in ext4_expand_extra_isizeMiao Xie2-12/+16
We should avoid the contention between the i_extra_isize update and the inline data insertion, so move the xattr trylock in front of i_extra_isize update. Signed-off-by: Miao Xie <miaoxie@huawei.com> Reviewed-by: Wang Shilong <wshilong@ddn.com>
2017-08-06ext4: make xattr inode reads fasterTahsin Erdogan4-48/+92
ext4_xattr_inode_read() currently reads each block sequentially while waiting for io operation to complete before moving on to the next block. This prevents request merging in block layer. Add a ext4_bread_batch() function that starts reads for all blocks then optionally waits for them to complete. A similar logic is used in ext4_find_entry(), so update that code to use the new function. Signed-off-by: Tahsin Erdogan <tahsin@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2017-08-06ext4: inplace xattr block update fails to deduplicate blocksTahsin Erdogan1-3/+1
When an xattr block has a single reference, block is updated inplace and it is reinserted to the cache. Later, a cache lookup is performed to see whether an existing block has the same contents. This cache lookup will most of the time return the just inserted entry so deduplication is not achieved. Running the following test script will produce two xattr blocks which can be observed in "File ACL: " line of debugfs output: mke2fs -b 1024 -I 128 -F -O extent /dev/sdb 1G mount /dev/sdb /mnt/sdb touch /mnt/sdb/{x,y} setfattr -n user.1 -v aaa /mnt/sdb/x setfattr -n user.2 -v bbb /mnt/sdb/x setfattr -n user.1 -v aaa /mnt/sdb/y setfattr -n user.2 -v bbb /mnt/sdb/y debugfs -R 'stat x' /dev/sdb | cat debugfs -R 'stat y' /dev/sdb | cat This patch defers the reinsertion to the cache so that we can locate other blocks with the same contents. Signed-off-by: Tahsin Erdogan <tahsin@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Andreas Dilger <adilger@dilger.ca>
2017-08-06ext4: remove unused mode parameterTahsin Erdogan1-5/+4
ext4_alloc_file_blocks() does not use its mode parameter. Remove it. Signed-off-by: Tahsin Erdogan <tahsin@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2017-08-06ext4: fix warning about stack corruptionArnd Bergmann1-5/+6
After commit 62d1034f53e3 ("fortify: use WARN instead of BUG for now"), we get a warning about possible stack overflow from a memcpy that was not strictly bounded to the size of the local variable: inlined from 'ext4_mb_seq_groups_show' at fs/ext4/mballoc.c:2322:2: include/linux/string.h:309:9: error: '__builtin_memcpy': writing between 161 and 1116 bytes into a region of size 160 overflows the destination [-Werror=stringop-overflow=] We actually had a bug here that would have been found by the warning, but it was already fixed last year in commit 30a9d7afe70e ("ext4: fix stack memory corruption with 64k block size"). This replaces the fixed-length structure on the stack with a variable-length structure, using the correct upper bound that tells the compiler that everything is really fine here. I also change the loop count to check for the same upper bound for consistency, but the existing code is already correct here. Note that while clang won't allow certain kinds of variable-length arrays in structures, this particular instance is fine, as the array is at the end of the structure, and the size is strictly bounded. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2017-08-06ext4: fix dir_nlink behaviourAndreas Dilger2-10/+14
The dir_nlink feature has been enabled by default for new ext4 filesystems since e2fsprogs-1.41 in 2008, and was automatically enabled by the kernel for older ext4 filesystems since the dir_nlink feature was added with ext4 in kernel 2.6.28+ when the subdirectory count exceeded EXT4_LINK_MAX-1. Automatically adding the file system features such as dir_nlink is generally frowned upon, since it could cause the file system to not be mountable on older kernel, thus preventing the administrator from rolling back to an older kernel if necessary. In this case, the administrator might also want to disable the feature because glibc's fts_read() function does not correctly optimize directory traversal for directories that use st_nlinks field of 1 to indicate that the number of links in the directory are not tracked by the file system, and could fail to traverse the full directory hierarchy. Fortunately, in the past ten years very few users have complained about incomplete file system traversal by glibc's fts_read(). This commit also changes ext4_inc_count() to allow i_nlinks to reach the full EXT4_LINK_MAX links on the parent directory (including "." and "..") before changing i_links_count to be 1. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196405 Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2017-08-06ext4: silence array overflow warningDan Carpenter1-1/+1
I get a static checker warning: fs/ext4/ext4.h:3091 ext4_set_de_type() error: buffer overflow 'ext4_type_by_mode' 15 <= 15 It seems unlikely that we would hit this read overflow in real life, but it's also simple enough to make the array 16 bytes instead of 15. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>