summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2017-06-21ARM: owl: Implement CPU enable-method for S500Andreas Färber
Allow to bring up CPU1. Based on LeMaker linux-actions tree. Signed-off-by: Andreas Färber <afaerber@suse.de>
2017-06-21ARM: Prepare Actions Semi S500Andreas Färber
Add ARCH_ACTIONS and mach-actions/owl.c for "actions,s500". Signed-off-by: Andreas Färber <afaerber@suse.de>
2017-06-21ARM: socfpga: Increase max number of GPIOsMarek Vasut
Increase the maximum number of GPIOs on SoCFPGA as this platform can have many GPIO controllers in the FPGA part. Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
2017-06-21ARM: pxa: Use - instead of @ for DT OPP entriesViresh Kumar
Compiling the DT file with W=1, DTC warns like follows: Warning (unit_address_vs_reg): Node /opp_table0/opp@1000000000 has a unit name, but no reg property Fix this by replacing '@' with '-' as the OPP nodes will never have a "reg" property. Reported-by: Krzysztof Kozlowski <krzk@kernel.org> Reported-by: Masahiro Yamada <yamada.masahiro@socionext.com> Suggested-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
2017-06-21ARM: 8683/1: ARM32: Support mremap() for sigpage/vDSODmitry Safonov
CRIU restores application mappings on the same place where they were before Checkpoint. That means, that we need to move vDSO and sigpage during restore on exactly the same place where they were before C/R. Make mremap() code update mm->context.{sigpage,vdso} pointers during VMA move. Sigpage is used for landing after handling a signal - if the pointer is not updated during moving, the application might crash on any signal after mremap(). vDSO pointer on ARM32 is used only for setting auxv at this moment, update it during mremap() in case of future usage. Without those updates, current work of CRIU on ARM32 is not reliable. Historically, we error Checkpointing if we find vDSO page on ARM32 and suggest user to disable CONFIG_VDSO. But that's not correct - it goes from x86 where signal processing is ended in vDSO blob. For arm32 it's sigpage, which is not disabled with `CONFIG_VDSO=n'. Looks like C/R was working by luck - because userspace on ARM32 at this moment always sets SA_RESTORER. Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com> Acked-by: Andy Lutomirski <luto@amacapital.net> Cc: linux-arm-kernel@lists.infradead.org Cc: Will Deacon <will.deacon@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Cyrill Gorcunov <gorcunov@openvz.org> Cc: Pavel Emelyanov <xemul@virtuozzo.com> Cc: Christopher Covington <cov@codeaurora.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
2017-06-21Merge branch 'timers/urgent' into timers/coreThomas Gleixner
Pick up dependent changes.
2017-06-20Merge branch 'WIP.sched/core' into sched/coreIngo Molnar
Conflicts: kernel/sched/Makefile Pick up the waitqueue related renames - it didn't get much feedback, so it appears to be uncontroversial. Famous last words? ;-) Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-06-20ARM/hw_breakpoint: Fix possible recursive locking for arch_hw_breakpoint_initTony Lindgren
Recent change to use cpuhp_setup_state_cpuslocked() with commit fe2a5cd8aa03 ("ARM/hw_breakpoint: Use cpuhp_setup_state_cpuslocked()") missed to change the related paired cpuhp_remove_state_nocalls_cpuslocked(). Now if arch_hw_breakpoint_init() fails, we get "WARNING: possible recursive locking detected" on the exit path. Fixes: fe2a5cd8aa03 ("ARM/hw_breakpoint: Use cpuhp_setup_state_cpuslocked()") Signed-off-by: Tony Lindgren <tony@atomide.com> Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Mark Rutland <mark.rutland@arm.com> Cc: linux-omap@vger.kernel.org Cc: Peter Zijlstra <peterz@infradead.org> Cc: Will Deacon <will.deacon@arm.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Russell King <linux@armlinux.org.uk> Cc: "Paul E . McKenney" <paulmck@linux.vnet.ibm.com> Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/20170616082238.15553-1-tony@atomide.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2017-06-20xen-swiotlb: consolidate xen_swiotlb_dma_opsChristoph Hellwig
ARM and x86 had duplicated versions of the dma_ops structure, the only difference is that x86 hasn't wired up the set_dma_mask, mmap, and get_sgtable ops yet. On x86 all of them are identical to the generic version, so they aren't needed but harmless. All the symbols used only for xen_swiotlb_dma_ops can now be marked static as well. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
2017-06-20ARM: dts: omap3-overo: Remove "vqmmc-supply" property from MMC dt nodeKishon Vijay Abraham I
commit 94647a30124e2c7 ("ARM: dts: omap3-overo: Enable WiFi/BT combo") while enabling WiFi/BT combo added regulator to trigger the nReset signal of the Bluetooth module in vqmmc-supply. However BT should be handled by UART. Moreover "vqmmc" is not a defined binding for omap_hsmmc. While "vqmmc" in mmc2 hasn't caused any issues so far, mmc2 will start to mis-behave once omap_hsmmc defines "vqmmc" binding. Remove "vqmmc-supply" property in mmc2 here. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
2017-06-20ARM: OMAP2+: DMA: Add slave map entries for 24xx external request linesPeter Ujfalusi
The external request lines are used by tusb6010 on OMAP24xx platforms. Update the map so the driver can use dmaengine API to request the DMA channel. At the same time add temporary map containing only the external DMA request numbers for DT booted case on omap24xx since the tusb6010 stack is not yet supports DT boot. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Bin Liu <b-liu@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-06-19ARM: dts: owl-s500: Add SPS nodeAndreas Färber
Add Smart Power System node for PM domains. Signed-off-by: Andreas Färber <afaerber@suse.de>
2017-06-19ARM: dts: owl-s500: Set CPU enable-methodAndreas Färber
Use a custom S500 enable-method for all CPUs. Signed-off-by: Andreas Färber <afaerber@suse.de>
2017-06-19ARM: dts: dra7: Add "max-frequency" property to MMC dt nodesKishon Vijay Abraham I
Add "max-frequency" property to MMC dt nodes and set the maximum frequency to 192MHz for MMC1/MMC2, 64MHz for MMC3 and 192MHz for MMC4. pdata quirks must be utilized to detect presence of rev 1.1/1.0 of silicon and adjust maximum frequencies as per restrictions documented in i843. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-06-19ARM: dts: dra7-evm: Correct the vmmc-supply for mmc2Ravikumar Kattekola
On DRA75x EVM, MMC2 vdd/ios are connected to a common supply fixed at 1.8V not 3.3V Fixes: 6cf02dbb4b71 ("ARM: dts: dra7-evm: Add mmc2 node for eMMC support") Signed-off-by: Ravikumar Kattekola <rk@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-06-19ARM: dts: am57xx-beagle-x15-revb1: Fix supply name used for MMC1 IO linesKishon Vijay Abraham I
The dt binding documentation of omap-hsmmc recommends using "vmmc_aux" for IO supply lines. However commit 0af28cc92690d8c ("ARM: dts: am57xx-beagle-x15: Add support for rev B1") added it as "vmmc-aux". Now that anyways it needs to be fixed, use the generic "vqmmc" binding instead of the deprecated "vmmc_aux". Fixes: commit 0af28cc92690d8c ("ARM: dts: am57xx-beagle-x15: Add support for rev B1") Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-06-19ARM: dts: dra72-evm-revc: Add vqmmc supply to mmc1Kishon Vijay Abraham I
Add vqmmc-supply property to mmc1 dt node and populate it with ldo1_reg to reflect ldo1_out is connected to mmc1 IO lines. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-06-19ARM: dts: dra72-evm: Add vqmmc supply to mmc1Kishon Vijay Abraham I
Add vqmmc-supply property to mmc1 dt node and populate it with ldo1_reg to reflect ldo1_out is connected to mmc1 IO lines. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-06-19ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2Kishon Vijay Abraham I
On dra72/dra71 evms, mmc2 vdd/ios are connected to a common 1.8V supply not 3.3V. Also the regulator that supplies 1.8V is different on dra71-evm so move the supply property from common dtsi to evm specific dts files. Fixes: a4240d3af677 ("ARM: dts: Add support for dra72-evm rev C (SR2.0)") Signed-off-by: Ravikumar Kattekola <rk@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2017-06-19mm: larger stack guard gap, between vmasHugh Dickins
Stack guard page is a useful feature to reduce a risk of stack smashing into a different mapping. We have been using a single page gap which is sufficient to prevent having stack adjacent to a different mapping. But this seems to be insufficient in the light of the stack usage in userspace. E.g. glibc uses as large as 64kB alloca() in many commonly used functions. Others use constructs liks gid_t buffer[NGROUPS_MAX] which is 256kB or stack strings with MAX_ARG_STRLEN. This will become especially dangerous for suid binaries and the default no limit for the stack size limit because those applications can be tricked to consume a large portion of the stack and a single glibc call could jump over the guard page. These attacks are not theoretical, unfortunatelly. Make those attacks less probable by increasing the stack guard gap to 1MB (on systems with 4k pages; but make it depend on the page size because systems with larger base pages might cap stack allocations in the PAGE_SIZE units) which should cover larger alloca() and VLA stack allocations. It is obviously not a full fix because the problem is somehow inherent, but it should reduce attack space a lot. One could argue that the gap size should be configurable from userspace, but that can be done later when somebody finds that the new 1MB is wrong for some special case applications. For now, add a kernel command line option (stack_guard_gap) to specify the stack gap size (in page units). Implementation wise, first delete all the old code for stack guard page: because although we could get away with accounting one extra page in a stack vma, accounting a larger gap can break userspace - case in point, a program run with "ulimit -S -v 20000" failed when the 1MB gap was counted for RLIMIT_AS; similar problems could come with RLIMIT_MLOCK and strict non-overcommit mode. Instead of keeping gap inside the stack vma, maintain the stack guard gap as a gap between vmas: using vm_start_gap() in place of vm_start (or vm_end_gap() in place of vm_end if VM_GROWSUP) in just those few places which need to respect the gap - mainly arch_get_unmapped_area(), and and the vma tree's subtree_gap support for that. Original-patch-by: Oleg Nesterov <oleg@redhat.com> Original-patch-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Hugh Dickins <hughd@google.com> Acked-by: Michal Hocko <mhocko@suse.com> Tested-by: Helge Deller <deller@gmx.de> # parisc Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-06-19Merge tag 'armsoc-fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fixes from Olof Johansson: "Stream of fixes has slowed down, only a few this week: - Some DT fixes for Allwinner platforms, and addition of a clock to the R_CCU clock controller that had been missed. - A couple of small DT fixes for am335x-sl50" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCU ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCU ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0 ARM: dts: am335x-sl50: Fix card detect pin for mmc1 arm64: allwinner: h5: Remove syslink to shared DTSI ARM: sunxi: h3/h5: fix the compatible of R_CCU
2017-06-18Merge tag 'at91-4.12-fixes' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc Bring in the fixes branch to avoid a merge conflict between new SoC options and the build fix adding CONFIG_AMR_CPU_SUSPEND. Fixes for 4.12: Fix two compilation issues * tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: at91: select CONFIG_ARM_CPU_SUSPEND memory: atmel-ebi: mark PM ops as __maybe_unused Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'imx-defconfig-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig The i.MX defconfig updates for 4.13: - Enable i.MX7 ADC driver support. - Enable THERMAL_WRITABLE_TRIPS, so that i.MX thermal driver can set trip points for testing. - CONFIG_DEBUG_FS gets lost by accident because of a change around CONFIG_RCU_TRACE. Re-enable it explicitly. - Enable MXS LRADC driver and CONFIG_CGROUPS for mxs_defconfig. - Enable more common cpufreq governors to help test cpufreq driver. * tag 'imx-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Select CONFIG_IMX7D_ADC ARM: imx_v6_v7_defconfig: Set THERMAL_WRITABLE_TRIPS=y for testing ARM: imx_v6_v7_defconfig: Explicitly restore CONFIG_DEBUG_FS ARM: mxs_defconfig: Re-enable MXS LRADC ARM: mxs_defconfig: Enable CONFIG_CGROUPS ARM: imx_v6_v7_defconfig: Enable cpufreq governors Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'imx-dt-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt The i.MX device tree updates for 4.13: - New board support: Gateworks Ventana GW5600, Technexion Pico i.MX7D Board. - A series from Alexandre Belloni to correct the vendor prefix for rv4162 compatible. - A patch-set from Andrey Smirnov ot enable PCIe support for i.MX7 and imx7d-sdb board. - Increase the SGTL5000 LRCLK pad strength to fix a random audio channel swapping seen on imx6qdl-wandboard and imx6qdl-colibri boards. - Clean up non-existing property 'enable-active-low' from fixed regulator device nodes. - Correct GPIO polarity for Ethernet PHY and PCI reset lines, even though device drivers do not use the polarity for now. - Add Wifi and Bluetooth support for imx7d-sdb board. - Adopt the i.MX6Q/DL DT to the new and more flexible GPC binding. - Update zii-rdu2 device tree source to use #include "..." for local inclusion. - A series from Philipp Zabel and Steve Longerbeam to enable video capture support for imx6qdl platforms. - A number of small random updates on various board support. * tag 'imx-dt-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (47 commits) ARM: dts: imx6q-cm-fx6: add sdio wifi/bt nodes ARM: dts: ls1021a: update the clockgen node ARM: dts: imx6-sabreauto: add the ADV7180 video decoder ARM: dts: imx6-sabreauto: add pinctrl for gpt input capture ARM: dts: imx6-sabreauto: add reset-gpios property for max7310_b ARM: dts: imx6-sabreauto: create i2cmux for i2c3 ARM: dts: imx6-sabresd: add OV5642 and OV5640 camera sensors ARM: dts: imx6-sabrelite: add OV5642 and OV5640 camera sensors ARM: dts: imx6qdl-sabrelite: remove erratum ERR006687 workaround ARM: dts: imx6qdl: add capture-subsystem device ARM: dts: imx6qdl: Add video multiplexers, mipi_csi, and their connections ARM: dts: imx6qdl: Add compatible, clocks, irqs to MIPI CSI-2 node ARM: dts: imx6qdl: add multiplexer controls ARM: dts: imx6: Fix PCI GPIO reset polarity ARM: dts: imx7d-sdb: Add Bluetooth support ARM: dts: imx7d-sdb: Add Wifi support ARM: dts: imx7d-sdb: Adjust the regulator nodes ARM: dts: imx: Fix Ethernet PHY reset polarity ARM: dts: imx7: Fix typo in watchdog pin name ARM: dts: vf610-zii: Add switch eeprom-length properties ... Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'imx-soc-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc The i.MX SoC updates for 4.13: - Select GPCv2 for i.MX7 SoCs to get imx-gpcv2 irqchip driver built for i.MX7 platforms by default. - A couple of patches from Leonard to add IMX6ULL cpu check and get suspend/resume work on IMX6ULL. * tag 'imx-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx6ull: Make suspend/resume work like on 6ul ARM: imx: Add MXC_CPU_IMX6ULL and cpu_is_imx6ull ARM: imx: Select GPCv2 for i.MX7 Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'mvebu-dt-4.13-1' of git://git.infradead.org/linux-mvebu into next/dtOlof Johansson
mvebu dt for 4.13 (part 1) - Add Linksys WRT3200ACM (Rango) support - Add PWM properties for gpio on Aramda XP and 38x - A couple of minor updates for the 98dx3236 and 98dx4251 * tag 'mvebu-dt-4.13-1' of git://git.infradead.org/linux-mvebu: ARM: dts: turris-omnia: Add generic compatible string for I2C EEPROM ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango) ARM: dts: armada-385-linksys: fixup button node names ARM: dts: armada-385-linksys: group pins in pinctrl ARM: dts: armada-385-linksys: partition layout is board specific ARM: dts: armada-385-linksys: use binary unit prefixes ARM: dts: armada-385-linksys: drop legacy DSA bindings ARM: dts: armada-385-linksys: usb3 label cleanup ARM: dts: armada-385-linksys: bm pools by label order ARM: dts: armada-385-linksys: drop redundant properties in dependants ARM: dts: armada-385-linksys: flatten dependants ARM: dts: armada-385-linksys: label nodes ARM: dts: armada-385-linksys: flatten dtsi ARM: dts: mvebu: disable the rtc on 98dx3236 SoC ARM: dts: mvebu: add missing interrupt to 98dx4251 switch ARM: dts: armada-xp: Use pwm-fan rather than gpio-fan ARM: dts: mvebu: Add PWM properties for armada-38x ARM: dts: mvebu: Add PWM properties to .dtsi files Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'mvebu-defconfig-4.13-1' of git://git.infradead.org/linux-mvebu ↵Olof Johansson
into next/defconfig mvebu defconfig for 4.13 Enable the SENSORS_PWM_FAN in mvebu_v7_defconfig support by gpio driver since the previous release * tag 'mvebu-defconfig-4.13-1' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Enable SENSORS_PWM_FAN in defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'at91-ab-4.13-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt DT for 4.13 - Switch to the new NAND binding - A few non urgent fixes * tag 'at91-ab-4.13-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: dts: at91: sama5d2_xplained: remove wrong memory node ARM: dts: at91: sama5d2_xplained: add pwm controller ARM: dts: at91: Add the NOR flash available on sama5d3 dev kits ARM: dts: at91: Switch to the new NAND bindings ARM: dts: at91: Declare EBI/NAND controllers dt-bindings: mtd: atmel-nand: Document the nfc-io bindings ARM: dts: at91-sama5d4: use IRQ_TYPE_* to specify irq flags dts: gpio_atmel: adapt binding doc to reality ARM: dts: at91: sama5d2: add m_can nodes ARM: dts: at91: Add generic compatible string for I2C EEPROM Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'at91-ab-4.13-soc' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc SoC for 4.13: - New suspend/resume mode for sama5d2 - Initial support for armv7m based SoCs * tag 'at91-ab-4.13-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: at91: remove atmel_nand_data ARM: at91: fix at91_suspend_entering_slow_clock link error ARM: at91: debug: add samv7x support ARM: at91: add armv7m SoC detection ARM: at91: handle CONFIG_PM for armv7m configurations ARM: at91: Add armv7m support ARM: at91: Document armv7m compatibles ARM: at91: Documentation: add armv7m families ARM: at91: pm: fallback to slowclock when backup mode fails ARM: at91: pm: allow selecting standby and suspend modes ARM: at91: pm: Add sama5d2 backup mode Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'renesas-soc-for-v4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Renesas ARM Based SoC Updates for v4.13 * Use GENPD_FLAG_ALWAYS_ON in pm-rmobile * tag 'renesas-soc-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: pm-rmobile: Use GENPD_FLAG_ALWAYS_ON Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'renesas-dt2-for-v4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Second Round of Renesas ARM Based SoC DT Updates for v4.13 Cleanup: * Correct PCI bus dtc warnings for r8a779x SoCs Enhancements: * Add support for iWave G20D-Q7 board based on RZ/G1M SoC * Add support for GR-Peach board based on r7s72100 SoC * Add composite video and HDMI input to gose board * tag 'renesas-dt2-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: dts: r8a779x: Fix PCI bus dtc warnings ARM: dts: iwg20d-q7: Add support for iWave G20D-Q7 board based on RZ/G1M ARM: dts: iwg20m: Add iWave RZG1M Qseven SOM ARM: dts: gose: add composite video input ARM: dts: r7s72100: Add support for GR-Peach ARM: dts: gose: add HDMI input Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'at91-ab-4.13-defconfig' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig defconfig for 4.13: - Switch sama5 to be tickless in idle and enable hrtimer - Add MCAN * tag 'at91-ab-4.13-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: configs: at91: add MCAN driver to sama5_defconfig ARM: configs: at91: enable HIGH_RES_TIMERS ARM: configs: at91: make system tickless when idle Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'qcom-soc-for-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc Qualcomm ARM Based SoC Updates for v4.13 * Add debug UART addresses for IPQ4019 * tag 'qcom-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: debug: qcom: add UART addresses to Kconfig help for IPQ4019 Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'qcom-dts-for-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt Qualcomm Device Tree Changes for v4.13 * Fix IPQ4019 i2c0 node * Add GSBI7 on IPQ8064 * Add misc APQ8060 devices * Fixup USB related devices on APQ8064 and MSM8974 * tag 'qcom-dts-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: dts: add core I2C devices to the APQ8060 Dragonboard ARM: dts: add GSBI8 defines to the MSM8660 family ARM: dts: Qualcomm APQ8060 DragonBoard ALS sensor ARM: dts: add XOADC and IIO HWMON to MSM8660/APQ8060 ARM: dts: qcom: ipq4019: fix i2c_0 node ARM: dts: qcom: add gsbi7 serial to ipq8064 SoC device tree ARM: dts: qcom-apq8064: Collapse usb support into one node ARM: dts: qcom-msm8974: Add HS usb node and OTG detection mechanisms ARM: dts: qcom: add charger otg regulator ARM: dts: qcom: Remove s4/5vs1,2 from RPM pm8941 control Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'qcom-defconfig-for-4.13' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig Qualcomm ARM Based defconfig Updates for v4.13 * Enable IPQ4019 clock and pinctrl * tag 'qcom-defconfig-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: qcom_defconfig: Enable IPQ4019 clock and pinctrl Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'davinci-for-v4.13/defconfig-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig Enable mtdtests and USB NCM gadget in DaVinci kernel (as modules). * tag 'davinci-for-v4.13/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci_all_defconfig: enable USB CDC NCM gadget ARM: davinci_all_defconfig: enable mtdtests Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'davinci-for-v4.13/soc-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc A patch to fix warnings resulting from DT conversion of VPIF driver. * tag 'davinci-for-v4.13/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: fix const warnings Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'tegra-for-4.13-arm-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt ARM: tegra: Device tree changes for v4.13-rc1 This removes support for the Whistler board, which only a handful of people ever had access to and which doesn't provide any features over other Tegra20 devices that we support. Also this cleans up some PCI related device tree content in preparation for a future DTC release that has additional checks for the PCI bus. * tag 'tegra-for-4.13-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: dts: tegra: fix PCI bus dtc warnings ARM: tegra: remove Whistler support Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'pxa-for-4.13' of https://github.com/rjarzmik/linux into next/socOlof Johansson
This is the pxa changes for v4.13 cycle. This cycle is a minor fixes one, with : - Coccinelle found improvements - magician getting touchscreen driver support. * tag 'pxa-for-4.13' of https://github.com/rjarzmik/linux: ARM: pxa: Delete an error message for a failed memory allocation in pxa3xx_u2d_probe() ARM: pxa: Improve a size determination in pxa3xx_u2d_probe() ARM: pxa: Delete an error message for a failed memory allocation in pxa_pm_init() ARM: pxa: magician: Add support for ADS7846 touchscreen Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'omap-for-v4.13/soc-v4-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc SoC changes for omap variants for v4.13 merge window: - PM clean-up in preparation of adding am335x/am437x PM support - Fixes for issues found by Coccinelle - Legacy code removal now that everything boots in device tree only mode - Interconnect changes in preparation of moving clkctrl clocks to be managed by clkctrl clock driver - Interconnect changes to add omap4 crypto acceclerator support * tag 'omap-for-v4.13/soc-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits) ARM: OMAP4: hwmod_data: add SHAM crypto accelerator ARM: OMAP4: hwmod data: add des ARM: OMAP4: hwmod data: add aes2 ARM: OMAP4: hwmod data: add aes1 ARM: OMAP2+: Remove unused legacy code for n8x0 ARM: OMAP2+: Remove unused legacy code for watchdog ARM: OMAP2+: Remove unused legacy code for interconnects ARM: OMAP2+: Remove unused legacy code for PRM ARM: OMAP2+: Remove unused legacy code for io.c ARM: OMAP2+: Remove unused legacy code for McBSP ARM: OMAP2+: SmartReflex: Delete an error message for a failed memory allocation in two functions ARM: OMAP2+: Use kcalloc() in sr_set_nvalues() ARM: OMAP2+: Improve a size determination in sr_dev_init() ARM: OMAP2+: Delete an error message for a failed memory allocation in two functions ARM: OMAP2+: Remove unused legacy code for device init ARM: OMAP2+: Remove unused legacy code for PMU ARM: OMAP2+: Remove unused legacy code for opp ARM: OMAP2+: hwmod: populate clkctrl clocks for hwmods if available ARM: OMAP4: cminst: add support for clkdm_xlate_address ARM: omap2+: clockdomain: add clkdm_xlate_address ... Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'omap-for-v4.13/dt-part2-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Second set of device tree changes for omaps for v4.13 merge window: - Updates for droid 4 proximity sensor, WLAN and battery - Configure clocks for remoteproc devices for omap5 and dra7 - Configure omap4 crypto accelerators * tag 'omap-for-v4.13/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: omap4: add SHAM node ARM: dts: omap4: add aes2 instance ARM: dts: omap4.dtsi: remove aes[12]_fck ARM: dts: omap4: Fix aes entry ARM: dts: omap4-droid4: Configure CPCAP battery driver ARM: dts: dra7xx-clocks: Use DPLL_GPU for GPU clocks ARM: dts: dra7xx-clocks: Set IVA DPLL and its output clock rates ARM: dts: dra7xx-clocks: Set DSP DPLL and its output clock rates ARM: dts: dra7xx-clocks: Source IPU1 functional clock from CORE DPLL ARM: dts: omap54xx-clocks: Set IVA DPLL and its output clock rates ARM: dts: omap44xx-clocks: Set IVA DPLL and its output clock rates ARM: dts: omap4-droid4: Fix WLAN compatible ARM: dts: omap4-droid4: Add isl29030 ALS/proximity sensor Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'sunxi-dt-h3-for-4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt Allwinner H3 changes for 4.13 This tag is about bringing the EMAC support to the H3 boards. * tag 'sunxi-dt-h3-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: ARM: sun8i: h3: Enable EMAC with external PHY on Orange Pi Plus 2E arm: sun8i: orangepi-zero: Enable dwmac-sun8i ARM: sun8i: bananapi-m2-plus: Enable dwmac-sun8i ARM: sun8i: orangepi-plus: Enable dwmac-sun8i arm: sun8i: nanopi-neo: Enable dwmac-sun8i arm: sun8i: orangepi-pc-plus: Set EMAC activity LEDs to active high arm: sun8i: orangepi-2: Enable dwmac-sun8i arm: sun8i: orangepi-one: Enable dwmac-sun8i arm: sun8i: orangepi-pc: Enable dwmac-sun8i arm: sun8i: sunxi-h3-h5: add dwmac-sun8i ethernet driver arm: sun8i: sunxi-h3-h5: Add dt node for the syscon control module ARM: sunxi: h3-h5: Convert R_CCU raw numbers to macros Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'sunxi-fixes-for-4.12' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes Allwinner fixes for 4.12 A few fixes around the PRCM support that got in 4.12 with a wrong compatible, and a missing clock in the binding. * tag 'sunxi-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCU ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCU arm64: allwinner: h5: Remove syslink to shared DTSI ARM: sunxi: h3/h5: fix the compatible of R_CCU Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'sunxi-dt-for-4.13' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt Allwinner DT changes for 4.13 The usual chunk of patches. The most notable improvements are the power supplies improvements (battery and AC-IN), crypto support for the sun5i family, HDMI support for the A10s, plus a lot of new things for the V3S and the A83T. * tag 'sunxi-dt-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (47 commits) ARM: sun6i: a31s: primo81: Enable battery power supply ARM: sun6i: a31s: primo81: Change USB OTG to OTG mode ARM: sun8i: a83t: Add dt node for the syscon control module ARM: sun8i: a83t: Add device node for R_PIO ARM: sun8i: v3s: add device nodes for DE2 display pipeline ARM: dts: sunxi: add SoC specific compatibles for the crypto nodes ARM: sun5i: add a cryptographic engine node ARM: sun8i: a83t: Add device node for PRCM ARM: dts: sun8i: h3: Add initial NanoPi M1 Plus support ARM: dts: orange-pi-zero: add node for SPI NOR ARM: sun7i: a20: cubietruck: Tie AXP209's USB power supply to USB PHY ARM: sun6i: a31: hummingbird: Enable AXP221's ACIN power supply ARM: sun4i: a10: cubieboard: Enable AXP209's ACIN power supply ARM: sun7i: a20: bananapi-m1-plus: Enable AXP209's ACIN power supply ARM: sun7i: a20: cubieboard2: Enable AXP209's ACIN power supply ARM: sun7i: a20: cubieboard2: Move usb_otg node for alphabetical ordering ARM: sun8i: a83t: cubietruck-plus: Enable SPDIF output ARM: sun8i: a83t: cubietruck-plus: Add LED device nodes ARM: sun8i: a83t: Add device node for SPDIF transmitter ARM: sun8i: a83t: Add device node for DMA controller ... Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'amlogic-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt Amlogic 32-bit DT changes for v4.13: - minor reorganization to support different busses - add/use real clock controller * tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM: dts: meson8: add and use the real clock controller ARM: dts: meson: Extend L2 cache controller node for Meson8 and Meson8b ARM: dts: meson8b: inherit meson.dtsi from meson8b.dtsi ARM: dts: meson: organize devices in their corresponding busses Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'amlogic-soc' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc Amlogic SoC updates for v4.13 - enable the clock controller for 32-bit Meson8 * tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: arm: meson: select the clock controller for Meson8 Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'omap-for-v4.13/omap1-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc A series of omap1 changes for issues found by Coccinelle. * tag 'omap-for-v4.13/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP1: Fix a typo in a comment line ARM: OMAP1: Delete an error message for a failed memory allocation in omap1_dm_timer_init() ARM: OMAP1: DMA: Delete an unnecessary return statement in omap1_show_dma_caps() ARM: OMAP1: DMA: Delete an error message for a failed memory allocation in omap1_system_dma_init() ARM: OMAP1: DMA: Improve a size determination in omap1_system_dma_init() Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'gemini-v4.13-dts-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt Gemini DTS patches for v4.13, take 2: - Add DMA controller - Add PATA controller and SATA bridge * tag 'gemini-v4.13-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: dts: add Gemini PATA/SATA support ARM: dts: Add Gemini DMA controller Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'arm-soc/for-4.13/defconfig' of ↵Olof Johansson
http://github.com/Broadcom/stblinux into next/defconfig This pull request contains Broadcom ARM-based SoCs defconfig updates for 4.13, please pull the following: - Stefan updates the bcm2835_defconfig to include serial, Ethernet and USB gadget support which is needed for the Raspberry Pi Zero OTG changes * tag 'arm-soc/for-4.13/defconfig' of http://github.com/Broadcom/stblinux: ARM: bcm2835_defconfig: Enable serial & ethernet USB gadget support Signed-off-by: Olof Johansson <olof@lixom.net>
2017-06-18Merge tag 'arm-soc/for-4.13/devicetree' of ↵Olof Johansson
http://github.com/Broadcom/stblinux into next/dt This pull request contains Broadcom ARM-based Device Tree changes for 4.13. Note that Baruch's changes are fixes that are currently included in v4.12-rc2, but they are also included here in order to keep this tag based off v4.12-rc1. Please pull the following: - Rafal adds CPU and thermal zones to the Northstar (BCM5301X) Device Tree and he also adds the MDIO controller nodes for later use by USB PHYs - Eric adds support for the V3D engine and Ethernet switch on the Cygnus platforms, he also adds a set of Device Tree sources and include files for the Raspberry Pi 3 (BCM2837) to be used with the ARM/Linux kernel, - Jon adds CPU and thermal zones to the Northstar Plus Device Tree files - Stefan updates the Raspberry Pi DTS files with thermal trip points and zones, adds support for the USB OTG on the Raspberry Pi Zero which includes the proper dwc2 configuration, a generic USB PHY and finally the enabling of the OTG controller by including the proper DTS include file - Gerd switches the Raspberry Pi DTS files to use the SDHOST controller (faster than the SDHCI) * tag 'arm-soc/for-4.13/devicetree' of http://github.com/Broadcom/stblinux: ARM: dts: bcm2835-rpi-zero: Enable OTG mode ARM: dts: bcm283x: Add generic USB PHY ARM: dts: bcm283x: Add dtsi for OTG mode ARM: dts: Cygnus: Add the ethernet switch and ethernet PHY ARM: dts: NSP: Add Thermal Support ARM: dts: Cygnus: Add BCM11360's V3D device ARM: dts: BCM5301X: Specify MDIO bus in the DT ARM: dts: BCM5301X: Add CPU thermal sensor and zone ARM: dts: bcm283x: switch from &sdhci to &sdhost ARM: dts: bcm283x: Add CPU thermal zone with 1 trip point ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v6) Signed-off-by: Olof Johansson <olof@lixom.net>