summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2015-12-12Merge tag 'berlin64-dt-for-4.5-1' of ↵Arnd Bergmann
git://git.infradead.org/users/hesselba/linux-berlin into next/dt64 Merge "Marvell Berlin64 DT changes (round 1)" from Sebastian Hesselbarth: - add pinctrl nodes and uart0 pinmux - add watchdog nodes - add PSCI-1.0 support - add cpuidle support * tag 'berlin64-dt-for-4.5-1' of git://git.infradead.org/users/hesselba/linux-berlin: arm64: dts: berlin4ct: support cpuidle-dt arm64: dts: berlin: PSCI-1.0 support arm64: dts: berlin4ct: add watchdog nodes arm64: dts: berlin4ct: add default pinmux for uart0 arm64: dts: berlin4ct: add the pinctrl node
2015-12-12Merge tag 'v4.5-rockchip-dts64-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64 Merge "rockchip dts64 changes for 4.5" from Heiko Stuebner: First round of 64bit devicetree changes for Rockchip socs. This includes support for the evaluation board of the rk3368 as well as the dts-part for the newly added thermal management support, rk3368 pwm nodes and an alias. * tag 'v4.5-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: add rk3368 evaluation board arm64: dts: rockchip: add the pwm node info for RK3368 SoCs arm64: dts: rockchip: Enable the Thermal on R88 board arm64: dts: rockchip: Add main thermal info to rk3368.dtsi arm64: dts: rockchip: Add the thermal data found on RK3368 arm64: dts: rockchip: Setup rk3368 ethernet0 alias for u-boot
2015-12-12Merge tag 'xgene-dts-for-v4.5-v1' of ↵Arnd Bergmann
https://github.com/AppliedMicro/xgene-next into next/dt64 Merge "DTS changes for X-Gene platforms queued for v4.5" from Duc Dang This patch set adds DTS entries to support various IPs for X-Gene v1 and X-Gene v2 SoC: - X-Gene v1: Enable support for MMC, USB, GPIO controllers, I2C controller, L2 Cache topology - X-Gene v2: Enable support for MMC, USB, GPIO controller, I2C controller (with RTC), PCIe controller with GICv2m MSI, EDAC, L2 Cache topology, TRNG * tag 'xgene-dts-for-v4.5-v1' of https://github.com/AppliedMicro/xgene-next: arm64: dts: Add L2 cache topology for APM X-Gene SoC arm64: dts: Add RTC DTS entry for X-Gene v2 SoC platform arm64: dts: Add Designware I2C controller DTS entries for X-Gene v2 SoC platform arm64: dts: Add Designware I2C controller DTS entries for X-Gene v1 SoC arm64: dts: Add APM X-Gene v2 SoC EDAC DTS entries arm64: dts: Add APM X-Gene v2 SoC Designware GPIO controller DTS entry arm64: dts: Add Designware GPIO dts binding for APM X-Gene v1 platform arm64: dts: Add APM X-Gene v2 SoC GFC GPIO controller DTS entry arm64: dts: Add APM X-Gene v1 SoC GFC GPIO controller DTS entries arm64: dts: Add USB nodes for APM X-Gene v2 platforms arm64: dts: Add USB nodes for APM X-Gene v1 platforms arm64: dts: Add PCIe node for APM X-Gene v2 platforms arm64: dts: Add v2m MSI frame nodes for APM X-Gene v2 platforms arm64: dts: Add RNG device tree nodes for APM X-Gene v2 platform arm64: dts: X-Gene: Do not reset or enable/disable clock for AHB block arm64: dts: Add the arasan mmc DTS entries for APm X-Gene v2 SoC arm64: dts: Add the arasan mmc DTS entries for APM X-Gene v1 SoC
2015-12-12Merge tag 'renesas-arm64-dt2-for-v4.5' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64 Merge "Second Round of Renesas ARM64 Based SoC DT Updates for v4.5" from Simon Horman: * Enable GPIO, EthernetAVB, I2C and Sound on r8a7795/salvator-x * tag 'renesas-arm64-dt2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: renesas: salvator-x: Sound DVC support arm64: renesas: salvator-x: Sound SRC support arm64: renesas: salvator-x: Sound SSI DMA support via BUSIF arm64: renesas: salvator-x: Sound SSI DMA support arm64: renesas: salvator-x: Sound SSI PIO support arm64: renesas: r8a7795: Sound DVC support arm64: renesas: r8a7795: Sound SRC support arm64: renesas: r8a7795: Sound SSI DMA support arm64: renesas: r8a7795: Sound SSI PIO support arm64: renesas: r8a7795: add AUDIO_DMAC support arm64: renesas: r8a7795 dtsi: Add all HSCIF nodes arm64: renesas: salvator-x: enable I2C arm64: renesas: r8a7795: add I2C support arm64: renesas: salvator-x: Setup ethernet0 alias for U-Boot arm64: dts: r8a7795: enable nfs root on Salvator-X board arm64: dts: r8a7795: enable EthernetAVB on Salvator-X arm64: dts: r8a7795: add EthernetAVB device node arm64: dts: r8a7795: add GPIO nodes
2015-12-12Merge tag 'renesas-arm64-dt-for-v4.5' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64 Merge "Renesas ARM64 Based SoC DT Updates for v4.5" from Simon Horman: * Initial support for Renesas ARM64 Based r8a7795 SoC and Salvator-X board * tag 'renesas-arm64-dt-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: MAINTAINERS: Add entry for Renesas arm64 architecture arm64: renesas: add Salvator-X board support arm64: renesas: r8a7795: enable PFC arm64: renesas: r8a7795: Add all SCIF nodes arm64: renesas: r8a7795: Add dummy dma-controller nodes arm64: renesas: r8a7795: Add Renesas R8A7795 SoC support
2015-12-12Merge tag 'omap-for-v4.5/dt-pt1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Merge "Device tree changes for omaps for v4.5 merge window" from Tony Lindgren: - Update all omaps to use pinctrl macros. This makes comparing the pinmux settings against the documentation much earlier. Javier compared the checksums of the generated dtb files to make sure nothing changed for the dtb files. - Updates for dm816x - Add GPMC DMA channels for am437x - Updates for LogicPD Torpedo - Basic support for CompuLab cm-t335 - Remove tps65217.dtsi file, we're better off adding SoC generic board dtsi files for the common features - Add support for ELM on am33xx - Add support for Bosch shc c3 board - Add qspi aliases for am437x and dra7 - Wake-up support for dra7-evm uart1 - Basic support for CompuLab sbc-t43 - Basic support for CompuLab cl-som-am57x - Use MMC pwrseq for libertas WLAN on igep0020 and igep0030 * tag 'omap-for-v4.5/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (97 commits) ARM: dts: omap3-igep0030: Use MMC pwrseq to init SDIO WiFi ARM: dts: omap3-igep0020: Use MMC pwrseq to init SDIO WiFi ARM: dts: am57xx: cl-som-am57x: skip resetting ETH PHYs ARM: dts: am57xx: sbc-am57x: add HDMI support ARM: dts: am57xx: compulab-sb-som: add HDMI connector ARM: dts: am57xx: sbc-am57x: add LCD support ARM: dts: am57xx: sbc-am57x: add GPIO expander support ARM: dts: am57xx: sbc-am57x: add EEPROM support ARM: dts: am57xx: sbc-am57x: add usb vbus pinmux ARM: dts: am57xx: cl-som-am57x: add MMC1 support ARM: dts: am57xx: sbc-am57x: add basic board support ARM: dts: am57xx: cl-som-am57x: add analog audio support ARM: dts: am57xx: cl-som-am57x: add touchscreen support ARM: dts: am57xx: cl-som-am57x: add USB support ARM: dts: am57xx: cl-som-am57x: add dual EMAC support ARM: dts: am57xx: cl-som-am57x: add spi-flash support ARM: dts: am57xx: cl-som-am57x: add eMMC support ARM: dts: am57xx: cl-som-am57x: add EEPROM support ARM: dts: am57xx: cl-som-am57x: add I2C3 support ARM: dts: am57xx: cl-som-am57x: dts: add RTC support ...
2015-12-12Merge tag 'mvebu-dt-4.5-2' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
Merge "mvebu dt for 4.5 (part 2)" from Gregory CLEMENT: - Fix Armada 388 GP dts - Add clock related to PMU for Dove - Add SolidRun Armada 388 Clearfog A1 dts * tag 'mvebu-dt-4.5-2' of git://git.infradead.org/linux-mvebu: ARM: dts: Add SolidRun Armada 388 Clearfog A1 DT file dt-bindings: add Marvell PMU documentation ARM: dts: dove: add Dove divider clocks dt-bindings: add Marvell core PLL and clock divider PMU documentation ARM: mvebu: remove duplicated regulator definition in Armada 388 GP
2015-12-12Merge tag 'mvebu-dt-4.5-1' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
Merge "mvebu dt for 4.5 (part 1)" from Gregory CLEMENT: Update partition handling for ix4-300d * tag 'mvebu-dt-4.5-1' of git://git.infradead.org/linux-mvebu: ARM: dt: mvebu: ix4-300d: Cleanup NAND partition ranges ARM: dt: mvebu: ix4-300d: move partitions to partition sub-node ARM: dt: mvebu: ix4-300d: remove whole flash partition
2015-12-12Merge tag 'berlin-dt-for-4.5-1' of ↵Arnd Bergmann
git://git.infradead.org/users/hesselba/linux-berlin into next/dt Merge "Marvell Berlin DT changes (round 1)" from Sebastian Hesselbarth: - BG2Q cleanups (DMP eMMC, duplicated interrupt-parents) - add BG2, BG2CD, BG2Q watchdog nodes - add BG2Q DMP SDHCI1 nodes * tag 'berlin-dt-for-4.5-1' of git://git.infradead.org/users/hesselba/linux-berlin: arm: dts: berlin2q-marvell-dmp: add sdhci1 fully functionality arm: dts: berlin2: add watchdog nodes arm: dts: berlin2cd: add watchdog nodes arm: dts: berlin2q: add watchdog nodes arm: dts: berlin2q: remove duplicated interrupt-parent arm: dts: berlin2q-marvell-dmp: remove broken-cd from eMMC node
2015-12-12Merge tag 'v4.5-rockchip-dts32-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Merge "rockchip dts32 changes for 4.5" from Heiko Stuebner: First round of arm devicetree changes. Among the bigger changes are two new Veyron boards, support for the dual-core cortex-a7 rk3036 soc and addition of support for the crypto engine of the rk3288. Smaller changes include some IR receivers, updates of thermal settings more reflecting real- life and testing-results. * tag 'v4.5-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add gpio-ir-receiver to the R89 board ARM: dts: rockchip: add touchscreen node to veyron minnie ARM: dts: rockchip: add veyron-mickey board ARM: dts: rockchip: add veyron-brain board ARM: dts: rockchip: make sure edp_24m is associated to xin24m on veyron ARM: dts: rockchip: override thermal settings on veyron-speedy ARM: dts: rockchip: update the thermal management on rk3288 ARM: dts: rockchip: Add Crypto node for rk3288 ARM: dts: rockchip: add rk3036-evb board ARM: dts: rockchip: add core rk3036 dtsi clk: rockchip: add dt-binding header for rk3036 clk: rockchip: add an id for rk3288 crypto clk ARM: dts: rockchip: Add IR receiver to RK3288 Radxa Rock 2 Square ARM: dts: rockchip: add channels properties for i2s ARM: dts: rockchip: set system-power-controller property on rk3288-rock2 ARM: dts: rockchip: Setup rk3066/rk3188 ethernet0 alias for u-boot ARM: dts: rockchip: Setup rk3288 ethernet0 alias for u-boot
2015-12-12ARM: dts: uniphier: factor out common nodes to uniphier-common32.dtsiMasahiro Yamada
UniPhier SoCs (except PH1-sLD3) have several nodes in common. Factor out them into uniphier-common32.dtsi. This improves the code maintainability. PH1-sLD3 is so old that it has more or less different register maps than the others. So, it cannot be included in this refactoring. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-12ARM: dts: uniphier: change IRQ number of UART3 of PH1-Pro4 SoCMasahiro Yamada
The UART3 is assigned with IRQ 29 for old SoCs, IRQ 177 for new ones, and PH1-Pro4 is on the boundary. PH1-sLD3: UART3 is unavailable PH1-LD4, PH1-sLD8: only IRQ 29 is supported PH1-Pro4: both IRQ 29 and 177 are supported PH1-Pro5, ProXstream2, PH1-LD6b: only IRQ 177 is supported This SoC can choose either IRQ 29 or IRQ 177, but the former is shared with another hardware (low speed serial0). The latter is dedicated for this hardware and more recommended. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-12-12Merge tag 'ux500-dt-for-arm-soc' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt Merge "Device Tree changes for Ux500" from Linus Walleij: - Push the Rohm touchscreen to the STUIB, as the TVK UIB has a Synaptics RMI4 touchscreen. - Set up the right sensor IRQs for the Snowball, so that periodic data ready-IRQ capture starts working. - Use wakeup-source consequently. - Remove legacy regulator-compatible strings. - Define the sensors on the HREFP TVK board properly. * tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: configure the sensors on the TVK board correctly ARM: u300: remove regulator-compatible usage ARM: ux500: remove regulator-compatible usage ARM: ux500: replace legacy *,wakeup property with wakeup-source ARM: ux500: Assign proper sensor IRQs for Snowball ARM: ux500: push down Rohm TS to STUIB
2015-12-12Merge tag 'renesas-cleanup-for-v4.5' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup Merge "Renesas ARM Based SoC Cleanup for v4.5" from Simon Horman: * Remove now unnecessary header * Introduce ARCH_RENESAS * Remove unmaintened URL from MAINTAINERS * tag 'renesas-cleanup-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Remove legacy mach/irqs.h ARM: shmobile: Introduce ARCH_RENESAS MAINTAINERS: Remove link to oss.renesas.com which is closed
2015-12-12Merge tag 'renesas-dt2-for-v4.5' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Second Round of Renesas ARM Based SoC DT Updates for v4.5" from Simon Horman: * sh73a0, r8a7740: Add L2 cache-controller node * r8a7791, r8a7794: remove deprecated #gpio-range-cells * r8a7793: Add DU support and enable for VGA port * r8a7790: switch console back to scif0 * alt: Correct ether and scif2 pinmux * koelsch: Correct hdmi pinmux * silk, lager, porter, bockw: Move SPI FLASH partitions to subnode * bockw: Add schi0 pinmux * tag 'renesas-dt2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: sh73a0 dtsi: Add L2 cache-controller node ARM: shmobile: r8a7740 dtsi: Add L2 cache-controller node ARM: shmobile: alt: Correct ether pfc ARM: shmobile: alt: Correct scif2 pfc ARM: shmobile: silk: Move SPI FLASH partitions to subnode ARM: shmobile: lager: Move SPI FLASH partitions to subnode ARM: shmobile: porter: Move SPI FLASH partitions to subnode ARM: shmobile: bockw: Move SPI FLASH partition to subnode ARM: shmobile: r8a7791: koelsch: Fix pinmux for HDMI ARM: shmobile: r8a7794: remove deprecated #gpio-range-cells from dtsi ARM: shmobile: r8a7791: remove deprecated #gpio-range-cells from dtsi ARM: shmobile: r8a7793: Add DU node to device tree ARM: shmobile: r8a7794: alt: Enable PFC DU for the VGA port ARM: shmobile: bockw dts: define sdhi0 pins with pull-ups ARM: shmobile: r8a7790: switch console back to scif0
2015-12-12ARM: dts: rockchip: Fix typo in rk3288 sdmmc card detect pin nameMatthias Brugger
The card detect pin is currently called sdmcc-cd. This patch fixes the typo and renames the pin to sdmmc-cd. Signed-off-by: Matthias Brugger <mbrugger@suse.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-11arm64: mm: ensure that the zero page is visible to the page table walkerWill Deacon
In paging_init, we allocate the zero page, memset it to zero and then point TTBR0 to it in order to avoid speculative fetches through the identity mapping. In order to guarantee that the freshly zeroed page is indeed visible to the page table walker, we need to execute a dsb instruction prior to writing the TTBR. Cc: <stable@vger.kernel.org> # v3.14+, for older kernels need to drop the 'ishst' Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-12-11arm64: mm: place __cpu_setup in .textMark Rutland
We drop __cpu_setup in .text.init, which ends up being part of .text. The .text.init section was a legacy section name which has been unused elsewhere for a long time. The ".text.init" name is misleading if read as a synonym for ".init.text". Any CPU may execute __cpu_setup before turning the MMU on, so it should simply live in .text. Remove the pointless section assignment. This will leave __cpu_setup in the .text section. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
2015-12-11EDAC, mpc85xx: Make mpc85xx-pci-edac a platform deviceScott Wood
Originally the mpc85xx-pci-edac driver bound directly to the PCI controller node. Commit 905e75c46dba ("powerpc/fsl-pci: Unify pci/pcie initialization code") turned the PCI controller code into a platform device. Since we can't have two drivers binding to the same device, the EDAC code was changed to be called into as a library-style submodule. However, this doesn't work if the EDAC driver is built as a module. Commit 8d8fcba6d1ea ("EDAC: Rip out the edac_subsys reference counting") exposed another problem with this approach -- mpc85xx_pci_err_probe() was being called in the same early boot phase that the PCI controller is initialized, rather than in the device_initcall phase that the EDAC layer expects. This caused a crash on boot. To fix this, the PCI controller code now creates a child platform device specifically for EDAC, which the mpc85xx-pci-edac driver binds to. Reported-by: Michael Ellerman <mpe@ellerman.id.au> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Scott Wood <scottwood@freescale.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Daniel Axtens <dja@axtens.net> Cc: Doug Thompson <dougthompson@xmission.com> Cc: Jia Hongtao <B38951@freescale.com> Cc: Jiri Kosina <jkosina@suse.com> Cc: Kim Phillips <kim.phillips@freescale.com> Cc: linux-edac <linux-edac@vger.kernel.org> Cc: linuxppc-dev@lists.ozlabs.org Cc: Masanari Iida <standby24x7@gmail.com> Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Rob Herring <robh@kernel.org> Link: http://lkml.kernel.org/r/1449774432-18593-1-git-send-email-scottwood@freescale.com Signed-off-by: Borislav Petkov <bp@suse.de>
2015-12-11arm64: Improve error reporting on set_pte_at() checksCatalin Marinas
Currently the BUG_ON() checks do not give enough information about the PTEs being set. This patch changes BUG_ON to WARN_ONCE and dumps the values of the old and new PTEs. In addition, the checks are only made if the new PTE entry is valid. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Reported-by: Ming Lei <tom.leiming@gmail.com> Cc: Will Deacon <will.deacon@arm.com>
2015-12-11arm64: dts: rockchip: Fix typo in rk3368 sdmmc card detect pin nameMatthias Brugger
The card detect pin is currently called sdmcc-cd. This patch fixes the typo and renames the pin to sdmmc-cd. Signed-off-by: Matthias Brugger <mbrugger@suse.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-11ARM: dts: vf610: use reset values for L2 cache latenciesStefan Agner
Linux on Vybrid used several different L2 latencies so far, none of them seem to be the right ones. According to the application note AN4947 ("Understanding Vybrid Architecture"), the tag portion runs on CPU clock and is inside the L2 cache controller, whereas the data portion is stored in the external SRAM running on platform clock. Hence it is likely that the correct value requires a higher data latency then tag latency. These are the values which have been used so far: - The mainline values: arm,data-latency = <1 1 1>; arm,tag-latency = <2 2 2>; Those values have lead to problems on higher clocks. They look like a poor translation from the reset values (missing +1 offset and a mix up between tag/latency values). - The Linux 3.0 (SoC vendor BSP) values (converted to DT notation): arm,data-latency = <4 2 3> arm,tag-latency = <4 2 3> The cache initialization function along with the value matches the i.MX6 code from the same kernel, so it seems that those values have just been copied. - The Colibri values: arm,data-latency = <2 1 2>; arm,tag-latency = <3 2 3>; Those were a mix between the values of the Linux 3.0 based BSP and the mainline values above. - The SoC Reset values (converted to DT notation): arm,data-latency = <3 3 3>; arm,tag-latency = <2 2 2>; So far there is no official statement on what the correct values are. See also the related Freescale community thread: https://community.freescale.com/message/579785#579785 For now, the reset values seem to be the best bet. Remove all other "bogus" values and use the reset value on vf610.dtsi level. Signed-off-by: Stefan Agner <stefan@agner.ch> Cc: <stable@vger.kernel.org> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2015-12-11arm64: dts: rockchip: correct voltage range for rk3368-evb-act8846 boardCaesar Wang
In general, the logic voltage is affected by ddr frequency factors. We should fix the correct voltage range since assuemd that we have the ddr frequency driver in mainline. AFAIK, the 1.8v voltage is used by the SD3.0 card. Signed-off-by: Caesar Wang <wxt@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-11ARM: dts: rockchip: fix voltage ranges for rk3288-evb-act8846 boardCaesar Wang
In general, the logic voltage is affected by ddr frequency factors. We should fix the correct voltage range since assuemd that we have the ddr frequency driver in mainline in the future. AFAIK, the 1.8v voltage is used by the SD3.0 card. Signed-off-by: Caesar Wang <wxt@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-11ARM: dts: rockchip: move the public part to rk3288-evb commonChris Zhong
Rk3288-evb-act8846 and rk3288-evb-rk808 are the power boards of rk3288-evb, they provide the same power supply interface to the motherboard. Sort out them, put the public part to rk3288-evb.dtsi, such as gmac and cpu-supply, leaving only the power section. Signed-off-by: Chris Zhong <zyw@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-11ARM: dts: rockchip: add 2 regulators for rk3288-evb-act8846Chris Zhong
vcc_wl and vcc_lcd are 2 gpio switches for rk3288-evb-act8846 board. Signed-off-by: Chris Zhong <zyw@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-11ARM: dts: rockchip: correct the name of REG8 for rk3288-evb-act8846Chris Zhong
According to the schematic, the name of REG8 should be vcc_tp, rather than vcca_tp. Signed-off-by: Chris Zhong <zyw@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-12-11Merge branch 'kvm-ppc-fixes' of ↵Paolo Bonzini
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master
2015-12-11kvm: x86: move tracepoints outside extended quiescent statePaolo Bonzini
Invoking tracepoints within kvm_guest_enter/kvm_guest_exit causes a lockdep splat. Reported-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2015-12-11ARM: dts: sun7i: Olimex A20-SOM-EVB: Enable mmc3 (baseboard SD socket)Karsten Merker
The Olimex A20-SOM-EVB is an evaluation board for the Olimex A20-SOM system-on-module. The baseboard provides a full-size SD socket (connected to mmc3) in addition to the micro-SD socket on the SOM itself (which is connected to mmc0). Enable the mmc3 controller in the dts. Signed-off-by: Karsten Merker <merker@debian.org> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-11ARM: dts: sun7i: Olimex A20-SOM-EVB: Add LRADC keysKarsten Merker
The Olimex A20-SOM-EVB is an evaluation board for the Olimex A20-SOM system-on-module. It provides a set of android-style buttons (labeled "VOL+", "VOL-", "MENU", "SEARCH", "HOME", "ESC" and "ENTER") which are connected to a low-resolution ADC via a resistor network. This patch adds appropriate button definitions to the board dts. The voltages assigned to the keys are specified in the board schematics published by the manufacturer. Signed-off-by: Karsten Merker <merker@debian.org> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-12-11x86/platform/uv: Include clocksource.h for clocksource_touch_watchdog()Ingo Molnar
This build failure triggers on 64-bit allmodconfig: arch/x86/platform/uv/uv_nmi.c:493:2: error: implicit declaration of function ‘clocksource_touch_watchdog’ [-Werror=implicit-function-declaration] which is caused by recent changes exposing a missing clocksource.h include in uv_nmi.c: cc1e24fdb064 x86/vdso: Remove pvclock fixmap machinery this file got clocksource.h indirectly via fixmap.h - that stealth route of header inclusion is now gone. Cc: Borislav Petkov <bp@alien8.de> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-12-11x86/vdso: Enable vdso pvclock access on all vdso variantsAndy Lutomirski
Now that pvclock doesn't require access to the fixmap, all vdso variants can use it. The kernel side isn't wired up for 32-bit kernels yet, but this covers 32-bit and x32 userspace on 64-bit kernels. Signed-off-by: Andy Lutomirski <luto@kernel.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/a7ef693b7a4c88dd2173dc1d4bf6bc27023626eb.1449702533.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-12-11x86/vdso: Remove pvclock fixmap machineryAndy Lutomirski
Signed-off-by: Andy Lutomirski <luto@kernel.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/4933029991103ae44672c82b97a20035f5c1fe4f.1449702533.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-12-11x86/vdso: Get pvclock data from the vvar VMA instead of the fixmapAndy Lutomirski
Signed-off-by: Andy Lutomirski <luto@kernel.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/9d37826fdc7e2d2809efe31d5345f97186859284.1449702533.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-12-11x86, vdso, pvclock: Simplify and speed up the vdso pvclock readerAndy Lutomirski
The pvclock vdso code was too abstracted to understand easily and excessively paranoid. Simplify it for a huge speedup. This opens the door for additional simplifications, as the vdso no longer accesses the pvti for any vcpu other than vcpu 0. Before, vclock_gettime using kvm-clock took about 45ns on my machine. With this change, it takes 29ns, which is almost as fast as the pure TSC implementation. Signed-off-by: Andy Lutomirski <luto@amacapital.net> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/6b51dcc41f1b101f963945c5ec7093d72bdac429.1449702533.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-12-11x86/kvm: On KVM re-enable (e.g. after suspend), update clocksAndy Lutomirski
This gets rid of the "did TSC go backwards" logic and just updates all clocks. It should work better (no more disabling of fast timing) and more reliably (all of the clocks are actually updated). Signed-off-by: Andy Lutomirski <luto@kernel.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/861716d768a1da6d1fd257b7972f8df13baf7f85.1449702533.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-12-10Merge branches 'pci/aspm', 'pci/hotplug', 'pci/misc' and 'pci/msi' into nextBjorn Helgaas
* pci/aspm: PCI/ASPM: Make sysfs link_state_store() consistent with link_state_show() * pci/hotplug: PCI: pciehp: Always protect pciehp_disable_slot() with hotplug mutex * pci/misc: x86/PCI: Simplify pci_bios_{read,write} PCI: Simplify config space size computation PCI: Limit config space size for Netronome NFP6000 family PCI: Add Netronome vendor and device IDs PCI: Support PCIe devices with short cfg_size x86/PCI: Clarify AMD Fam10h config access restrictions comment PCI: Print warnings for all invalid expansion ROM headers PCI: Check for PCI_HEADER_TYPE_BRIDGE equality, not bitmask * pci/msi: PCI/MSI: Remove empty pci_msi_init_pci_dev() PCI/MSI: Initialize MSI capability for all architectures
2015-12-10x86/PCI: Simplify pci_bios_{read,write}Geliang Tang
There is some repetitive code in the switch/case statements in pci_bios_read() and pci_bios_write(). Factor out the BIOS function IDs and the result widths to simplify the code. Signed-off-by: Geliang Tang <geliangtang@163.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
2015-12-10x86/PCI: Clarify AMD Fam10h config access restrictions commentTomasz Nowicki
Clarify the comment about AMD Fam10h config access restrictions, fix typos, and add a reference to the specification. [bhelgaas: streamline] Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
2015-12-10PCI: Check for PCI_HEADER_TYPE_BRIDGE equality, not bitmaskBjorn Helgaas
Bit 7 of the "Header Type" register indicates a multi-function device when set. Bits 0-6 contain encoded values, where 0x1 indicates a PCI-PCI bridge. It is incorrect to test this as though it were a mask. For example, while the PCI 3.0 spec only defines values 0x0, 0x1, and 0x2, it's conceivable that a future spec could define 0x3 to mean something else; then tests for "(hdr_type & 0x7f) & PCI_HEADER_TYPE_BRIDGE" would incorrectly succeed for this new 0x3 header type. Test bits 0-6 of the Header Type for equality with PCI_HEADER_TYPE_BRIDGE. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2015-12-11ARM: shmobile: r8a7793: Describe DMA for the serial portsSimon Horman
Add DMA properties to all SCIF, SCIFA, SCIFB, and HSCIF device nodes. Based on similar work for the r8a7791 by Geert Uytterhoeven. Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
2015-12-11ARM: shmobile: defconfig: Enable frame buffer console for armadillo800evaGeert Uytterhoeven
Enabling the frame buffer device on armadillo800eva requires the board staging code. Also enable the frame buffer, so you will actually see output during boot. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-11ARM: shmobile: defconfig: Enable missing support based on DTSesGeert Uytterhoeven
Enable all missing support, extracted from the various Renesas ARM DTSes using linux-config-from-dt. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-11ARM: shmobile: defconfig: Drop useless CONFIG_USB_RCAR_PHY=yGeert Uytterhoeven
The Renesas R-Car (Gen1) USB PHY driver (which is being removed) does not support DT, and is thus useless in a Renesas ARM multi-platform kernel. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2015-12-11Merge tag 'omap-for-v4.4/fixes-rc4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Merge "omap fixes against v4.4-rc4" from Tony Lindgren Few fixes for omaps for v4.4-rc cycle: - Fix clock source for ARM TWD and global timers on am437x - Always select REGULATOR_FIXED_VOLTAGE for omap2+ instead of when MACH_OMAP3_PANDORA is selected - Fix SPI DMA handles for dm816x as only some were mapped - Fix up mbox cells for dm816x to make mailbox usable * tag 'omap-for-v4.4/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am4372: fix clock source for arm twd and global timers ARM: OMAP2+: enable REGULATOR_FIXED_VOLTAGE ARM: dts: add dm816x missing spi DT dma handles ARM: dts: add dm816x missing #mbox-cells
2015-12-11ARM: pxa: use PWM lookup table for all machinesArnd Bergmann
The recent change to use a pwm lookup table for the ezx machines was incomplete and only changed the a780 model, but not the other ones in the same file. This adds the missing calls to pwm_add_table(). Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: c3322022897c ("ARM: pxa: ezx: Use PWM lookup table") Acked-by: Thierry Reding <thierry.reding@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
2015-12-11Merge tag 'berlin-fixes-for-4.4-rc1-1' of ↵Arnd Bergmann
git://git.infradead.org/users/hesselba/linux-berlin into fixes Merge "Marvell Berlin fixes for 4.4-rc1 (round 1)" from Sebastian Hesselbarth: - fix wrong SDIO DT clocks on BG2Q * tag 'berlin-fixes-for-4.4-rc1-1' of git://git.infradead.org/users/hesselba/linux-berlin: ARM: dts: berlin: add 2nd clock for BG2Q sdhci0 and sdhci1 ARM: dts: berlin: correct BG2Q's sdhci2 2nd clock
2015-12-11Merge tag 'at91-4.4-fixes-2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into fixes Merge "Second fixes for 4.4" from Alexandre Belloni: - fix of a hardware setup that prevents the sd/mmc interface to show up on sama5d2. - proper selection of pinctrl drivers. PIO4 is necessary for the sama5d2 to boot. * tag 'at91-4.4-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: at91: fix pinctrl driver selection ARM: at91/dt: add always-on to 1.8V regulator
2015-12-11Merge tag 'samsung-fixes-4.4' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into fixes Merge "Fixes for Exynos" from Krzysztof Kozlowski: 1. Fix potential NULL pointer dereference in Exynos PMU driver. 2. Remove incorrect __init annotation from s3c24xx cpufreq driver structures. * tag 'samsung-fixes-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: cpufreq: s3c24xx: Do not mark s3c2410_plls_add as __init ARM: EXYNOS: Fix potential NULL pointer access in exynos_sys_powerdown_conf