aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
AgeCommit message (Collapse)AuthorFilesLines
2015-02-04ARM: dts: add mipi dsi device node for exynos4415YoungJun Cho1-0/+15
This patch adds mipi dsi device node to exynos4415.dtsi. Signed-off-by: YoungJun Cho <yj44.cho@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: add fimd device node for exynos4415YoungJun Cho1-0/+12
This patch adds fimd device node to exynos4415.dtsi. Signed-off-by: YoungJun Cho <yj44.cho@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add syscon phandle to the video-phy node for Exynos4Sylwester Nawrocki1-0/+1
This is required to fix regression after introducing the PMU device nodes required for the PMU driver modified in commit 14fc8b93d473 ("ARM: EXYNOS: Add platform driver support for Exynos PMU"). This change is needed to make MIPI DSI displays and MIPI CSI-2 camera sensors working again on Exynos4 boards. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add sound nodes for exynos4412-trats2Inha Song1-0/+42
This patch add WM1811 audio codec, I2S interface and the sound machine nodes to enable audio on exynos4412-trats2 board. Signed-off-by: Inha Song <ideal.song@samsung.com> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2Sylwester Nawrocki1-2/+2
In order to get exact 24MHz clock frequency value for the camera sensor and avoid rounding errors the parent clock must be CLK_XUSBXTI, not CLK_MOUT_MPLL_USER_T. Currently the sensor's master clock frequency is too high and the sensor doesn't work properly. This fixes commit 0357a4438d531ef3cf529e80ffcd208eb8e35f55 ("ARM: dts: Specify default clocks for Exynos4 camera devices"). Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsiSylwester Nawrocki1-1/+1
Assign proper FIMC-IS UART gate clock in the device DT node and not use the SRC_MASK gate. This fixes regression introduced in commit a37c82a3b3c0910019abfd22a97be1f ("clk: samsung: exynos4: Remove SRC_MASK_ISP gates"). Without this change exynos4 fimc-is driver fails to probe with an error log: [ 1.842447] ERROR: could not get clock /camera/fimc-is@12000000:uart(13) [ 1.848529] exynos4-fimc-is 12000000.fimc-is: failed to get clock: uart [ 1.855275] exynos4-fimc-is: probe of 12000000.fimc-is failed with error -2 Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add max77693 charger node for exynos4412-trats2Krzysztof Kozlowski1-0/+10
Add to Trats2 DTS new node for configuring the max77693 charger driver. Only the maxim,constant-microvolt differs from default value but set all of the optional properties anyway. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2Krzysztof Kozlowski1-20/+5
Remove fixed regulators (duplicating what max77686 provides) and add GPIO enable control to max77686 regulators. This gives the system full control over those regulators. Previously the state of such regulators was a mixture of what max77686 driver set over I2C and what regulator-fixed set through GPIO. Removal of 'regulator-always-on' from CAM_ISP_CORE_1.2V (buck9) allows disabling it when it is not used. Previously this regulator was always enabled because its enable state is a OR of: - ENB9 GPIO (turned always on by regulator-fixed), - BUCK9EN field in BUCK9CTRL register (off by max77686 through I2C). Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2Krzysztof Kozlowski1-30/+42
Add suspend to RAM configuration for max77686 regulators. Some LDOs and bucks are disabled. This reduces energy consumption during S2R, approximately from 17 mA to 9 mA. Additionally remove old and not supported bindings: - regulator-mem-off - regulator-mem-idle - regulator-mem-on The max77686 driver does not parse them and they are not documented anywere. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-04ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2Krzysztof Kozlowski1-0/+18
Add node for fuel gauge present in Maxim 77693 PMIC. This allows control over battery charging state on Trats2 board. The fuel gauge is compatible with max17042 battery driver (Maxim 17042/17047/17050). Although datasheet rev 2.2 for MAX77693 describes fuel gauge as Maxim 17042-like, the chip on Trats2 board identifies itself as Maxim 17047-like. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-02-03ARM: dts: AM335x: Make charge delay a DT parameter for TSCVignesh R1-0/+1
The charge delay value is by default 0x400. But it can be set to lower values on some boards, as long as false pen-ups are avoided. Lowering the value increases the sampling rate (though current sampling rate is sufficient for TSC operation). In some boards, the value has to be increased to avoid false pen-up events. Hence, charge delay has been made a DT parameter. Signed-off-by: Vignesh R <vigneshr@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2015-02-02Merge branch 'clk-next' into v3.19-rc7Michael Turquette6-131/+293
2015-02-02ARM: dts: exynos4: Add stdout-path propertiesTomasz Figa9-0/+15
This patch adds stdout-path property to chosen nodes of Exynos4 boards to enable use of earlycon feature without the need to hardcode port number in kernel itself. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-02-02Merge tag 'at91-cleanup3' into at91-3.20-socNicolas Ferre16-13/+210
2015-02-02Merge branch 'at91-3.19-fixes' into at91-3.20-socNicolas Ferre3-2/+4
2015-02-01Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds16-56/+58
Pull ARM SoC fixes from Olof Johansson: "One more week's worth of fixes. Worth pointing out here are: - A patch fixing detaching of iommu registrations when a device is removed -- earlier the ops pointer wasn't managed properly - Another set of Renesas boards get the same GIC setup fixup as others have in previous -rcs - Serial port aliases fixups for sunxi. We did the same to tegra but we caught that in time before the merge window due to more machines being affected. Here it took longer for anyone to notice. - A couple more DT tweaks on sunxi - A follow-up patch for the mvebu coherency disabling in last -rc batch" * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: arm: dma-mapping: Set DMA IOMMU ops in arm_iommu_attach_device() ARM: shmobile: r8a7790: Instantiate GIC from C board code in legacy builds ARM: shmobile: r8a73a4: Instantiate GIC from C board code in legacy builds ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O coherency is disabled ARM: sunxi: dt: Fix aliases ARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i
2015-01-30net: davinci_emac: Get device MAC on 3517Tony Lindgren1-0/+1
Looks like on 3517 davinci_emac MAC address registers have a different layout compared to dm816x and am33xx. Let's add a function to get the 3517 MAC address. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-30ARM: dts: am57xx-beagle-x15: Fix USB2 modeRoger Quadros1-0/+4
On this board USB2 is meant to be used as peripheral only. The ID pin for USB2 is hardwired HIGH. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-30ARM: dts: am57xx-beagle-x15: Add extcon nodes for USBRoger Quadros1-0/+33
On this EVM, the USB cable state has to be determined via the ID pin tied to a GPIO line. We use the gpio-usb-extcon driver to read the ID pin and the extcon framework to forward the USB cable state information to the USB driver so the controller can be configured in the right mode (host/peripheral). NOTE: the ports on this board cannot switch roles. They are configured either host or peripheral by hardwiring the respective ID pins. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-30ARM: dts: dra72-evm: Add extcon nodes for USBRoger Quadros1-0/+31
On this EVM, the USB cable state has to be determined via the ID pin tied to a GPIO line. We use the gpio-usb-extcon driver to read the ID pin and the extcon framework to forward the USB cable state information to the USB driver so the controller can be configured in the right mode (host/peripheral). Gets USB peripheral mode to work on this EVM. Signed-off-by: Roger Quadros <rogerq@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-30ARM: dts: dra7-evm: Add extcon nodes for USBRoger Quadros1-0/+31
On this EVM, the USB cable state has to be determined via the ID pin tied to a GPIO line. We use the gpio-usb-extcon driver to read the ID pin and the extcon framework to forward the USB cable state information to the USB driver so the controller can be configured in the right mode (host/peripheral). Gets USB peripheral mode to work on this EVM. Signed-off-by: Roger Quadros <rogerq@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-30ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boardsHeiko Stuebner3-1/+2
Currently the hdmi driver is using one of the soc i2c busses for ddc probing and while documentation always specifies i2c5 as hdmi-i2c it could very well be any other bus as well. Therefore this is a property of the board and should be specified there. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-01-30ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evbHeiko Stuebner2-0/+46
This enables the recently added display nodes on the firefly and evb, letting the boards output graphic data over the hdmi port. This includes enabling of i2c5 on the evb that is used for ddc probing and setting the lcd-regulators to always on until the hdmi driver learns about using them. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-01-29ARM: dts: rockchip: housekeeping off i2c0 on rk3288-evb boardsHeiko Stuebner2-1/+2
Use the same transfer speed on both the rk808 and act8846 variants and remove the status=okay from the rk808 one which is already set in the shared rk3288-evb.dtsi . Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2015-01-29ARM: dts: rockchip: add cpu and gpu regulators to rk3288-evb-act8846Heiko Stuebner1-0/+25
The evaluation board using the act8846 as main pmic uses two additional regulators to provide the cpu and gpu voltage. Add these and also add the link to cpu supply from vdd_cpu. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Daniel Lezcano <daniel.lezcano@linaro.org>
2015-01-29Merge tag 'zynq-dt-for-3.20' of https://github.com/Xilinx/linux-xlnx into next/dtOlof Johansson4-4/+461
Merge "Zync DT for v3.20" from Michal Simek: arm: Xilinx Zynq dt patches for v3.20 - Add USB chipidea driver to DT - Add pincontrol - Add aliases node - Fix WDT node * tag 'zynq-dt-for-3.20' of https://github.com/Xilinx/linux-xlnx: ARM: zynq: DT: Add aliases node ARM: zynq: DT: Fix binding for cadence WDT ARM: zynq: DT: Add pinctrl information to USB nodes ARM: zynq: DT: Remove bogus value from 'bias-disable' property ARM: zynq: DT: Add pinctrl information ARM: zynq: DT: Add USB to device tree Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-29Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dtOlof Johansson1-0/+17
Merge "Samsung 3rd DT updates for v3.20" from Kukjin Kim: - add DISP1 power domain for support HDMI support on exynos5420/5422/5800 and the power domain node including FIMD1, MIXER and HDMI modules (tested on exynos5420 Peach Pit and exynos5800 Peach Pi Chromebooks and exynos5422 Odroid XU3 by Javier Martinez Canillas) Note this is including a patch for adding clock IDs for the DISP1 power domain with Mike and Sylwester's acks so that could be handled together to avoid non-working. * tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Add DISP1 power domain for exynos5420 clk: exynos5420: Add IDs for clocks used in DISP1 power domain Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-29Merge tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dtOlof Johansson17-24/+113
Merge "Samsung 2nd DT updates for v3.20" from Kukjin Kim: - for all of Samsung SoCs : use generic power domain bindings : add 'dr_mode' property for hsotg/dwc2 devices - exynos3250-rinato and exynos3250-monk : add regulator-haptic - exynos5422-odroidxu3 : reduce total RAM by 22 MiB because last 22 MiB for secure monitor cannot be accessed by kernel : add on-board INA231 sensors and LDO26 of PMIC for the sensors * tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: reduce total RAM by 22 MiB for exynos5422-odroidxu3 ARM: dts: add on-board INA231 sensors for exynos5422-odroidxu3 ARM: dts: Add regulator-haptic node for exynos3250-monk ARM: dts: Add regulator-haptic node for exynos3250-rinato ARM: dts: add 'dr_mode' property to hsotg devices for exynos boards ARM: dts: convert to generic power domain bindings for exynos DT Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-29ARM: digicolor: add minimal device tree descriptionBaruch Siach3-0/+189
cx92755.dtsi describes CX92755 on chip peripherals. cx92755_equinox.dts describes the Equinox evaluation board for the CX92755 SoC. Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-29ARM: 8294/1: ATAG_DTB_COMPAT: remove the DT workspace's hardcoded 64KB sizeNicolas Pitre1-9/+30
There is currently a hardcoded limit of 64KB for the DTB to live in and be extended with ATAG info. Some DTBs have outgrown that limit: $ du -b arch/arm/boot/dts/omap3-n900.dtb 70212 arch/arm/boot/dts/omap3-n900.dtb Furthermore, the actual size passed to atags_to_fdt() included the stack size which is obviously wrong. The initial DTB size is known, so use it to size the allocated workspace with a 50% growth assumption and relocate the temporary stack above that. This is also clamped to 32KB min / 1MB max for robustness against bad DTB data. Reported-by: Pali Rohár <pali.rohar@gmail.com> Tested-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2015-01-29ARM: dts: versatile: add PCI controller bindingRob Herring1-0/+37
Add the PCI controller node for the Versatile/PB board. Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> CC: Russell King <linux@arm.linux.org.uk>
2015-01-29dts: versatile: Add sysregs nodeRob Herring1-0/+5
The Versatile boards have the same sysregs as other ARM Ltd boards. Add the nodes in order to enable support for 24MHz counter as sched_clock. This is a minimal node definition as the existing sub node definition used on VExpress has some issues raised by Linus W. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: devicetree@vger.kernel.org Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
2015-01-29ARM: dts: Add DISP1 power domain for exynos5420Javier Martinez Canillas1-0/+17
The DISP1 power domain on Exynos5420 SoC includes the FIMD1, MIXER and HDMI modules. Add a device node for this power domain and mark these modules as consumer of the DISP1 power domain. When a power domain is powered on and off, the input clocks of the devices attached to it are reparented. So a reference to the input and parent clocks of the devices are needed to manage that. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by: Kukjin Kim <kgene@kernel.org>
2015-01-28ARM: dts: Fix dm816x pinctrl and syscon so they are children of SCMTony Lindgren1-15/+20
Looks like I only got half done with moving pinctrl and syscon to be children of the SCM. I've set up the FAPLL clocks that way already, but did not complete the job as I copied the syscon values from am33xx.dtsi. To make sure the syscon mapping works, I've verfified that we can set up davinci_emac mac address the same way as cpsw already does with the syscon mapping. So let's add that too. Cc: Brian Hutchinson <b.hutchman@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2015-01-28ARM: zynq: DT: Add aliases nodeMichal Simek3-0/+17
Add aliases node to DTs. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-01-28ARM: zynq: DT: Fix binding for cadence WDTMichal Simek1-3/+1
Based on: "devicetree: Add Cadence WDT devicetree bindings documentation" (sha1: 191891c0378f44aec8e06e889a08d0b76fe6c5cb) - compatible string is cdns,wdt-r1p2 - remove device_type property - remove int reset property (reset-on-timeout is bool) Signed-off-by: Michal Simek <michal.simek@xilinx.com> Series-to: arm-soc Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-01-28ARM: zynq: DT: Add pinctrl information to USB nodesSoren Brinkmann2-0/+52
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-01-28ARM: zynq: DT: Remove bogus value from 'bias-disable' propertySoren Brinkmann1-1/+1
In one pinctrl node, a 'bias-disable' property is erroneously assigned a value. Fixes: ARM: zynq: DT: Add pinctrl information Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Reviewed-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2015-01-28ARM: dts: rockchip: add rk3288 watchdog clockHeiko Stuebner1-0/+1
Add the clock property for the watchdog on rk3288 socs. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org>
2015-01-27Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller19-76/+108
Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27Merge tag 'v3.20-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dtOlof Johansson6-1/+1165
Merge "ARM: rockchip: second batch of dts updates for 3.20" from Heiko Stübner: Basic display nodes for crtcs and hdmi encoder, timer node for the broadcast timer going through the clocksource tree and two new boards, the rk3288-based Firefly and the PX2-based Rayeager board (the PX2 is identical to the rk3066 but made for industrial users). * tag 'v3.20-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add dts for ChipSPARK Rayeager PX2 board ARM: dts: rockchip: add dts for Firefly Firefly-RK3288 boards dt-bindings: add vendor prefix and root compatible property for Rockchip boards ARM: dts: rockchip: Add rockchip timer node for rk3288 ARM: dts: rockchip: add rk3288 hdmi nodes ARM: dts: rockchip: Add rk3288 vop and display-subsystem Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-27Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds1-4/+4
Pull networking fixes from David Miller: 1) Don't OOPS on socket AIO, from Christoph Hellwig. 2) Scheduled scans should be aborted upon RFKILL, from Emmanuel Grumbach. 3) Fix sleep in atomic context in kvaser_usb, from Ahmed S Darwish. 4) Fix RCU locking across copy_to_user() in bpf code, from Alexei Starovoitov. 5) Lots of crash, memory leak, short TX packet et al bug fixes in sh_eth from Ben Hutchings. 6) Fix memory corruption in SCTP wrt. INIT collitions, from Daniel Borkmann. 7) Fix return value logic for poll handlers in netxen, enic, and bnx2x. From Eric Dumazet and Govindarajulu Varadarajan. 8) Header length calculation fix in mac80211 from Fred Chou. 9) mv643xx_eth doesn't handle highmem correctly in non-TSO code paths. From Ezequiel Garcia. 10) udp_diag has bogus logic in it's hash chain skipping, copy same fix tcp diag used. From Herbert Xu. 11) amd-xgbe programs wrong rx flow control register, from Thomas Lendacky. 12) Fix race leading to use after free in ping receive path, from Subash Abhinov Kasiviswanathan. 13) Cache redirect routes otherwise we can get a heavy backlog of rcu jobs liberating DST_NOCACHE entries. From Hannes Frederic Sowa. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (48 commits) net: don't OOPS on socket aio stmmac: prevent probe drivers to crash kernel bnx2x: fix napi poll return value for repoll ipv6: replacing a rt6_info needs to purge possible propagated rt6_infos too sh_eth: Fix DMA-API usage for RX buffers sh_eth: Check for DMA mapping errors on transmit sh_eth: Ensure DMA engines are stopped before freeing buffers sh_eth: Remove RX overflow log messages ping: Fix race in free in receive path udp_diag: Fix socket skipping within chain can: kvaser_usb: Fix state handling upon BUS_ERROR events can: kvaser_usb: Retry the first bulk transfer on -ETIMEDOUT can: kvaser_usb: Send correct context to URB completion can: kvaser_usb: Do not sleep in atomic context ipv4: try to cache dst_entries which would cause a redirect samples: bpf: relax test_maps check bpf: rcu lock must not be held when calling copy_to_user() net: sctp: fix slab corruption from use after free on INIT collisions net: mv643xx_eth: Fix highmem support in non-TSO egress path sh_eth: Fix serialisation of interrupt disable with interrupt & NAPI handlers ...
2015-01-26Merge tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dtOlof Johansson5-3/+46
Merge "at91: dt for 3.20 #2" from Nicolas Ferre: Second DT batch for 3.20: - correct some pin configuration for at91sam9x5ek - add pioD on sama5d4 following a modification of pinctrl driver - add more precise nand compatibility string for sama5d4 - audio modifications for wm8904 or ac97 * tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91/dt: sam9263: Add ac97 device node dt: atmel_ac97c: Add device tree documentation ARM: at91: at91sam9n12ek/dt: use dt ids for wm8904 ARM: at91: sama5d3xek/dt: use dt ids for wm8904 ARM: at91: sama5d4: dts: change the nand compatible string ARM: at91/dt: sama5d4: add pioD controller ARM: at91/dt: disable pull-up on vbus-gpio (PB16) to reduce power consumption Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26Merge tag 'sunxi-dt-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dtOlof Johansson49-768/+3201
Merge "Allwinner device tree changes for 3.20" from Maxime Ripard: A lot of changes to the device tree for the 3.20 merge window, mostly with: - More DT license convertions, only two DTS and two DTSI are still uncertain and have not been converted yet - Use the C-preprocessor includes in the device trees. - Add support for the A31s SoC and improve the A80 support - Add IR receiver, lradc, PS/2 support - Add cpufreq support for all SoCs but the A23 and A80. - And a lot of new boards * tag 'sunxi-dt-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (64 commits) ARM: dts: sun5i: Enable axp209 support on A13-OLinuxIno ARM: sunxi: dts: Add A10/A20 PS2 pin muxing options ARM: sunxi: dts: Add PS2 nodes to dtsi for A10,A20 ARM: dts: sun6i: Add resistive touchscreen controller node to dtsi ARM: dts: sun4i: Add Hyundau A7HD board ARM: dts: sun4i: Add Marsboard A10 board ARM: dts: sun9i: Enable mmc2 on A80 Optimus Board ARM: dts: sun9i: Add 8 bit mmc pinmux setting for mmc2 ARM: dts: sun9i: Enable mmc0 on A80 Optimus Board ARM: dts: sun9i: Convert a80 optimus board dts to label referencing ARM: dts: sun9i: Add mmc controller nodes to the A80 dtsi ARM: dts: sun9i: Add mmc config clock nodes ARM: dts: sunxi: Add missing mdio label ARM: dts: sun5i: Add mk802_a10s board ARM: dts: sun4i: Add mk802ii board ARM: dts: sun4i: Add mk802 board ARM: dts: sun4i: Add dts file for Chuwi V7 CW0825 tablet ARM: dts: sun7i: Add dts file for Bananapro board ARM: sun6i: Enable ARM arch timers ARM: dts: sun6i: Convert hummingbird a31 dts to label references ... Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26Merge tag 'sunxi-fixes-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixesOlof Johansson16-56/+58
Merge "Allwinner fixes for 3.19" from Maxime Ripard: Allwinner fixes for 3.19 A few minor fixes for the 3.19 kernel: - The 8250 uart driver now respects the aliases, which pointed out that we were using them wrong. Fixed them. - The simplefb pipeline that was used on the A10 caused flickering and tearing, and rendered it pretty much useless. Added a new simplefb node with another pipeline that removes this issue. Note that we need to keep the old node because u-boot 2015.01 uses it. - Added a fix for the USB phy node on sun4i/sun5i * tag 'sunxi-fixes-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: sunxi: dt: Fix aliases ARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26Merge tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dtOlof Johansson8-8/+663
Merge "Samsung DT updates for v3.20" from Kukjin Kim: - exynos3250 : add exynos_usbphy node and hsotg nodes - exynos3250-rinato : enable usb : cleanup and use macro for gpio-keys : add fimd and Panel devices support - exynos3250-monk : enable usb : cleanup and use macro for gpio-keys - exynos5250-snow : add power and lid gpio-keys pinctrl - exynos5420-peach-pit and exynos5800-peach-pi : configure regulators for suspend : set always on for USB webCam regulators : add lid GPIO key device - exynos5422 : add support new board Odroid XU3 - dt-bindings : add exynos-chipid * tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Configure regulators for suspend on exynos Peach boards ARM: dts: Set Peach boards USB WebCam regulators to always on ARM: dts: Add lid GPIO key device node for Peach boards ARM: dts: Add power and lid GPIO keys pinctrl for exynos5250-snow Documentation: dt-bindings: add exynos-chipid binding information ARM: dts: add Panel device support for exynos3250-rinato ARM: dts: add fimd device support for exynos3250-rinato ARM: dts: use macro in gpio keys for exynos3250 boards ARM: dts: remove unnecessary gpio-key nodes for exynos3250 boards ARM: dts: Enable USB node for exynos3250-monk ARM: dts: Enable USB node for exynos3250-rinato ARM: dts: Add hsotg node for exynos3250 ARM: dts: Add exynos_usbphy node for exynos3250 ARM: dts: Add dts file for Odroid XU3 board Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26ARM: dts: re-fromat AT91 part to match other entriesNicolas Ferre1-50/+40
The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config options may be removed in the near future. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26ARM: mvebu: armada-xp-synology-ds414: Relicense the device tree under GPLv2+/X11Gregory CLEMENT1-4/+37
The current GPL only licensing on the device tree makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Arnaud Ebalard <arno@natisbad.org>
2015-01-26ARM: mvebu: armada-xp-openblocks-ax3-4: Relicense the device tree under GPLv2+/X11Gregory CLEMENT1-3/+37
The current GPL only licensing on the device tree makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-26ARM: mvebu: armada-xp-netgear-rn2120: Relicense the device tree under GPLv2+/X11Gregory CLEMENT1-4/+37
The current GPL only licensing on the device tree makes it very impractical for other software components licensed under another license. In order to make it easier for them to reuse our device trees, relicense our device trees under a GPL/X11 dual-license. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Arnaud Ebalard <arno@natisbad.org> Acked-by: Philipp Zabel <p.zabel@pengutronix.de> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>