summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-09-09Merge tag 'socfpga_update_for_v3.18' of ↵Arnd Bergmann241-1041/+2912
git://git.rocketboards.org/linux-socfpga-next into next/dt Pull "arm: dts: Add Altera SDRAM EDAC bindings & devicetree entries" From Dinh Nguyen: 5 of the 6 patches are DTS updates and the 1 patch is updating the MAINTAINERS entry with my new email address. Signed-off-by: Arnd Bergmann <arnd@arndb.de> * tag 'socfpga_update_for_v3.18' of git://git.rocketboards.org/linux-socfpga-next: arm: dts: Add Altera SDRAM EDAC bindings & devicetree entries. ARM: dts: socfpga: memreserve first 4KB for future system use ARM: dts: socfpga: Add SD card detect ARM: dts: socfpga: remove extra alias in the ArriaV devkit ARM: dts: socfpga: unuse the slot-node and deprecate the supports-highspeed for dw-mmc MAINTAINERS: update entries for ARM/SOCFPGA platform
2014-09-06Merge tag 'davinci-for-v3.18/dt' of ↵Arnd Bergmann3-0/+92
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt Pull "DT additions for DA850" from Sekhar Nori: Adds EDMA and audio support Signed-off-by: Arnd Bergmann <arnd@arndb.de> * tag 'davinci-for-v3.18/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: DTS: da850-evm: Enable audio via simple-card ARM: DTS: da850-evm: Add node for tlv320aic3106 codec ARM: DTS: da850-evm: Enable McASP via DT boot ARM: DTS: da850: Add node for McASP ARM: DTS: da850: Add node for edma0 ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for mcasp0
2014-09-06Merge tag 'at91-dt2' of git://github.com/at91linux/linux-at91 into next/dtArnd Bergmann4-23/+33
Pull "Second batch of AT91 DT patches for 3.18" from Nicolas Ferre: - 2 little fixes for at91sam9x5 and at91sam9n12ek - removal of a board specific hook for sama5d3xek about phy fixup replaced with proper DT property definition. Signed-off-by: Arnd Bergmann <arnd@arndb.de> * tag 'at91-dt2' of git://github.com/at91linux/linux-at91: ARM: at91: remove phy fixup for sama5d3xek boards ARM: at91/dt: describe rgmii ethernet phy connected to sama5d3xek boards ARM: at91/dt: sam9n12ek: ohci: add port and vbus property ARM: at91/dt: sam9x5: fix ADC compatible string
2014-09-06Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dtArnd Bergmann5-6/+32
Merge "First batch of AT91 DT material for 3.18" from Nicolas Ferre: - RAM controller rework for multiple controller SoCs - shutdown controller addtion Signed-off-by: Arnd Bergmann <arnd@arndb.de> * tag 'at91-dt' of git://github.com/at91linux/linux-at91: ARM: at91/dt: sama5d3: Add shutdown controller ARM: at91/dt: Declare a second ram controller when relevant ARM: at91/dt: at91sam9: use ddrck in ramc ARM: at91/dt: sama5d3: define mpddr clock and ramc clocks
2014-09-05Merge tag 'renesas-dt3-for-v3.18' of ↵Arnd Bergmann4-8/+79
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Third Round of Renesas ARM Based SoC DT Updates for v3.18" from Simon Horman: * Use tabs for indentation in kzm9g-reference and r8a7779 DTS(I) files * Add platform device tree bindings documentation * Add SoC-specific thermal compatible property to r8a73a4 and r8a7779 Signed-off-by: Arnd Bergmann <arnd@arndb.de> * tag 'renesas-dt3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: kzm9g-reference dts: Use tabs for indentation ARM: shmobile: r8a7779 dtsi: Use tabs for indentation ARM: shmobile: Add platform device tree bindings documentation ARM: shmobile: r8a73a4 dtsi: Add SoC-specific thermal compatible property ARM: shmobile: r8a7779 dtsi: Add SoC-specific thermal compatible property
2014-09-05Merge tag 'renesas-dt2-for-v3.18' of ↵Arnd Bergmann7-37/+86
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 v3.18" from Simon Horman: * Tidy up interrupt-parents * Add clocks register defines for r8a7740 SoC * Add JPU clock to r8a7791 and r8a7790 SoCs Signed-off-by: Arnd Bergmann <arnd@arndb.de> * tag 'renesas-dt2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: sh73a0 dtsi: Move interrupt-parent to the top ARM: shmobile: r8a7791 dtsi: Remove superfluous interrupt-parent ARM: shmobile: r8a7790 dtsi: Remove superfluous interrupt-parent ARM: shmobile: r8a7779 dtsi: Remove superfluous interrupt-parent ARM: shmobile: r8a7740: clock register bits ARM: shmobile: r8a7791: Add JPU clock dt and CPG define. ARM: shmobile: r8a7790: Add JPU clock dt and CPG define.
2014-09-05Merge tag 'renesas-dt-for-v3.18' of ↵Arnd Bergmann5-9/+318
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Renesas ARM Based SoC DT Updates for v3.18" from Simon Horman: * Add VIN support to lager/r8a7790, koelsch/r8a7791 and henninger/r8a7791 * Enable DMA for MSIOF and QSPI on r8a7790 and r8a7791 Signed-off-by: Arnd Bergmann <arnd@arndb.de> * tag 'renesas-dt-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: lager: add VIN1/ADV7180 device nodes ARM: shmobile: r8a7790: add VIN device nodes ARM: shmobile: r8a7790 dtsi: Enable DMA for MSIOF ARM: shmobile: r8a7790 dtsi: Enable DMA for QSPI ARM: shmobile: r8a7791 dtsi: Enable DMA for MSIOF ARM: shmobile: r8a7791 dtsi: Enable DMA for QSPI ARM: shmobile: r8a7791: Add DMAC devices to DT ARM: shmobile: r8a7790: Add DMAC devices to DT ARM: shmobile: r8a7790: Add DMAC clocks to DT ARM: shmobile: koelsch: add VIN1/ADV7180 DT support ARM: shmobile: henninger: add VIN0/ADV7180 DT support ARM: shmobile: r8a7791: add VIN DT support
2014-09-05Merge tag 'v3.18-rockchip-dma' of ↵Arnd Bergmann3-0/+77
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Pull "rockchip dma support" from Heiko Stuebner: Enable the AMBA bus and add necessary dma-controller dts nodes * tag 'v3.18-rockchip-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add rk3066 and rk3188 dma controllers ARM: dts: rockchip: add rk3288 dma controllers ARM: rockchip: enable the AMBA bus Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-09-04Merge tag 'v3.18-rockchip-dts1' of ↵Arnd Bergmann6-25/+215
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Pull "First hunk of Rockchip dts changes for 3.18" from Heiko Stuebner: - dw_mmc conversion from Jaehoon Chung - mmc support for rk3288 - pwm + backlight for rk3288 - rtc for Radxa Rock - saradc base nodes * tag 'v3.18-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add saradc nodes ARM: dts: rockchip: add hym8563 rtc to Radxa Rock board ARM: dts: Enable PWM backlight on rk3288-evb ARM: dts: Add main PWM info to rk3288 ARM: dts: Move the PMIC interrupt pinctrl line to rk3288-evb common ARM: dts: Enable emmc and sdmmc on the rk3288-evb boards ARM: dts: Add emmc and sdmmc to the rk3288 device tree ARM: dts: rockchip: unuse the slot-node and deprecate the supports-highspeed for dw-mmc Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-09-04arm: dts: Add Altera SDRAM EDAC bindings & devicetree entries.Thor Thayer2-0/+26
Add the Altera SDRAM EDAC bindings and device tree changes to the Altera SoC project. There was a discussion thread on whether this driver should be an mfd driver or just make use of syscon, which is already a mfd. Ultimately, the decision to use a simple syscon interface was reached.[1] [1] https://lkml.org/lkml/2014/7/30/514 Signed-off-by: Thor Thayer <tthayer@opensource.altera.com> Acked-by: Pavel Machek <pavel@denx.de> [dinguyen] cleaned-up commit header and remove version history. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2014-09-04ARM: dts: socfpga: memreserve first 4KB for future system useDinh Nguyen2-0/+4
This patch adds a /memreserve/ section to reserve the first 4K for future use by the system. One possible use-case is trampoline code used to bring secondary cores online. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Acked-by: Pavel Machek <pavel@denx.de> --- v3: Update commit message based on Mark Rutland's comment v2: Add a comment in the dts files
2014-09-04ARM: dts: socfpga: Add SD card detectDinh Nguyen2-1/+5
Revision D of the SOCFGPA devkit has a GPIO line used for SD/MMC card detect. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Acked-by: Pavel Machek <pavel@denx.de>
2014-09-04ARM: dts: socfpga: remove extra alias in the ArriaV devkitDinh Nguyen1-7/+0
commit [2755e187 dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.] added an extra ethernet alias in the ArriaV devkit board file. This patch removes it. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2014-09-04ARM: dts: socfpga: unuse the slot-node and deprecate the supports-highspeed forJaehoon Chung3-18/+9
dw-mmc dw-mmc controller can support multiple slots. But, there are no use-cases anywhere. So we don't need to support the slot-node for dw-mmc controller. And "supports-highspeed" property in dw-mmc is deprecated. "supports-highspeed" property can be replaced with "cap-sd/mmc-highspeed". Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Tushar Behera <trblinux@gmail.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Seungwon Jeon <tgih.jun@samsung.com> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
2014-09-03ARM: dts: rockchip: add rk3066 and rk3188 dma controllersHeiko Stübner1-0/+38
Add both the cpu and peripheral pl330 dma controllers present in rk3188 socs. The first dma controller can change between secure and non-secure mode. Both instances are added but the non-secure variant is left disabled by default, as on the majority of boards the bootloader leaves it in secure mode. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-09-03ARM: dts: rockchip: add rk3288 dma controllersHeiko Stübner1-0/+38
Add both the bus and peripheral pl330 dma controllers present in rk3288 socs. The first dma controller can change between secure and non-secure mode. Both instances are added but the non-secure variant is left disabled by default, as on the majority of boards the bootloader leaves it in secure mode. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Kever Yang <kever.yang@rock-chips.com>
2014-09-03ARM: rockchip: enable the AMBA busHeiko Stübner1-0/+1
This is needed to access the pl330 dma controllers on Rockchip SoCs. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Kever Yang <kever.yang@rock-chips.com>
2014-09-02ARM: shmobile: kzm9g-reference dts: Use tabs for indentationGeert Uytterhoeven1-2/+2
Checkpatch says: ERROR: code indent should use tabs where possible Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-09-02ARM: shmobile: r8a7779 dtsi: Use tabs for indentationGeert Uytterhoeven1-4/+4
Checkpatch says: ERROR: code indent should use tabs where possible Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-09-01ARM: at91: remove phy fixup for sama5d3xek boardsBoris BREZILLON1-22/+0
These board specific delays are now configured through micrel's specific DT bindings (see Documentation/devicetree/bindings/net/micrel-ksz9021.txt). Remove this phy fixup registration from sama5 DT machine file to keep it as generic as possible. Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> Tested-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-09-01ARM: at91/dt: describe rgmii ethernet phy connected to sama5d3xek boardsBoris BREZILLON1-0/+30
Add ethernet-phy nodes and specify phy interrupt (connected to pin PB25) and board specific timing configs. Atmel has two different HW designs for its CPU modules: the first one (produced by Embest) is connecting PHYAD[0-2] pins to pull up resistors and the other one (produced by Ronetix) is connecting PHYAD0 to a pull up resistor and PHYAD[1-2] to pull down resistors. As a result, Ronetix design will have its PHY available at address 0x1 and Embest design at 0x7. By defining both phys we're letting the phy core detect the one actually available on the MDIO bus. Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com> Tested-by: Bo Shen <voice.shen@atmel.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-09-01ARM: at91/dt: sam9n12ek: ohci: add port and vbus propertyBo Shen1-0/+2
Add the port number and vbus property for ohci port, or else if bootloader won't configure the vbus pin, the 5v supply is not power on, so can not work with usb devices. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-09-01ARM: at91/dt: sam9x5: fix ADC compatible stringAlexandre Belloni1-1/+1
Use the correct compatible string for the ADC of the at91sam9x5 family of SoCs. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-09-01ARM: shmobile: Add platform device tree bindings documentationGeert Uytterhoeven1-0/+71
Add Renesas SH-Mobile, R-Mobile, and R-Car Platform Device Tree Bindings Documentation, listing supported SoCs and boards. This allows to use checkpatch to validate DTSes referring to Renesas shmobile SoCs, and boards containing those SoCs. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> [horms+renesas@verge.net.au: tweaked title] Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-09-01ARM: shmobile: r8a73a4 dtsi: Add SoC-specific thermal compatible propertyGeert Uytterhoeven1-1/+1
The thermal node used the generic compatible property only. Add the SoC-specific one, to make it future proof. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-09-01ARM: shmobile: r8a7779 dtsi: Add SoC-specific thermal compatible propertyGeert Uytterhoeven1-1/+1
The thermal node used the generic compatible property only. Add the SoC-specific one, to make it future proof. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-08-28MAINTAINERS: update entries for ARM/SOCFPGA platformDinh Nguyen1-2/+5
Update email address, add W and T entries. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2014-08-28ARM: dts: rockchip: add saradc nodesHeiko Stübner2-0/+20
Add the core device nodes for the SARADC found on both the Cortex-A9 series (rk3066 and rk3188) as well as the newer rk3288. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-08-28ARM: dts: rockchip: add hym8563 rtc to Radxa Rock boardHeiko Stübner1-0/+17
The Radxa Rock uses a hym8563 as rtc. Add the i2c device and necessary pinconfig for the interrupt pin - labeled rtc_int in the schematics. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-08-28ARM: dts: Enable PWM backlight on rk3288-evbDoug Anderson1-0/+53
PWM0 is the PWM associated with the LCD backlight. Enable it. Signed-off-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-08-28ARM: dts: Add main PWM info to rk3288Doug Anderson1-0/+68
This adds the PWM info (other than the VOP PWM) to the main rk3288 dtsi file. Signed-off-by: Caesar Wang <caesar.wang@rock-chips.com> Signed-off-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2014-08-26ARM: DTS: da850-evm: Enable audio via simple-cardPeter Ujfalusi1-0/+29
The audio on the board is using McASP <-> tlv320aic3106 codec and we have LineIn and LineOut jacks. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2014-08-26ARM: DTS: da850-evm: Add node for tlv320aic3106 codecPeter Ujfalusi1-0/+13
The board uses aic3106 for audio. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2014-08-26ARM: DTS: da850-evm: Enable McASP via DT bootPeter Ujfalusi1-0/+30
Add pinctrl nodes for the McASP0 pins and configure McASP to the desired mode for the board. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2014-08-26ARM: DTS: da850: Add node for McASPPeter Ujfalusi1-0/+13
Node for mcasp0 Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2014-08-26ARM: DTS: da850: Add node for edma0Peter Ujfalusi1-0/+6
Add DT node for edma0. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2014-08-26ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for mcasp0Peter Ujfalusi1-0/+1
Add OF_DEV_AUXDATA for mcasp to be able to use clocks. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2014-08-26Linux 3.17-rc2Linus Torvalds1-1/+1
2014-08-26Merge tag 'nfs-for-3.17-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds3-29/+77
Pull NFS client fixes from Trond Myklebust: "Highlights: - more fixes for read/write codepath regressions * sleeping while holding the inode lock * stricter enforcement of page contiguity when coalescing requests * fix up error handling in the page coalescing code - don't busy wait on SIGKILL in the file locking code" * tag 'nfs-for-3.17-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: nfs: Don't busy-wait on SIGKILL in __nfs_iocounter_wait nfs: can_coalesce_requests must enforce contiguity nfs: disallow duplicate pages in pgio page vectors nfs: don't sleep with inode lock in lock_and_join_requests nfs: fix error handling in lock_and_join_requests nfs: use blocking page_group_lock in add_request nfs: fix nonblocking calls to nfs_page_group_lock nfs: change nfs_page_group_lock argument
2014-08-26Merge tag 'renesas-sh-drivers-for-v3.17' of ↵Linus Torvalds4-3/+11
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas Pull SH driver fix from Simon Horman: "Confine SH_INTC to platforms that need it" * tag 'renesas-sh-drivers-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: sh: intc: Confine SH_INTC to platforms that need it
2014-08-26Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds18-59/+142
Pull MIPS fixes from Ralf Baechle: "Pretty much all across the field so with this we should be in reasonable shape for the upcoming -rc2" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: OCTEON: make get_system_type() thread-safe MIPS: CPS: Initialize EVA before bringing up VPEs from secondary cores MIPS: Malta: EVA: Rename 'eva_entry' to 'platform_eva_init' MIPS: EVA: Add new EVA header MIPS: scall64-o32: Fix indirect syscall detection MIPS: syscall: Fix AUDIT value for O32 processes on MIPS64 MIPS: Loongson: Fix COP2 usage for preemptible kernel MIPS: NL: Fix nlm_xlp_defconfig build error MIPS: Remove race window in page fault handling MIPS: Malta: Improve system memory detection for '{e, }memsize' >= 2G MIPS: Alchemy: Fix db1200 PSC clock enablement MIPS: BCM47XX: Fix reboot problem on BCM4705/BCM4785 MIPS: Remove duplicated include from numa.c MIPS: Add common plat_irq_dispatch declaration MIPS: MSP71xx: remove unused plat_irq_dispatch() argument MIPS: GIC: Remove useless parens from GICBIS(). MIPS: perf: Mark pmu interupt IRQF_NO_THREAD
2014-08-26Merge tag 'trace-fixes-v3.17-rc1' of ↵Linus Torvalds2-92/+168
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace Pull fix for ftrace function tracer/profiler conflict from Steven Rostedt: "The rewrite of the ftrace code that makes it possible to allow for separate trampolines had a design flaw with the interaction between the function and function_graph tracers. The main flaw was the simplification of the use of multiple tracers having the same filter (like function and function_graph, that use the set_ftrace_filter file to filter their code). The design assumed that the two tracers could never run simultaneously as only one tracer can be used at a time. The problem with this assumption was that the function profiler could be implemented on top of the function graph tracer, and the function profiler could run at the same time as the function tracer. This caused the assumption to be broken and when ftrace detected this failed assumpiton it would spit out a nasty warning and shut itself down. Instead of using a single ftrace_ops that switches between the function and function_graph callbacks, the two tracers can again use their own ftrace_ops. But instead of having a complex hierarchy of ftrace_ops, the filter fields are placed in its own structure and the ftrace_ops can carefully use the same filter. This change took a bit to be able to allow for this and currently only the global_ops can share the same filter, but this new design can easily be modified to allow for any ftrace_ops to share its filter with another ftrace_ops. The first four patches deal with the change of allowing the ftrace_ops to share the filter (and this needs to go to 3.16 as well). The fifth patch fixes a bug that was also caused by the new changes but only for archs other than x86, and only if those archs implement a direct call to the function_graph tracer which they do not do yet but will in the future. It does not need to go to stable, but needs to be fixed before the other archs update their code to allow direct calls to the function_graph trampoline" * tag 'trace-fixes-v3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: ftrace: Use current addr when converting to nop in __ftrace_replace_code() ftrace: Fix function_profiler and function tracer together ftrace: Fix up trampoline accounting with looping on hash ops ftrace: Update all ftrace_ops for a ftrace_hash_ops update ftrace: Allow ftrace_ops to use the hashes from other ops
2014-08-25Merge branch 'x86-urgent-for-linus' of ↵Linus Torvalds5-8/+16
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 fixes from Ingo Molnar: "A couple of EFI fixes, plus misc fixes all around the map" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi/arm64: Store Runtime Services revision firmware: Do not use WARN_ON(!spin_is_locked()) x86_32, entry: Clean up sysenter_badsys declaration x86/doc: Fix the 'tlb_single_page_flush_ceiling' sysconfig path x86/mm: Fix sparse 'tlb_single_page_flush_ceiling' warning and make the variable read-mostly x86/mm: Fix RCU splat from new TLB tracepoints
2014-08-25Merge branch 'perf-urgent-for-linus' of ↵Linus Torvalds2-2/+34
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull perf fixes from Ingo Molnar: "A kprobes and a perf compat ioctl fix" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf: Handle compat ioctl kprobes: Skip kretprobe hit in NMI context to avoid deadlock
2014-08-25Merge tag 'fixes-for-linus' of ↵Linus Torvalds17-30/+76
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fixes from Olof Johansson: "A collection of fixes from this week, it's been pretty quiet and nothing really stands out as particularly noteworthy here -- mostly minor fixes across the field: - ODROID booting was fixed due to PMIC interrupts missing in DT - a collection of i.MX fixes - minor Tegra fix for regulators - Rockchip fix and addition of SoC-specific mailing list to make it easier to find posted patches" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: bus: arm-ccn: Fix warning message ARM: shmobile: koelsch: Remove non-existent i2c6 pinmux ARM: tegra: apalis/colibri t30: fix on-module 5v0 supplies MAINTAINERS: add new Rockchip SoC list ARM: dts: rockchip: readd missing mmc0 pinctrl settings ARM: dts: ODROID i2c improvements ARM: dts: Enable PMIC interrupts on ODROID ARM: dts: imx6sx: fix the pad setting for uart CTS_B ARM: dts: i.MX53: fix apparent bug in VPU clks ARM: imx: correct gpu2d_axi and gpu3d_axi clock setting ARM: dts: imx6: edmqmx6: change enet reset pin ARM: dts: vf610-twr: Fix pinctrl_esdhc1 pin definitions. ARM: imx: remove unnecessary ARCH_HAS_OPP select ARM: imx: fix TLB missing of IOMUXC base address during suspend ARM: imx6: fix SMP compilation again ARM: dt: sun6i: Add #address-cells and #size-cells to i2c controller nodes
2014-08-25Merge tag 'gpio-v3.17-2' of ↵Linus Torvalds6-15/+51
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio Pull gpio fixes from Linus Walleij: - a largeish fix for the IRQ handling in the new Zynq driver. The quite verbose commit message gives the exact details. - move some defines for gpiod flags outside an ifdef to make stub functions work again. - various minor fixes that we can accept for -rc1. * tag 'gpio-v3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpio-lynxpoint: enable input sensing in resume gpio: move GPIOD flags outside #ifdef gpio: delete unneeded test before of_node_put gpio: zynq: Fix IRQ handlers gpiolib: devres: use correct structure type name in sizeof MAINTAINERS: Change maintainer for gpio-bcm-kona.c
2014-08-25Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds44-167/+328
Pull drm fixes from Dave Airlie: "Intel and radeon fixes. Post KS/LC git requests from i915 and radeon stacked up. They are all fixes along with some new pci ids for radeon, and one maintainers file entry. - i915: display fixes and irq fixes - radeon: pci ids, and misc gpuvm, dpm and hdp cache" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (29 commits) MAINTAINERS: Add entry for Renesas DRM drivers drm/radeon: add additional SI pci ids drm/radeon: add new bonaire pci ids drm/radeon: add new KV pci id Revert "drm/radeon: Use write-combined CPU mappings of ring buffers with PCIe" drm/radeon: fix active_cu mask on SI and CIK after re-init (v3) drm/radeon: fix active cu count for SI and CIK drm/radeon: re-enable selective GPUVM flushing drm/radeon: Sync ME and PFP after CP semaphore waits v4 drm/radeon: fix display handling in radeon_gpu_reset drm/radeon: fix pm handling in radeon_gpu_reset drm/radeon: Only flush HDP cache for indirect buffers from userspace drm/radeon: properly document reloc priority mask drm/i915: don't try to retrain a DP link on an inactive CRTC drm/i915: make sure VDD is turned off during system suspend drm/i915: cancel hotplug and dig_port work during suspend and unload drm/i915: fix HPD IRQ reenable work cancelation drm/i915: take display port power domain in DP HPD handler drm/i915: Don't try to enable cursor from setplane when crtc is disabled drm/i915: Skip load detect when intel_crtc->new_enable==true ...
2014-08-25aio: fix reqs_available handlingBenjamin LaHaise1-4/+73
As reported by Dan Aloni, commit f8567a3845ac ("aio: fix aio request leak when events are reaped by userspace") introduces a regression when user code attempts to perform io_submit() with more events than are available in the ring buffer. Reverting that commit would reintroduce a regression when user space event reaping is used. Fixing this bug is a bit more involved than the previous attempts to fix this regression. Since we do not have a single point at which we can count events as being reaped by user space and io_getevents(), we have to track event completion by looking at the number of events left in the event ring. So long as there are as many events in the ring buffer as there have been completion events generate, we cannot call put_reqs_available(). The code to check for this is now placed in refill_reqs_available(). A test program from Dan and modified by me for verifying this bug is available at http://www.kvack.org/~bcrl/20140824-aio_bug.c . Reported-by: Dan Aloni <dan@kernelim.com> Signed-off-by: Benjamin LaHaise <bcrl@kvack.org> Acked-by: Dan Aloni <dan@kernelim.com> Cc: Kent Overstreet <kmo@daterainc.com> Cc: Mateusz Guzik <mguzik@redhat.com> Cc: Petr Matousek <pmatouse@redhat.com> Cc: stable@vger.kernel.org # v3.16 and anything that f8567a3845ac was backported to Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-08-24bus: arm-ccn: Fix warning messagePawel Moll1-1/+1
A message warning a user about wrong vc value was printing out port instead. Reported-by: Drew Richardson <drew.richardson@arm.com> Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-08-24ARM: shmobile: koelsch: Remove non-existent i2c6 pinmuxGeert Uytterhoeven1-7/+0
On r8a7791, i2c6 (aka iic3) doesn't need pinmux, but the koelsch dts refers to non-existent pinmux configuration data: pinmux core: sh-pfc does not support function i2c6 sh-pfc e6060000.pfc: invalid function i2c6 in map table Remove it to fix this. Fixes: commit 1d41f36a68c0f4e9b01d563ce33bab5201858b54 ("ARM: shmobile: koelsch dts: Add VDD MPU regulator for DVFS") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Olof Johansson <olof@lixom.net>