summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2016-04-26arm64: introduce mov_q macro to move a constant into a 64-bit registerArd Biesheuvel
Implement a macro mov_q that can be used to move an immediate constant into a 64-bit register, using between 2 and 4 movz/movk instructions (depending on the operand) Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-04-26arm64: kernel: perform relocation processing from ID mapArd Biesheuvel
Refactor the relocation processing so that the code executes from the ID map while accessing the relocation tables via the virtual mapping. This way, we can use literals containing virtual addresses as before, instead of having to use convoluted absolute expressions. For symmetry with the secondary code path, the relocation code and the subsequent jump to the virtual entry point are implemented in a function called __primary_switch(), and __mmap_switched() is renamed to __primary_switched(). Also, the call sequence in stext() is aligned with the one in secondary_startup(), by replacing the awkward 'adr_l lr' and 'b cpu_setup' sequence with a simple branch and link. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-04-26arm64: kernel: use literal for relocated address of __secondary_switchedArd Biesheuvel
We can simply use a relocated 64-bit literal to store the address of __secondary_switched(), and the relocation code will ensure that it holds the correct value at secondary entry time, as long as we make sure that the literal is not dereferenced until after we have enabled the MMU. So jump via a small __secondary_switch() function covered by the ID map that performs the literal load and branch-to-register. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-04-26arm64: kernel: don't export local symbols from head.SArd Biesheuvel
This unexports some symbols from head.S that are only used locally. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com>
2016-04-26Merge tag 'ox810se-arm-v4.6-rc3' of https://github.com/superna9999/linux ↵Arnd Bergmann
into next/soc Merge "ARM: Add OXNAS Platform Support" from Neil Armstrong This is for the ARM926 based ox810 chip used in some older NAS appliances. There is another related ox820 chip based on ARM11 that might get added here later. * tag 'ox810se-arm-v4.6-rc3' of https://github.com/superna9999/linux: MAINTAINERS: add maintainer entry for ARM/OXNAS platform ARM: Add new mach-oxnas irqchip: versatile-fpga: add new compatible for OX810SE SoC
2016-04-26Merge tag 'renesas-pci-defconfig-for-v4.7' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig Merge "Renesas ARM Based SoC Pci Defconfig Updates for v4.7" from Simon Horman: * Remove Gen2 designation from Kconfig for R-Car PCIE driver * tag 'renesas-pci-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: PCI: rcar-pcie: Remove Gen2 designation from Kconfig
2016-04-26Merge tag 'hi6220-config-for-4.7v3' of git://github.com/hisilicon/linux-hisi ↵Arnd Bergmann
into next/arm64 Merge "ARM64: Hi6220: configure updates for 4.7 based on rc3" from Wei Xu: - Enable Hi655x PMIC and regulator - Enable SPI_SPIDEV as module - Enable several common USB-Ethernet dongles - Enable configs for WLAN and TI WL1835 as modules - Enable ARM SP804 for ARCH_HISI * tag 'hi6220-config-for-4.7v3' of git://github.com/hisilicon/linux-hisi: arm64: Kconfig: select sp804 timer for ARCH_HISI arm64: defconfig: enable configs for WLAN and TI WL1835 as modules arm64: defconfig: enable several common USB network adapters arm64: defconfig: add CONFIG_SPI_SPIDEV as module arm64: defconfig: Enable the PMIC and regulator for Hi6220 and 96boards HiKey
2016-04-26ARM: debug: remove extraneous DEBUG_HI3716_UART optionArnd Bergmann
DEBUG_HI3716_UART was supposed to be renamed to DEBUG_HIX5HD2_UART, but accidentally both got left in place, which results in a build error when CONFIG_DEBUG_UART_PHYS is not set as it should be. This removes the old symbol. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 12aae3097454 ("ARM: debug: Rename Hi3716 to HIX5HD2") Acked-by: Wei Xu <xuwei5@hisilicon.com>
2016-04-26ARM: configs: add MPS2 defconfigVladimir Murzin
This patch adds a new config for MPS2 platform. Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
2016-04-26ARM: dts: introduce MPS2 AN399/AN400Vladimir Murzin
Application Notes 399 and 400 shares the same memory map and features. Both are shipped with Cortex-M7 and have the same peripheral as AN385/AN386, but with different location of PSRAM and Ethernet controller. Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
2016-04-26ARM: dts: introduce MPS2 AN385/AN386Vladimir Murzin
Application Notes 385 and 386 shares the same memory map and features except the CPU is used. AN385 is supplied with Cortex-M3 CPU and AN386 is supplied with Cortex-M4. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
2016-04-26ARM: vexpress/mps2: introduce MPS2 platformVladimir Murzin
The Cortex-M Prototyping System (or V2M-MPS2) is designed for prototyping and evaluation Cortex-M family of processors including the latest Cortex-M7 It comes with a range of useful peripherals including 8MB single cycle SRAM, 16MB PSRAM, Ethernet, QSVGA touch screen panel, 4bit RGB VGA connector, Audio, SPI and GPIO. Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
2016-04-26Merge tag 'renesas-fixes-for-v4.6' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt 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 This is a backmerge of v4.6 fixes, to avoid a merge conflict between 4.6 and our next/dt branch. * 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-26ARM: dts: at91: fix typo in sama5d2 PIN_PD24 descriptionFlorian Vallee
Fix a typo on PIN_PD24 for UTXD2 and FLEXCOM4_IO3 which were wrongly linked to PIN_PD23). Signed-off-by: Florian Vallee <fvallee@eukrea.fr> Fixes: 7f16cb676c00 ("ARM: at91/dt: add sama5d2 pinmux") Cc: stable@vger.kernel.org # v4.4+ [nicolas.ferre@atmel.com: add commit message, changed subject] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2016-04-26arm64: Kconfig: select sp804 timer for ARCH_HISILeo Yan
Select sp804 timer for ARCH_HISI, which is used as broadcast timer. Signed-off-by: Leo Yan <leo.yan@linaro.org> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2016-04-26arm64: defconfig: enable configs for WLAN and TI WL1835 as modulesGuodong Xu
This patch enables TI WL1835 and builds as module. It also enables CFG80211, MAC80211, RFKILL and several CRYPTOs which are required by WLAN. 96boards HiKey uses TI WLAN/BT combo module WL1835MOD. Signed-off-by: Guodong Xu <guodong.xu@linaro.org> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2016-04-26arm64: defconfig: enable several common USB network adaptersAkira Tsukamoto
The arm64 system is likely to be used as a host computer instead of embedded devices and adding USB-Ethernet dongles to make it behave as host PC is mandatory. Changelog: v2: Changed drivers to be as modules instead of built-in. Signed-off-by: Akira Tsukamoto <akira.tsukamoto@linaro.org> Signed-off-by: Guodong Xu <guodong.xu@linaro.org> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2016-04-26arm64: defconfig: add CONFIG_SPI_SPIDEV as moduleGuodong Xu
add CONFIG_SPI_SPIDEV as module, for arm64. Signed-off-by: Guodong Xu <guodong.xu@linaro.org> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2016-04-26arm64: defconfig: Enable the PMIC and regulator for Hi6220 and 96boards HiKeyGuodong Xu
This patch enables a number of devices currently supported by the Hi6220 and 96boards HiKey. These include a) Hi655x PMIC and regulator b) Hi6220 I2C, USB, MMC, mailbox, and reset c) CONFIG_PINCTRL_SINGLE, and CONFIG_LEDS_GPIO Since b) and c) are already in the 4.6-rc3, so kept a) only in this patch and updated subject as well. v2: - rebase to next-20160310, CONFIG_MMC_BLOCK_MINORS=16 is already in. - set CONFIG_I2C_DESIGNWARE_PLATFORM to be build as module Signed-off-by: Guodong Xu <guodong.xu@linaro.org> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
2016-04-26Merge tag 'renesas-rcar-sysc2-for-v4.7' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers Merge "Second Round of Renesas ARM Based SoC R-Car SYSC Updates for v4.7" from Simon Horman: Introduce a DT-based driver for the R-Car System Controller, as found on Renesas R-Car H1, R-Car Gen2, and R-Car Gen3 SoCs. * tag 'renesas-rcar-sysc2-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (30 commits) soc: renesas: rcar-sysc: Add support for R-Car H3 power areas soc: renesas: rcar-sysc: Add support for R-Car E2 power areas soc: renesas: rcar-sysc: Add support for R-Car M2-N power areas soc: renesas: rcar-sysc: Add support for R-Car M2-W power areas soc: renesas: rcar-sysc: Add support for R-Car H2 power areas soc: renesas: rcar-sysc: Add support for R-Car H1 power areas soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices soc: renesas: rcar-sysc: Make rcar_sysc_power_is_off() static soc: renesas: rcar-sysc: Add DT support for SYSC PM domains soc: renesas: rcar-sysc: Improve rcar_sysc_power() debug info soc: renesas: Move pm-rcar to drivers/soc/renesas/rcar-sysc clk: renesas: cpg-mssr: Export cpg_mssr_{at,de}tach_dev() clk: renesas: mstp: Provide dummy attach/detach_dev callbacks clk: renesas: Provide Kconfig symbols for CPG/MSSR and CPG/MSTP support soc: renesas: Add r8a7795 SYSC PM Domain Binding Definitions soc: renesas: Add r8a7794 SYSC PM Domain Binding Definitions soc: renesas: Add r8a7793 SYSC PM Domain Binding Definitions soc: renesas: Add r8a7791 SYSC PM Domain Binding Definitions soc: renesas: Add r8a7790 SYSC PM Domain Binding Definitions soc: renesas: Add r8a7779 SYSC PM Domain Binding Definitions ...
2016-04-26ARM: boot: dts: Add Western Digital My Book World Edition device treeNeil Armstrong
Add Western Digital My Book World Edition device tree based on Oxford Semiconductor OX810SE SoC. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
2016-04-26ARM: boot: dts: Add Oxford Semiconductor OX810SE dtsiNeil Armstrong
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
2016-04-26ARM: Add new mach-oxnasNeil Armstrong
Add mach-oxnas directory containing Kconfig. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
2016-04-26dts: hisi: update hns dst for separating dsaf dev supportYisen.Zhuang\(Zhuangyuzeng\)
Because debug dsaf port was separated from service dsaf port, this patch updates the related configurations of hns dts, changes it to match with the new binding files. This also removes enet nodes which don't exist in d02 board. Signed-off-by: Yisen Zhuang <yisen.zhuang@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2016-04-26arm64: dts: ls2080a: fsl-mc dt node updatesStuart Yoder
updates to the fsl-mc node for full functionality: -msi-parent is needed for interrupt support -ranges is needed to enable the bus driver to translate bus addresses -dpmac nodes provide a basis for relating dpmac objects to PHYs Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2016-04-26ARM: dts: imx6q-ba16: use wdog external resetAkshay Bhat
The BA16 module has a PMIC that uses the WDOG_B output from iMX6 to reset the system on a watchdog timeout. Configure the watchdog to assert the external reset signal (WDOG_B) using fsl,ext-reset-output property. Signed-off-by: Akshay Bhat <akshay.bhat@timesys.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2016-04-26ARM: dts: imx: b450/b650v3: Move ldb_di clk assignmentAkshay Bhat
Previously the LDB_DIx clocks could be specified in the ldb node. With the ERR009219 errata fix applied, the ldb_di clocks now needs to be specified in the clks node to ensure the clocks are setup early in the boot process. Signed-off-by: Akshay Bhat <akshay.bhat@timesys.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2016-04-26ARM: dts: imx6q-b850v3: Update display clock sourceAkshay Bhat
The default monitor that ships with B850v3 requires a 65MHz pixel clock. 65MHz can not be achieved using PLL3 (480MHz/7=68.5MHz). Hence set the LDB_DIx clock source to PLL5. Since PLL5 is already in use by IPU1_DIx, set the clock source for IPU1_DIx to PLL2_PFD2 to allow simultaneous display on both LVDS and HDMI interface. Signed-off-by: Akshay Bhat <akshay.bhat@timesys.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2016-04-26ARM: dts: imx6q-b850v3: Remove ldb panelAkshay Bhat
Remove ldb panel entry for the following reasons: - The b850v3 has an onboard LVDS to DisplayPort converter (STDP4028). So we should not limit the monitors that can be connected by hardcoding the auo,b133htn01 1080p panel. - The default resolution on the LVDS interface needs to be WXGA or less. Otherwise when a 1080p monitor is connected to the HDMI port there is no output on both the LVDS and HDMI ports since a single IPU on i.MX6 can not handle two 1080p displays. With the panel entry removed from the devicetree, drm driver defaults the resolution on LVDS interface to XGA. Once in userspace, applications can set the desired resolution on LVDS interface over IPU2 CRTC. Signed-off-by: Akshay Bhat <akshay.bhat@timesys.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2016-04-26Merge branch 'cpuidle/4.7' of ↵Rafael J. Wysocki
http://git.linaro.org/people/daniel.lezcano/linux into tmp Pull ARM cpuidle changes for v4.7 from Daniel Lezcano. * 'cpuidle/4.7' of http://git.linaro.org/people/daniel.lezcano/linux: drivers: firmware: psci: use const and __initconst for psci_cpuidle_ops soc: qcom: spm: Use const and __initconst for qcom_cpuidle_ops ARM: cpuidle: constify return value of arm_cpuidle_get_ops() ARM: cpuidle: add const qualifier to cpuidle_ops member in structures
2016-04-26arm64: dts: r8a7795: Don't disable referenced optional scif clockGeert Uytterhoeven
clk_get() on a disabled clock node will return -EPROBE_DEFER, which can cause drivers to be deferred forever if such clocks are referenced in their devices' clocks properties. Update the disabled external scif clock node so that it is not disabled to prevent this. Reported-by: Jürg Billeter <j@bitron.ch> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> [simon: fix for v4.6 extracted from a larger patch targeted at v4.7] Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2016-04-26Merge tag 'omap-for-v4.6/dt-ti81xx-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Enable dm814x and dra62x clock driver. This branch has a dependency to the clk-ti branch from the Linux clk tree for the ADPLL clock driver. Otherwise things won't keep booting properly when we flip over to use the clock driver instead of fixed clocks set up by the bootloader. * tag 'omap-for-v4.6/dt-ti81xx-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Add clocks for dm814x ADPLL Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-04-26ARM: uniphier: correct the call order of of_node_put()Masahiro Yamada
Put nodes after of_address_to_resource() in case the nodes might be released while parsing in them. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-04-26Merge tag 'renesas-soc-for-v4.7' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Merge "Renesas ARM Based SoC Updates for v4.7" from Simon Horman: Drop support for Cortex A8 in timer code * tag 'renesas-soc-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: timer: Drop support for Cortex A8 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-26Merge tag 'davinci-for-v4.7/soc' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc Merge "DaVinci SoC updates for v4.7" from Sekhar Nori: These are preparatory patches to support a USB PHY driver for USB on DA850 SoC. This should eventually lead to USB working again on this device. * tag 'davinci-for-v4.7/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: clk: add set_parent callback for mux clocks ARM: davinci: da8xx: move usb code to new file ARM: davinci: use IRQCHIP_DECLARE for cp_intc ARM: davinci: remove unused DA8XX_NUM_UARTS ARM: davinci: simplify call to of populate ARM: DaVinci USB: removed deprecated properties from MUSB config
2016-04-26Merge tag 'davinci-for-v4.7/cleanup' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/cleanup Merge "DaVinci cleanups for v4.7" from Sekhar Nori: It includes removal of some unused macros and data- -structures and use of helper macros to reduce code. * tag 'davinci-for-v4.7/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: use IRQCHIP_DECLARE for cp_intc ARM: davinci: remove unused DA8XX_NUM_UARTS ARM: davinci: simplify call to of populate ARM: DaVinci USB: removed deprecated properties from MUSB config
2016-04-25Merge tag 'arm-soc/for-4.7/drivers' of http://github.com/Broadcom/stblinux ↵Arnd Bergmann
into next/drivers Merge "Broadcom ARM-based SoCs drivers changes" from Florian Fainelli: - Justin adds a soc_dev driver to properly report to user-space the Broadcom STB SoC family, product and revision - Florian reworks how the brcmstb_gisb driver dependency is done to enable it on Broadcom STB MIPS-based SoCs and remove a select in arch/arm/mach-bcm/Kconfig * tag 'arm-soc/for-4.7/drivers' of http://github.com/Broadcom/stblinux: bus: brcmstb_gisb: Rework dependencies soc: brcmstb: add SoC driver to brcmstb
2016-04-25Merge tag 'tegra-for-4.7-soc' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers Merge "soc/tegra: Changes for v4.7-rc1" from Thierry Reding: This contains a bunch of preparatory patches to the PMC driver which are a prerequisite to moving the driver to generic power domains. * tag 'tegra-for-4.7-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: dt-bindings: Update NVIDIA PMC for Tegra soc/tegra: pmc: Wait for powergate state to change soc/tegra: pmc: Ensure GPU partition can be toggled on/off by PMC soc/tegra: pmc: Remove additional check for a valid partition soc/tegra: pmc: Fix verification of valid partitions soc/tegra: pmc: Fix testing of powergate state soc/tegra: pmc: Change powergate and rail IDs to be an unsigned type soc/tegra: pmc: Protect public functions from potential race conditions soc/tegra: pmc: Restore base address on probe failure soc/tegra: pmc: Remove non-existing L2 partition for Tegra124 soc/tegra: pmc: Remove non-existing power partitions for Tegra210 soc/tegra: pmc: Remove debugfs entry on probe failure soc/tegra: pmc: Fix sparse warning for tegra_pmc_init_tsense_reset() soc/tegra: pmc: Add missing structure members to kernel-doc
2016-04-25Merge tag 'versatile-flash-for-arm-soc' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/drivers Merge "move Versatile flash protection to the device tree" from Linus Walleij: This is a set of patches removing the board file code for Versatile flash handling and instead moving it over to the device tree and a special add-on file. * tag 'versatile-flash-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: integrator: move flash registration to device tree ARM: versatile: move flash registration to the device tree mtd: augment the "arm,versatile-flash" bindings mtd: physmap_of: add a hook for Versatile write protection Acked-by: Brian Norris <computersforpeace@gmail.com>
2016-04-25Merge tag 'keystone_dts_for_4.7' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt Merge "ARM: Keystone DTS for 4.7" from Santosh Shilimkar: - Remainder k2-* rename to keystone-* - PSCI node info - SPI alias nodes for bootloaders * tag 'keystone_dts_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: keystone: dts: add psci command definition ARM: dts: keystone: Add aliases for SPI nodes ARM: dts: k2*: Rename the k2* files to keystone-k2* files
2016-04-25Merge tag 'vexpress-for-v4.7/updates' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt Merge "ARMv7 Vexpress updates/fixes for v4.7" from Sudeep Holla: 1. Support for external expansion bus useful for additional hardware e.g. LogicTile Express daughterboards (Brian Starkey) 2. Fix for device node name unit-address presence/absence warnings enabled in recently update DTC (Sudeep Holla) * tag 'vexpress-for-v4.7/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: ARM: dts: vexpress: Add external expansion bus to DT ARM: dts: vexpress: fix node name unit-address presence warnings
2016-04-25Merge tag 'renesas-dt-for-v4.7' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Renesas ARM Based SoC DT Updates for v4.7" from Simon Horman: * Configure NMI key as wakeup source in DT of kzm9g board * Add SDHI support to DT of gose board * Add support of UHS-I SDR-50 for SDHI to DT of r8a7790 SoC * Correct interrupt type for ARM TWD in DT of r8a7779 and sh73a0 SoCs * Add IIC support to DT of r8a7794 SoC * Add CAN support to DT of r8a7793 and r8a7794 SoCs * Add SCIF2 support to r8a7790 device tree * Use CAN, JPU and USB3.0 fallback compatibility string in DT of r8a7791 and r8a7790 SoCs * tag 'renesas-dt-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (22 commits) ARM: dts: gose: Enable SDHI controllers ARM: dts: r8a7793: Add SDHI controllers ARM: dts: r8a7790: fix max-frequency for SDHI ARM: dts: kzm9g: Configure NMI key as wake-up source ARM: dts: r8a7790: lager: Enable UHS-I SDR-50 ARM: dts: r8a7790: Set maximum frequencies for SDHI clocks ARM: dts: r8a7791: Use USB3.0 fallback compatibility string ARM: dts: r8a7790: Use USB3.0 fallback compatibility string ARM: dts: r8a7779: Correct interrupt type for ARM TWD ARM: dts: sh73a0: Correct interrupt type for ARM TWD ARM: dts: r8a7794: Add IIC nodes ARM: dts: r8a7794: add IIC clocks ARM: dts: r8a7793: add CAN nodes to device tree ARM: dts: r8a7793: add CAN clocks to device tree ARM: dts: r8a7794: add CAN nodes to device tree ARM: dts: r8a7794: add CAN clocks to device tree ARM: dts: r8a7790: use fallback can compatibility string ARM: dts: r8a7791: use fallback can compatibility string ARM: dts: r8a7790: Add SCIF2 device node ARM: dts: r8a7790: Add SCIF2 clock ...
2016-04-25alpha/PCI: Call iomem_is_exclusive() for IORESOURCE_MEM, but not IORESOURCE_IOBjorn Helgaas
The alpha pci_mmap_resource() is used for both IORESOURCE_MEM and IORESOURCE_IO resources, but iomem_is_exclusive() is only applicable for IORESOURCE_MEM. Call iomem_is_exclusive() only for IORESOURCE_MEM resources, and do it earlier to match the generic version of pci_mmap_resource(). Fixes: 10a0ef39fbd1 ("PCI/alpha: pci sysfs resources") Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
2016-04-25arm64: dts: uniphier: add reference clock node for PH1-LD20Masahiro Yamada
Add a master clock node generated by a 25MHz crystal oscillator. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-04-25arm64: dts: uniphier: use Daughter board on PH1-LD20 reference boardMasahiro Yamada
Include the development base board, which is equipped with some devices such as EEPROM. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2016-04-25Merge tag 'arm-soc/for-4.7/devicetree-arm64' of ↵Arnd Bergmann
http://github.com/Broadcom/stblinux into next/dt64 Pull "Broadcom ARM64-based SoC Device Tree changes" from Florian Fainelli: - Anup enables a bunch of standard peripherals in the Northstar 2 DTS: PL330 DMA, GIC maintenance interrupt, PL022 SPI controller - Anup also re-orgnanizes the clock Device Tree fragments into a separate file for consistency with how other Broadcom SoCs are doing this - Luke switches the SMP enable-method and reboot from a spin-table + syscon to the standard PSCI 1.0 firmware interface * tag 'arm-soc/for-4.7/devicetree-arm64' of http://github.com/Broadcom/stblinux: arm64: dts: NS2 secondary core enablement via PSCI arm64: dts: Add ARM PL022 SPI DT nodes for NS2 arm64: dts: Move NS2 clock DT nodes to separate DT file arm64: dts: Add maintenance interrupt for GIC in NS2 DT arm64: dts: Add ARM PL330 DMA DT node for NS2
2016-04-25Merge tag 'xgene-dts-for-v4.7-part1' of ↵Arnd Bergmann
https://github.com/AppliedMicro/xgene-next into next/dt64 Merge "First part of X-Gene DTS changes queued for v4.7" from Duc Dang: This patch set only includes a single change to fix the compatible string for SATA controllers on X-Gene v2 SOC platforms. * tag 'xgene-dts-for-v4.7-part1' of https://github.com/AppliedMicro/xgene-next: arm64: dts: apm: Fix compatible string for X-Gene 2 SATA controller DTS node
2016-04-25Merge tag 'hi6220-dt-for-4.7' of git://github.com/hisilicon/linux-hisi into ↵Arnd Bergmann
next/dt64 Pull "ARM64: DT: Hisilicon Hi6220 soc and hikey board updates for 4.7" from Wei Xu - Reserve memory regions for Hi6220 - Add sp804 timer node for Hi6220 - Add cpu and cluster level's low power state for Hi6220 - Add gpio configuration nodes for Hi6220 - Add pinctrl configuration nodes for Hi6220 - Add spi related nodes for Hi6220 - Add i2c nodes for Hi6220 - Add i2c nodes to work with mezzanine boards - Add usb nodes for Hi6220 - Add mailobx node for Hi6220 - Add SRAM node and stub clock node for Hi6220 - Add pinctrl nodes for uarts and enable them - Add LED nodes for hi6220-hikey board - Add hi655x pmic node for Hi6220 - Add dwmmc nodes for Hi6220 - Add wifi nodes support for Hi6220-Hikey board - Register thermal sensor for Hi6220 - Register Hi6220's thermal zone for power allocator - Add L2 cache topology for Hi6220 * tag 'hi6220-dt-for-4.7' of git://github.com/hisilicon/linux-hisi: arm64: dts: Add L2 cache topology to Hi6220 arm64: dts: register Hi6220's thermal zone for power allocator arm64: dts: register Hi6220's thermal sensor arm64: dts: add wifi nodes support for hi6220-hikey arm64: dts: add dwmmc nodes for hi6220 arm64: dts: hikey: Add hi655x pmic dts node arm64: dts: add LED nodes for hi6220-hikey arm64: dts: hi6220: add pinctrl for uarts and enable them arm64: dts: add Hi6220's stub clock node arm64: dts: add mailbox node for Hi6220 arm64: dts: Add hi6220 usb node arm64: dts: hikey: enable i2c0 and i2c1 for working with mezzanine boards arm64: dts: add all hi6220 i2c nodes arm64: dts: add Hi6220 spi configuration nodes arm64: dts: add Hi6220 pinctrl configuration nodes arm64: dts: Add Hi6220 gpio configuration nodes arm64: dts: enable idle states for Hi6220 arm64: dts: add sp804 timer node for Hi6220 arm64: dts: Reserve memory regions for hi6220
2016-04-25Merge tag 'juno-for-v4.7/dt-updates' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt64 Pull "ARMv8 Juno DT updates for v4.7" from Sudeep Holla: Just one update: Support for external expansion bus useful for additional hardware e.g.LogicTile Express daughterboards (Brian Starkey) * tag 'juno-for-v4.7/dt-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: arm64: dts: juno: Add external expansion bus to DT
2016-04-25Merge tag 'tegra-for-4.7-arm64' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt64 Merge "arm64: tegra: Changes for v4.7-rc1" from Thierry Reding A couple of cleanups and fixes to various device trees, enable power and volume keys on Jetson TX1, use stdout-path to define the serial port (so it doesn't have to be specified on the kernel command-line) and add Google Pixel C (a.k.a. Smaug) support. * tag 'tegra-for-4.7-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: arm64: tegra: Enable cros-ec and charger on Smaug arm64: tegra: Add pinmux for Smaug board arm64: tegra: Add stdout-path for various boards arm64: tegra: Remove unused #power-domain-cells property arm64: tegra: Add gpio-keys nodes for Smaug arm64: tegra: Enable power and volume keys on Jetson TX1 arm64: tegra: Add support for Google Pixel C arm64: tegra: Replace legacy *,wakeup property with wakeup-source arm64: tegra: Fix copy/paste typo in several DTS includes arm64: tegra: Remove 0, prefix from unit-addresses