summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2016-04-25cpufreq: imx: Use generic platdev driverViresh Kumar
The cpufreq-dt-platdev driver supports creation of cpufreq-dt platform device now, reuse that and remove similar code from platform code. Note that the complete routine imx27_dt_init() is removed as of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); has same effect as a NULL .init_machine machine callback pointer. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Lucas Stach <l.stach@pengutronix.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2016-04-25cpufreq: berlin: Use generic platdev driverViresh Kumar
The cpufreq-dt-platdev driver supports creation of cpufreq-dt platform device now, reuse that and remove similar code from platform code. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2016-04-25ARM: dts: da850: There are 101 interrupts.David Lechner
Fix off by one error in da850 device tree in the number of INTC interrupts. Signed-off-by: David Lechner <david@lechnology.com> Tested-by: Kevin Hilman <khilman@baylibre.com> [nsekhar@ti.com: commit message update] Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2016-04-25ARM: dts: da850: disable mdio and eth0 in da850.dtsiDavid Lechner
Disable mdio and eth0 in da850.dtsi file. All other devices are disabled by default and not all boards will use these devices, so these should be disabled too. da850-evm.dtb already had status = "okay" for these devices. da850-enbw-cmc.dts did not, so they were added. Signed-off-by: David Lechner <david@lechnology.com> Tested-by: Kevin Hilman <khilman@baylibre.com> [nsekhar@ti.com: commit description updates] Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2016-04-25ARM: davinci: da8xx-dt: Add spi0 lookup for clock matchingDavid Lechner
Add AUXDATA needed to match the device-tree node for spi0 to the non-device-tree clock. Signed-off-by: David Lechner <david@lechnology.com> Tested-by: Kevin Hilman <khilman@baylibre.com> [nsekhar@ti.com: commit description updates] Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2016-04-25ARM: dts: da850: add spi0 to device treeDavid Lechner
Add device node and pinmux for SoC spi0. Signed-off-by: David Lechner <david@lechnology.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2016-04-25ARM: davinci_all_defconfig: enable SPI and NOR as modulesKevin Hilman
Enable SPI driver and SPI NOR flash support as modules. Tested with SPI NOR flash on DA850-EVM. Basic boot test only to confirm NOR flash device detection. Signed-off-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2016-04-25ARM: davinci_all_defconfig: support systemdSekhar Nori
CONFIG_FHANDLE is required by systemd[1], which is the default init system in more and more distributions. So lets enable it for DaVinci platforms as well. While at it, remove stale entry CONFIG_INOTIFY=y [1] https://github.com/systemd/systemd/blob/master/README#L37 Acked-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2016-04-25ARM: dts: vexpress: Add external expansion bus to DTBrian Starkey
The VExpress development platform has an external expansion bus which can be used for additional hardware (e.g. LogicTile Express daughter boards). Add this bus to the VExpress CoreTile device-trees.The bus is described for a CoreTile occupying site 1. Acked-by: Liviu Dudau <Liviu.Dudau@arm.com> Signed-off-by: Brian Starkey <brian.starkey@arm.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
2016-04-25ARM: dts: vexpress: fix node name unit-address presence warningsSudeep Holla
Commit b993734718c0 ("scripts/dtc: Update to upstream version 53bf130b1cdd") added warnings on node name unit-address presence/absence mismatch in the device trees. This patch fixes those warning on all the vexpress platforms where unit-address is present in node name while the reg/ranges property is not present. Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
2016-04-25ARM: EXYNOS: Properly skip unitialized parent clock in power domain onKrzysztof Kozlowski
We want to skip reparenting a clock on turning on power domain, if we do not have the parent yet. The parent is obtained when turning the domain off. However due to a typo, the loop is continued on IS_ERR() of clock being reparented, not on the IS_ERR() of the parent. Theoretically this could lead to OOPS on first turn on of a power domain, if there was no turn off before. Practically that should never happen because all power domains are turned on by default (reset value, bootloader does not turn off them usually) so the first action will be always turn off. Fixes: 29e5eea06bc1 ("ARM: EXYNOS: Get current parent clock for power domain on/off") Reported-by: Vladimir Zapolskiy <vz@mleia.com> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
2016-04-25ARM: dts: sun7i: Enable S/PDIF on the CubietruckChristopher Spinrath
Enable the S/PDIF transmitter present on the Cubietruck. Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2016-04-25ARM: dts: rockchip: move the rk3288 thermal data into rk3288.dtsiCaesar Wang
In order to be standard to manage for rockchip SoCs, move the thermal data into rk3288 dtsi, we needn't to add a new file for thermal. Signed-off-by: Caesar Wang <wxt@rock-chips.com> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Eduardo Valentin <edubezval@gmail.com> Cc: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2016-04-25ARM: dts: gose: Enable SDHI controllersUlrich Hecht
Includes regulator and pin assignments. Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-25ARM: dts: r8a7793: Add SDHI controllersUlrich Hecht
Same as on r8a7791. Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-25ARM: dts: r8a7790: fix max-frequency for SDHIWolfram Sang
The wrong values come from an old datasheet (H2 v0.6). Anything later has the fixed value of 195MHz (H2 v0.7 up to Gen2-common V2.0). Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-25ARM: dts: kzm9g: Configure NMI key as wake-up sourceGeert Uytterhoeven
Add a GPIO key with wake-up capability for the NMI button. This allows to wake up the system from s2ram without relying on the buttons on the optional switch board. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-25ARM: dts: r8a7790: lager: Enable UHS-I SDR-50Wolfram Sang
Add the "1v8" pinctrl state and sd-uhs-sdr50 property to SDHI{0,2}. Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-25ARM: dts: artpec: update clock bindings in artpec6.dtsiLars Persson
The clock binding for the main clock controller was changed to an indexed controller style binding on request of the clk maintainers. This updates the dtsi to use the new bindings. Signed-off-by: Lars Persson <larper@axis.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-04-24Merge tag 'qcom-dt-for-4.7' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt Merge "Qualcomm Device Tree Changes for v4.7" from Andy Gross: * Add DB600C support * Add IPQ4019 support * Add additional nodes for APQ8064 * Fix APQ8064 pinctrls for i2c/spi * Add MSM8974 nodes for smp2p and smd * Modify MSM8974 memory reserve for rfsa and rmtfs * Add support for BQ27541 on Nexus7 * tag 'qcom-dt-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (30 commits) device-tree: nexus7: Add bq27541 battery interface to dts ARM: dts: db600c: add support to magnetometer ARM: dts: db600c: add spi support ARM: dts: db600c: add i2c support ARM: dts: db600c: Add on board leds support ARM: dts: db600c: add on board sata support. ARM: dts: db600c: add pcie support ARM: dts: db600c: add usb support ARM: dts: db600c: Add eMMC and SD card support ARM: dts: db600c: add pmic regulator supplies ARM: dts: db600c: add board support with serial ARM: dts: apq8064: add gsbi7 i2c support ARM: dts: apq8064: add support to gsbi1 uart ARM: dts: apq8064: fix the pinctrls for i2c and spi ARM: dts: qcom: apq8064: Add smd node and all edges ARM: dts: qcom: apq8064: Add complete smsm node ARM: dts: qcom: apq8064: Add syscon for sic-non-secure ARM: dts: msm8974: Add modem smp2p and smd nodes ARM: dts: msm8974: Add node for second i2c from blsp1 ARM: dts: msm8974: Split efs in rfsa and rmtfs ...
2016-04-24Merge tag 'arm-soc/for-4.7/devicetree' of ↵Arnd Bergmann
http://github.com/Broadcom/stblinux into next/dt Merge "Broadcom ARM-based SoC Device Tree changes" from Florian Fainelli: - Rafal adds proper VCC GPIO to be fed to the USB host controllers for known BCM5301x devices needing that, he also enables earlycon, and enables the SPI-NOR flashes on relevant devices - Eric adds the VideoCore 4 Device Tree nodes to the BCM283x Device Tree and provides a DRM patch to kick out the simplefb framebuffer to avoid conflicts - Stephan adds proper CPU nodes for the ARM processor on the BCM2835 SoC Device Tree - Martin provides a binding fix for the DMA channel interrupt numbers and description * tag 'arm-soc/for-4.7/devicetree' of http://github.com/Broadcom/stblinux: ARM: BCM5301X: Add DT entry for SPI controller and NOR flash dt/bindings: bcm2835: correct description for DMA-int ARM: bcm2835: add CPU node for ARM core ARM: bcm2835: Add VC4 to the device tree. drm/vc4: Kick out the simplefb framebuffer before we set up KMS. ARM: BCM5301X: Enable earlycon on tested devices ARM: BCM5301X: Set vcc-gpio for USB controllers of few devices
2016-04-24Merge tag 'omap-for-v4.7/dt-part1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Merge "First set of device tree changes for omaps for v4.7 merge window" from Tony Lindgren: - Two sets of name and unit address check fixes for dts files. - DMA, McASP, and timer and regulator related dts changes for dra7 - Add more devices for Nokia N9/N950 - Initial support for am335x ICEv2 - Initial support for am572x-IDK - Pinctrl changes for am335x-baltos-ir5221 - Initial support for Amazon Kindle Fire (first generation) - A series of changes to add GPIO controller support for the GPMC driver. The driver changes will be merged separately. - Support for am43xx clkout1 - Pinctrl and RTC changes for am335x-chili - Add support for dra72-evm rev C (SR2.0) * tag 'omap-for-v4.7/dt-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (61 commits) ARM: dts: Add support for dra72-evm rev C (SR2.0) ARM: dts: am335x-chilisom: Enable poweroff PMIC sequence using RTC signal ARM: dts: am335x-chili*: Move Ethernet MAC description from SOM to board ARM: dts: am335x-chili*: Move uart0 description from SOM to board ARM: dts: am43xx: add support for clkout1 clock ARM: dts: omap3-beagle: Provide NAND ready pin ARM: dts: am335x: Provide NAND ready pin ARM: dts: am437x: Provide NAND ready pin ARM: dts: dra7x-evm: Provide NAND ready pin ARM: dts: dm816x: Enable gpio controller for GPMC ARM: dts: dm814x: Enable gpio controller for GPMC ARM: dts: omap3: Enable gpio controller for GPMC ARM: dts: am4372: Enable gpio controller for GPMC ARM: dts: am335x: Enable gpio controller for GPMC ARM: dts: dra7: Enable gpio controller for GPMC ARM: dts: omap5: Enable gpio and interrupt controller for GPMC ARM: dts: omap4: Enable gpio and interrupt controller for GPMC ARM: dts: omap24xx: Enable gpio and interrupt controller for GPMC ARM: dts: omap4-kc1: Power off support ARM: dts: omap4-kc1: LEDs support ...
2016-04-24ARM: dts: uniphier: add NAND pinmux nodeMasahiro Yamada
This commit adds pin-mux nodes for the NAND controller. Some SoCs support 2 chip selects and the others only support 1 chip select. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-04-24Merge tag 'imx-dt-4.7' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt Merge "The i.MX device tree updates for 4.7" from Shawn Guo: - More i.MX6 System-on-Module board support from Ka-Ro electronics: tx6s-8xxx, tx6u-8xxx, tx6q-1xxx, tx6ul-00xx. - Nitrogen6_MAX QP and Nitrogen6_SoloX board support from Boundary Devices. - VF610 based ZII development board support. - Add SAI interface audio support for i.MX6SX SDB board. - A number of random updates on LS1021A and VF610 dts files. - A couple of pinumx updates on i.MX25 and i.MX28. * tag 'imx-dt-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (36 commits) ARM: dts: imx6qdl-udoo: add 7 inch LCD touchscreen panel support ARM: dts: i.MX3x: add keypad port devicetree nodes ARM: dts: ls1021a: add pix clock to DCU dts node ARM: dts: ls1021a: DSPI has 6 chip-selects ARM: dts: ls1021a: Add gpio support for ls1021a platform ARM: dts: imx6q-ba16: Remove unused vqmmc-supply ARM: dts: ls1021a: add SCFG MSI dts node ARM: dts: imx28: add alternative pinmuxing for mac0 ARM: dts: imx6q-tbs2910: fix fec reset polarity ARM: dts: vf610-zii-dev: Add ZII development board. ARM: dts: vfxxx: add missing reg properties ARM: dts: vf-colibri: increase NAND clock speed ARM: dts: vf-colibri: alias the primary FEC as ethernet0 ARM: dts: imx6sx-sdb: Add SAI support bindings: fsl-imx-sdma: Document 'fsl,sdma-event-remap' property ARM: dts: imx6sx: Remove unused property ARM: dts: imx6sx: Fix SAI DMA index ARM: dts: imx6q-ba16: Disable pwm2 by default ARM: dts: imx: add Boundary Devices Nitrogen6_SoloX board ARM: dts: imx6qdl-sabresd: Pass the hannstar panel compatible string ...
2016-04-24Merge tag 'tegra-for-4.7-arm' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt Merge "ARM: tegra: Changes for v4.7-rc1" from Thierry Reding: A couple of patches that cleanup some Kconfig, enable various features, use stdout-path to define the debug serial port (so that it doesn't have to be manually specified on the kernel command-line) and cleanup and fix some minor device trees bugs. * tag 'tegra-for-4.7-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: Correct interrupt type for ARM TWD ARM: tegra: Add stdout-path for various boards ARM: tegra: Replace legacy *,wakeup property with wakeup-source ARM: tegra: Enable watchdog support for Tegra114 and Tegra124 ARM: tegra: Add high speed UARTs to Jetson TK1 device tree ARM: tegra: Fix copy/paste typo in several DTS includes ARM: tegra: Remove redundant ARM_L1_CACHE_SHIFT_6 select
2016-04-24Merge tag 'davinci-for-v4.7/dt' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt Merge "Device-Tree updates for DaVinci" from Sekhar Nori: This contains some clean-up and fixes of device-tree data and addition of i2c1 node for DA850. * tag 'davinci-for-v4.7/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for i2c1 ARM: DTS: da850: add node for i2c1 ARM: dts: davinci: use proper address after @ ARM: DTS: da850: fix missing #gpio-cells in gpio node
2016-04-24Merge tag 'nomadik-dts-v4.7' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt Merge "Nomadik DTS changes for v4.7" from Linus Walleij: - Add accelerometer for NHK15 - Add DMA engine definitions and UART channels * tag 'nomadik-dts-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: dts: nomadik: add DMA engine and some channels ARM: dts: nomadik: add accelerometer IRQ and pin setting
2016-04-24Merge tag 'mvebu-dt-4.7-1' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
Merge "mvebu dt for 4.7 (part 1)" from Gregory CLEMENT: - add hardware monitor support in the NSA320 device tree - update makefile with kirkwood-ds112.dtb and kirkwood-nsa320.dtb - fix GPIO config on the Linksys boards - various Kirkwood DT warning fixup from the newer DT compiler * tag 'mvebu-dt-4.7-1' of git://git.infradead.org/linux-mvebu: ARM: dts: kirkwood: Add DTS for Linksys EA4200v2/EA4500 ARM: dts: orion5x: add device tree for kurobox-pro ARM: dts: kirkwood: Add address go regulator unit name ARM: dts: kirkwood: Add address to mbus unit name ARM: dts: kirkwood: Remove address from gpio-i2c unit name ARM: dts: kirkwood: Fixup pcie DT warnings ARM: dts: kirkwood: Add address to ethernet-phy unit name ARM: dts: kirkwood: Remove address from dsa unit name ARM: dts: kirkwood: Remove node address from leds ARM: dts: kirkwood: Remove button address and fixup names ARM: dts: kirkwood: add kirkwood-nsa320.dtb to Makefile ARM: dts: kirkwood: add kirkwood-ds112.dtb to Makefile ARM: mvebu: fix GPIO config on the Linksys boards ARM: dts: kirkwood: Add the hardware monitor to the NSA320 device tree
2016-04-24Merge tag 'samsung-dt-4.7' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt Merge "Samsung Device Tree updates and improvements for v4.7" from Krzysztof Kozlowski: 1. Enable accelerated AES (Security SubSystem) on Exynos4412-based boards. 2. Enable HDMI CEC on Exynos4412-based Odroid. 3. Add regulator supplies for eMMC/SD on Odroid XU3/XU4. 4. Fix DTC unit name warnings. 5. Merge topic branch of new Artik5 board. * tag 'samsung-dt-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: s5p: Fix DTC unit name warnings in SMDKv210 board ARM: dts: exynos: Fix DTC unit name warnings in Exynos5440 ARM: dts: exynos: Fix DTC unit name warnings in SMDK5420 ARM: dts: exynos: Fix DTC unit name warnings in Peach Pit ARM: dts: exynos: Fix DTC unit name warnings in Exynos542x ARM: dts: exynos: Fix DTC unit name warnings in Exynos5250 ARM: dts: exynos: Fix DTC unit name warnings in Exynos4x12 ARM: dts: exynos: Fix DTC unit name warnings in Trats2 board ARM: dts: exynos: Fix DTC unit name warnings in Exynos4 ARM: dts: exynos: Fix DTC unit name warnings in Exynos3250 ARM: dts: exynos: Fix DTC unit name warnings in cros-adc-thermistors ARM: dts: exynos: Add eMMC and SD regulator supplies to Odroid XU3/XU4 ARM: dts: exynos: Enable the HDMI CEC device on Exynos4412 Odroid boards ARM: dts: exynos: Add node for the HDMI CEC device to exynos4 ARM: dts: exynos: Add HDMI CEC pin definition to exynos4 pinctrl ARM: dts: exynos: Enable SSS on Odroid X/X2/U3 family ARM: dts: exynos: Enable SSS on Trats2 ARM: dts: exynos: Add Security SubSystem node to Exynos4
2016-04-24Merge tag 'samsung-dt-exynos3250-artik5-4.7' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt Merge "Topic branch for Device Tree changes for Exynos 3250 for v4.7" from Krzysztof Kozlowski: Merge necessary new clocks from Sylwester (used by new board) and add support for Exynos3250-based Artik5 board. * tag 'samsung-dt-exynos3250-artik5-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: Add MSHC2 DT node for SD card for exynos3250-artik5-eval board ARM: dts: exynos: Add exynos3250-artik5 dtsi file for ARTIK5 module ARM: dts: exynos: Add MSHC2 DT node for Exynos3250 SoC ARM: dts: exynos: Add UART2 DT node for Exynos3250 SoC ARM: dts: exynos: Add initial gpio setting of MMC2 device for exynos3250-monk ARM: dts: exynos: Add initial pin configuration for exynos3250-rinato clk: samsung: exynos3250: Add MMC2 clock clk: samsung: exynos3250: Add UART2 clock dt-bindings: Add the clock id of UART2 and MMC2 for Exynos3250
2016-04-24ARM: dts: rockchip: add MiQi board from mqmakerHeiko Stuebner
The MiQi is a rk3288-based devboard from Shenzen based mqmaker, with a footprint the size of a credit card. Main available outside connections are 4 usb ports, hdmi, gigabit ethernet and two expansion headers. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2016-04-23Merge tag 'qcom-fixes-for-4.6-rc2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes Merge "Qualcomm Fixes for v4.6-rc2" from Andy Gross: * Revert BAM usage on MSM8974 boards * tag 'qcom-fixes-for-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: Revert "dts: msm8974: Add dma channels for blsp2_i2c1 node" Revert "dts: msm8974: Add blsp2_bam dma node"
2016-04-23ARM: socfpga: Initialize Arria10 OCRAM ECC on startupThor Thayer
Initialize ECC for Arria10 On-Chip RAM on machine startup. The OCRAM memory must be initialized before data is stored in memory otherwise the ECC will fail on reads. The previous check-in 2364d423a7b3 ("ARM: socfpga: Enable Arria10 OCRAM ECC on startup") added the OCRAM enable and initialization code but was not called on startup. Signed-off-by: Thor Thayer <tthayer@opensource.altera.com> Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/1460394094-23326-1-git-send-email-tthayer@opensource.altera.com Signed-off-by: Borislav Petkov <bp@suse.de>
2016-04-23Merge branch 'perf/urgent' into perf/core, to resolve conflictIngo Molnar
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-22Merge tag 'imx-fixes-4.6' of ↵Kevin Hilman
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes Merge "ARM: i.MX fixes for 4.6" from Shawn Guo: The i.MX fixes for 4.6: - The sdhci-esdhc-imx DMA support is broken due to commit 7b91369b4655 ("mmc: sdhci: Set DMA mask when adding host"). It requires device's dma_mask be set up properly to get DMA work. The fixing patch initializes the DMA mask to enable the access again. * tag 'imx-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: mach-imx: sdhci-esdhc-imx: initialize DMA mask
2016-04-22Merge tag 'omap-for-v4.6/fixes-rc3' of ↵Kevin Hilman
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Merge "omap fixes for v4.6-rc cycle" from Tony Lindgren: Fixes for omaps for v4.6-rc cycle: - Clockdomain fix for dra7 timer interrupts - Two fixes for GPMC EDMA binding, I missed the need for a merge with GPMC changes and EDMA changes - Fix beagle-x15 eSATA by dropping misconfigured extcon_usb1 - Fix occasional external aborts on 36xx with PM that we've been chasing for past few months. It turned out to be duplicate restore of INTC registers that can in some cases cause us to hit erratum 1.106. * tag 'omap-for-v4.6/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3: Fix external abort on 36xx waking from off mode idle ARM: dts: am57xx-beagle-x15: remove extcon_usb1 ARM: dts: am437x: Fix GPMC dma properties ARM: dts: am33xx: Fix GPMC dma properties ARM: DRA7: clockdomain: Implement timer workaround for errata i874
2016-04-22Merge tag 'for-v4.7/omap-hwmod-a' of ↵Tony Lindgren
git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.7/soc ARM: OMAP2+: first set of hwmod changes for v4.7 For the DRA7xx platform, add IP block data for the McASP, PWMSS, and GPTimer12 IP blocks. Add lock and unlock functions for the RTC IP blocks on the DRA7xx, AM33xx, and AM43xx devices. And add a fix for the hwmod core for device driver unbind operations for IP blocks with hardreset lines. Basic build, boot, and PM test results are available here: http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v4.7/20160410132119/ Note that the testbed here does not have the DRA7xx board included yet.
2016-04-22Merge tag 'bcm2835-dt-next-2016-04-20' into devicetree/nextFlorian Fainelli
This pull request brings in VC4 devicetree support and the other minor DT changes for 4.7. Also included is a DRM patch necessary to prevent regressions when simplefb and vc4 drivers are both present. The patch was suggested by the simplefb maintainer as the solution agreed upon at ELCE 2014, and was acked by the DRM maintainer for merging through this tree. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-04-22ARM: BCM5301X: Add DT entry for SPI controller and NOR flashRafał Miłecki
Controller is present on every BCM4708* board but only few devices have serial flash attached so mark it as disabled by default. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2016-04-22Merge tag 'renesas-fixes-for-v4.6' of ↵Kevin Hilman
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes Merge "Renesas ARM Based SoC Fixes for v4.6" from Simon Horman: Renesas ARM Based SoC Fixes for v4.6 * Correct preset_lpj calculation which may lead to too short delays * Correct handling of optional clocks on r8a7791 to restore access to the serial port the porter board * tag 'renesas-fixes-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: timer: Fix preset_lpj leading to too short delays Revert "ARM: dts: porter: Enable SCIF_CLK frequency and pins" ARM: dts: r8a7791: Don't disable referenced optional clocks
2016-04-22Merge tag 'omap-for-v4.6/fixes-rc2-v2-signed' of ↵Kevin Hilman
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Merge "omap fixes against v4.6-rc2" from Tony Lindgren Fixes for omaps against v4.6-rc2, mostly to fix suspend for beagle-x15 that broke when we added runtime based SoC revision detection earlier. It seems suspend worked earlier as things were only partially initialized, while now we initialize things properly for dra7. Note that the "ARM: OMAP: Catch callers of revision information prior to it being populated" had to be reverted as it caused bogus warnings for other SoCs because omap initcalls bail out based on revision being set to 0 for other SoCs. These initcalls will mostly just disappear when we drop support for omap3 legacy booting. Also included is a fix for dra7 sys_32k_ck clock source that is not enabled on boot making system fall back to using emulated clock. * tag 'omap-for-v4.6/fixes-rc2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (198 commits) Revert "ARM: OMAP: Catch callers of revision information prior to it being populated" ARM: OMAP: Catch callers of revision information prior to it being populated ARM: dts: dra7: Correct clock tree for sys_32k_ck ARM: OMAP: DRA7: Provide proper class to omap2_set_globals_tap ARM: OMAP: DRA7: wakeupgen: Skip SAR save for wakeupgen Linux 4.6-rc2 v4l2-mc: avoid warning about unused variable Convert straggling drivers to new six-argument get_user_pages() .mailmap: add Christophe Ricard Make CONFIG_FHANDLE default y mm/page_isolation.c: fix the function comments oom, oom_reaper: do not enqueue task if it is on the oom_reaper_list head mm/page_isolation: fix tracepoint to mirror check function behavior mm/rmap: batched invalidations should use existing api x86/mm: TLB_REMOTE_SEND_IPI should count pages mm: fix invalid node in alloc_migrate_target() include/linux/huge_mm.h: return NULL instead of false for pmd_trans_huge_lock() mm, kasan: fix compilation for CONFIG_SLAB MAINTAINERS: orangefs mailing list is subscribers-only net: mvneta: fix changing MTU when using per-cpu processing ...
2016-04-22ARM: dts: socfpga: Add samtec VIN|ING boardMarek Vasut
Add support for board based on the popular Altera Cyclone V SoC. This board has the following properties: - 1 GiB of DRAM - 1 Gigabit ethernet - 1 USB gadget port - 1 USB host port with an on-board hub - 2 QSPI NORs connected to the Cadence QSPI core - Multiple I2C EEPROMs and one I2C temperature sensor Signed-off-by: Marek Vasut <marex@denx.de> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2016-04-22soc: renesas: Move pm-rcar to drivers/soc/renesas/rcar-syscGeert Uytterhoeven
Move the pm-rcar driver from arch/arm/mach-shmobile/ to drivers/soc/renesas/, and its header file to include/linux/soc/renesas/, so it can be shared between arm32 (R-Car H1 and Gen2) and arm64 (R-Car Gen3). Rename it to rcar-sysc as it's really a driver for the R-Car System Controller (SYSC). Kill the intermediate PM_RCAR config symbol, as it's not user configurable anymore, and to prepare for SoC-specific make rules. Add the missing #include <linux/types.h> to rcar-sysc.h, which was exposed by different include order. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-22PCI: rcar-pcie: Remove Gen2 designation from KconfigSimon Horman
It appears that Gen2 is a misnomer for the R-Car PCIE driver which also supports Gen 1 and Gen 3 SoCs. Accordingly, drop Gen 2 from the help text and Kconfig symbol. Also, re-arange the Kconfig symbol name to use PCIE as the prefix. This appears to be in keeping with other PCIE Kconfig symbols. Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
2016-04-22Merge tag 'v4.6-rc3' into drm-nextDave Airlie
Backmerge 4.6-rc3 for i915. Linux 4.6-rc3
2016-04-21ARM: dts: lpc32xx: disabled ssp0/spi1 & ssp1/spi2 by defaultSylvain Lemieux
The SSP0/SPI1 and SSP1/SPI2 shared pinout and should be disable by default. Board specific dts should enable them, as needed. Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com> Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
2016-04-21ARM: dts: phy3250: enable ssp0Sylvain Lemieux
Preparatory change prior to disabling SSPx controllers by default in the shared LPC32xx DTSI file. Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com> Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
2016-04-21ARM: dts: lpc32xx: add clock properties to spi nodesSylvain Lemieux
The change adds clock properties to spi peripheral devices, clock ids are taken from dt-bindings/clock/lpc32xx-clock.h Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com> Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
2016-04-21ARM: LPC32xx: add PL175 memory controller driver to defconfigVladimir Zapolskiy
The change enables build of ARM PrimeCell PL17x driver for LPC32xx platform, the memory controller is commonly used to interface NOR flash drives. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
2016-04-21ARM: LPC32xx: defconfig updateVladimir Zapolskiy
The change is a result of "make lpc32xx_defconfig; make savedefconfig" run, a number of config options are removed: CONFIG_BINFMT_AOUT=y -- not needed, legacy CONFIG_FPE_NWFPE=y -- not needed, AEABI build CONFIG_IPV6_PRIVACY=y -- removed build option CONFIG_IPV6=y -- selected by default CONFIG_MII=y -- not needed, board phys don't select library CONFIG_MTD_CHAR=y -- removed build option CONFIG_MTD_M25P80=y -- not needed, AT25 EEPROM driver is in use CONFIG_USB_PHY=y -- selected by default Acked-by: Sylvain Lemieux <slemieux.tyco@gmail.com> Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>