profile/ivi/kernel-x86-ivi.git
11 years agoARM: ux500: correct I2C address of ambient light sensor
Linus Walleij [Wed, 2 Oct 2013 11:40:09 +0000 (13:40 +0200)]
ARM: ux500: correct I2C address of ambient light sensor

The ambient light sensor is places at address 0x29 nothing else.
This patch makes the ambient light sensor probe again.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500 enable the AB8500 gpio for all HREFs
Linus Walleij [Thu, 26 Sep 2013 13:09:14 +0000 (15:09 +0200)]
ARM: ux500 enable the AB8500 gpio for all HREFs

The AB8500 GPIO was only registered for the pre-v60 HREF but should
be made available on all HREF variants, move the DT entry to the
common file.

Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: add default trigger on HREF LED
Linus Walleij [Sun, 15 Sep 2013 10:01:07 +0000 (12:01 +0200)]
ARM: ux500: add default trigger on HREF LED

This adds a heartbeat on the first LED on the ux500 HREF
boards.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: delete devices-common remnants
Linus Walleij [Thu, 26 Sep 2013 09:24:16 +0000 (11:24 +0200)]
ARM: ux500: delete devices-common remnants

commit f1ff5b2549990b5de080b52e3313cbb30c218853
"ARM: ux500: Stop enabling GPIOs when not booting with Device Tree"
deleted devices-common.c, but did not delete the build
rule from Makefile (most likely due to compiling in
a dirty tree where the object file still existed so
linking would complete anyway).

Delete the makerule, the header file associated
with this file and the remaining reference to the header.

Cc: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoclk: ux500: Provide a look-up for the ARMSS clock
Lee Jones [Wed, 18 Sep 2013 15:09:38 +0000 (16:09 +0100)]
clk: ux500: Provide a look-up for the ARMSS clock

The ARMSS clock is used by the newly DT enabled CPUFreq driver.

Cc: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Enable CPUFreq on Snowball
Lee Jones [Wed, 18 Sep 2013 15:03:07 +0000 (16:03 +0100)]
ARM: ux500: Enable CPUFreq on Snowball

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Provide a Device Tree node for CPUFreq in the DBx500
Lee Jones [Wed, 18 Sep 2013 15:07:44 +0000 (16:07 +0100)]
ARM: ux500: Provide a Device Tree node for CPUFreq in the DBx500

This is required to fetch the ARMSS clock when booting with DT.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Provide a clock lookup for the Hash driver
Lee Jones [Wed, 18 Sep 2013 15:07:27 +0000 (16:07 +0100)]
ARM: ux500: Provide a clock lookup for the Hash driver

The common clock framework will use the 'clock' property provided to do
a clock lookup when Device Tree is enabled.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Provide a clock lookup for the Crypto driver
Lee Jones [Wed, 18 Sep 2013 15:05:52 +0000 (16:05 +0100)]
ARM: ux500: Provide a clock lookup for the Crypto driver

The common clock framework will use the 'clock' property provided to do
a clock lookup when Device Tree is enabled.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Fix trivial white-space error in the DBX500 DTSI file
Lee Jones [Wed, 18 Sep 2013 15:05:04 +0000 (16:05 +0100)]
ARM: ux500: Fix trivial white-space error in the DBX500 DTSI file

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove ATAG booting support for Snowball
Lee Jones [Wed, 18 Sep 2013 13:55:18 +0000 (14:55 +0100)]
ARM: ux500: Remove ATAG booting support for Snowball

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove ATAG booting support for HREF
Lee Jones [Wed, 18 Sep 2013 13:54:47 +0000 (14:54 +0100)]
ARM: ux500: Remove ATAG booting support for HREF

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove ATAG booting support for U8520
Lee Jones [Wed, 18 Sep 2013 13:54:19 +0000 (14:54 +0100)]
ARM: ux500: Remove ATAG booting support for U8520

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove ATAG booting support for MOP500
Lee Jones [Wed, 18 Sep 2013 13:53:46 +0000 (14:53 +0100)]
ARM: ux500: Remove ATAG booting support for MOP500

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Purge UIB framework when booting with ATAGs
Lee Jones [Wed, 18 Sep 2013 13:53:06 +0000 (14:53 +0100)]
ARM: ux500: Purge UIB framework when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Take out STUIB support when not booting with Device Tree
Lee Jones [Fri, 23 Aug 2013 08:56:47 +0000 (09:56 +0100)]
ARM: ux500: Take out STUIB support when not booting with Device Tree

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove BU21013 ROHM TS support when booting with only ATAGs
Lee Jones [Fri, 23 Aug 2013 08:52:12 +0000 (09:52 +0100)]
ARM: ux500: Remove BU21013 ROHM TS support when booting with only ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Don't register the STMPE/SKE when booting with ATAG support
Lee Jones [Fri, 23 Aug 2013 08:39:05 +0000 (09:39 +0100)]
ARM: ux500: Don't register the STMPE/SKE when booting with ATAG support

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Delete U8500 UIB support when booting with ATAGs
Lee Jones [Fri, 23 Aug 2013 08:34:42 +0000 (09:34 +0100)]
ARM: ux500: Delete U8500 UIB support when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Don't register Synaptics RMI4 TS when booting with ATAGs
Lee Jones [Fri, 23 Aug 2013 08:24:38 +0000 (09:24 +0100)]
ARM: ux500: Don't register Synaptics RMI4 TS when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Purge DB8500 PRCMU registration when not booting with DT
Lee Jones [Fri, 23 Aug 2013 08:19:01 +0000 (09:19 +0100)]
ARM: ux500: Purge DB8500 PRCMU registration when not booting with DT

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Stop requesting the SoC device to play 'parent' role
Lee Jones [Thu, 22 Aug 2013 14:52:30 +0000 (15:52 +0100)]
ARM: ux500: Stop requesting the SoC device to play 'parent' role

There are no more devices which require left to register which require
a parent. This is part of the ux500 conversion over to Device Tree only
booting.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove UART support when booting without Device Tree
Lee Jones [Thu, 22 Aug 2013 15:18:56 +0000 (16:18 +0100)]
ARM: ux500: Remove UART support when booting without Device Tree

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Stop initialising the pinmaps when booting with ATAGs
Lee Jones [Thu, 22 Aug 2013 14:41:30 +0000 (15:41 +0100)]
ARM: ux500: Stop initialising the pinmaps when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Rip out SSP/SPI registration when not booting with Device Tree
Lee Jones [Thu, 22 Aug 2013 13:58:29 +0000 (14:58 +0100)]
ARM: ux500: Rip out SSP/SPI registration when not booting with Device Tree

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Do not register the PMU device if booting with ATAGs
Lee Jones [Thu, 22 Aug 2013 12:28:12 +0000 (13:28 +0100)]
ARM: ux500: Do not register the PMU device if booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Deactivate enablement of DMA40 during ATAG booting
Lee Jones [Wed, 18 Sep 2013 13:50:59 +0000 (14:50 +0100)]
ARM: ux500: Deactivate enablement of DMA40 during ATAG booting

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Stop enabling GPIOs when not booting with Device Tree
Lee Jones [Wed, 18 Sep 2013 13:49:52 +0000 (14:49 +0100)]
ARM: ux500: Stop enabling GPIOs when not booting with Device Tree

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Stop registering Pinctrl when booting with ATAG support
Lee Jones [Fri, 23 Aug 2013 09:29:22 +0000 (10:29 +0100)]
ARM: ux500: Stop registering Pinctrl when booting with ATAG support

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Purge support for registering the RTC when booting with ATAGs
Lee Jones [Thu, 22 Aug 2013 13:54:30 +0000 (14:54 +0100)]
ARM: ux500: Purge support for registering the RTC when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove USB support when booting using ATAGs
Lee Jones [Wed, 18 Sep 2013 13:48:27 +0000 (14:48 +0100)]
ARM: ux500: Remove USB support when booting using ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Rip out keypad initialisation which is no longer used
Lee Jones [Thu, 22 Aug 2013 11:10:48 +0000 (12:10 +0100)]
ARM: ux500: Rip out keypad initialisation which is no longer used

This is part of the ux500 conversion over to Device Tree only
booting, but this stuff haven't been used for years.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Purge SDI support for ATAG booting
Lee Jones [Wed, 21 Aug 2013 16:17:22 +0000 (17:17 +0100)]
ARM: ux500: Purge SDI support for ATAG booting

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove I2C support when booting with ATAG support
Lee Jones [Wed, 21 Aug 2013 14:59:51 +0000 (15:59 +0100)]
ARM: ux500: Remove I2C support when booting with ATAG support

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Purge SFH7741 Proximity Sensor support when booting with ATAGs
Lee Jones [Wed, 21 Aug 2013 14:54:05 +0000 (15:54 +0100)]
ARM: ux500: Purge SFH7741 Proximity Sensor support when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove Light sensor Rohm BH1780GLI when booting with ATAGs
Lee Jones [Wed, 18 Sep 2013 13:41:18 +0000 (14:41 +0100)]
ARM: ux500: Remove Light sensor Rohm BH1780GLI when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove TC35892 Flexible IO Expander when booting ATAGs
Lee Jones [Wed, 18 Sep 2013 14:11:25 +0000 (15:11 +0100)]
ARM: ux500: Remove TC35892 Flexible IO Expander when booting ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Stop passing GPIO pdata when booitng with ATAGs enabled
Lee Jones [Wed, 21 Aug 2013 14:39:53 +0000 (15:39 +0100)]
ARM: ux500: Stop passing GPIO pdata when booitng with ATAGs enabled

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Prevent CODEC platform data from being passed when booting ATAGs
Lee Jones [Thu, 22 Aug 2013 13:26:18 +0000 (14:26 +0100)]
ARM: ux500: Prevent CODEC platform data from being passed when booting ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Rip out Hash support when booting with ATAGs
Lee Jones [Wed, 18 Sep 2013 13:35:06 +0000 (14:35 +0100)]
ARM: ux500: Rip out Hash support when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Deactivate Crypt support when booting with ATAGs
Lee Jones [Wed, 21 Aug 2013 14:19:18 +0000 (15:19 +0100)]
ARM: ux500: Deactivate Crypt support when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Purge SDI regulator support when booting with ATAGs enable
Lee Jones [Wed, 21 Aug 2013 13:33:07 +0000 (14:33 +0100)]
ARM: ux500: Purge SDI regulator support when booting with ATAGs enable

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Disable Snowball's CPUFreq functionality when booting with ATAGs enabled
Lee Jones [Mon, 19 Aug 2013 15:28:58 +0000 (16:28 +0100)]
ARM: ux500: Disable Snowball's CPUFreq functionality when booting with ATAGs enabled

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove support for Snowball's Ethernet regulator when booting with ATAGs
Lee Jones [Mon, 19 Aug 2013 15:27:28 +0000 (16:27 +0100)]
ARM: ux500: Remove support for Snowball's Ethernet regulator when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Disable Snowball's SMSC911x Ethernet when booting with ATAGs
Lee Jones [Mon, 19 Aug 2013 14:46:25 +0000 (15:46 +0100)]
ARM: ux500: Disable Snowball's SMSC911x Ethernet when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Purge support for Snowball user buttons when booting with ATAGs
Lee Jones [Mon, 19 Aug 2013 14:42:17 +0000 (15:42 +0100)]
ARM: ux500: Purge support for Snowball user buttons when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove ATAG booting support for Snowball's heatbeat LED
Lee Jones [Mon, 19 Aug 2013 13:38:44 +0000 (14:38 +0100)]
ARM: ux500: Remove ATAG booting support for Snowball's heatbeat LED

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove ATAG support for LP5521 Programmable Three-Channel LED driver
Lee Jones [Wed, 18 Sep 2013 13:32:16 +0000 (14:32 +0100)]
ARM: ux500: Remove ATAG support for LP5521 Programmable Three-Channel LED driver

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove TPS61052 High Power White LED Driver ATAG support
Lee Jones [Wed, 18 Sep 2013 13:30:37 +0000 (14:30 +0100)]
ARM: ux500: Remove TPS61052 High Power White LED Driver ATAG support

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove Audio/MSP support when booting with ATAGs
Lee Jones [Tue, 13 Aug 2013 16:52:15 +0000 (17:52 +0100)]
ARM: ux500: Remove Audio/MSP support when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove SSP AUXDATA pertaining to DMA bindings
Lee Jones [Wed, 18 Sep 2013 12:38:50 +0000 (13:38 +0100)]
ARM: ux500: Remove SSP AUXDATA pertaining to DMA bindings

These are now cared for from the Device Tree.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Reclassify PRCMU AUXDATA entry
Lee Jones [Wed, 21 Aug 2013 10:32:49 +0000 (11:32 +0100)]
ARM: ux500: Reclassify PRCMU AUXDATA entry

We still need to utilise the AUXDATA system for the PRCMU to pass
through platform data which can not be DT:ed i.e. regulator initialisation
values. All we're doing in this patch is changing the comment header to be
more accurate.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove AUXDATA relating to DMA clock-name bindings
Lee Jones [Mon, 3 Jun 2013 13:05:57 +0000 (14:05 +0100)]
ARM: ux500: Remove AUXDATA relating to DMA clock-name bindings

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove AUXDATA relating to Ethernet clock-name bindings
Lee Jones [Wed, 5 Jun 2013 11:30:38 +0000 (12:30 +0100)]
ARM: ux500: Remove AUXDATA relating to Ethernet clock-name bindings

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove AUXDATA relating to USB clock-name bindings
Lee Jones [Mon, 3 Jun 2013 13:04:20 +0000 (14:04 +0100)]
ARM: ux500: Remove AUXDATA relating to USB clock-name bindings

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove AUXDATA relating to SDI (MMC) clock-name bindings
Lee Jones [Thu, 6 Jun 2013 11:45:03 +0000 (12:45 +0100)]
ARM: ux500: Remove AUXDATA relating to SDI (MMC) clock-name bindings

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Relocate AUXDATA relating to MSP (Audio)
Lee Jones [Wed, 18 Sep 2013 12:37:12 +0000 (13:37 +0100)]
ARM: ux500: Relocate AUXDATA relating to MSP (Audio)

MSP no longer requires clock-name bindings, so we need to move them to
a more appropriate header indicating that we're still passing DMA
related platform data to them.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove AUXDATA relating to I2C clock-name bindings
Lee Jones [Mon, 3 Jun 2013 13:01:52 +0000 (14:01 +0100)]
ARM: ux500: Remove AUXDATA relating to I2C clock-name bindings

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove AUXDATA relating to UART clock-name bindings
Lee Jones [Thu, 6 Jun 2013 11:38:32 +0000 (12:38 +0100)]
ARM: ux500: Remove AUXDATA relating to UART clock-name bindings

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove AUXDATA relating to GPIO clock-name bindings
Lee Jones [Wed, 5 Jun 2013 11:29:18 +0000 (12:29 +0100)]
ARM: ux500: Remove AUXDATA relating to GPIO clock-name bindings

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Call appropriate clock initialisation based on DT or !DT booting
Lee Jones [Tue, 17 Sep 2013 09:41:42 +0000 (10:41 +0100)]
ARM: ux500: Call appropriate clock initialisation based on DT or !DT booting

The ux500 platform will soon be converted to Device Tree only. When that
happens the old clock initialisation will be ripped out. In the meantime
however, we have to make a decision and call the appropriate
initialisation code manually.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agousb: musb: ux500: Don't supply a con_id when requesting the clock
Lee Jones [Wed, 18 Sep 2013 07:58:18 +0000 (08:58 +0100)]
usb: musb: ux500: Don't supply a con_id when requesting the clock

If we supply a con_id then the clock framework will search for that name
in MUSB's Device Tree node for the 'clock-names' property. If it's absent
the clock request will fail. However, if we don't supply the con_id then
clk_get() will call into clk_sys() which will use the device name to
search for the appropriate clock, which is much more natural than forcing
'usb'.

Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoclk: ux500: Add Device Tree support for the TWD clock
Lee Jones [Tue, 17 Sep 2013 09:35:00 +0000 (10:35 +0100)]
clk: ux500: Add Device Tree support for the TWD clock

This patch enables the TWD fixed factor clock to be specified from
Device Tree via phandles to the "smp-twd-clock" node.

Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoclk: ux500: Add Device Tree support for the RTC clock
Lee Jones [Tue, 17 Sep 2013 09:34:24 +0000 (10:34 +0100)]
clk: ux500: Add Device Tree support for the RTC clock

This patch enables the RTC fixed frequency clock to be specified from
Device Tree via phandles to the "rtc32k-clock" node.

Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoclk: ux500: Add Device Tree support for the PRCC Kernel clock
Lee Jones [Tue, 17 Sep 2013 09:33:05 +0000 (10:33 +0100)]
clk: ux500: Add Device Tree support for the PRCC Kernel clock

This patch enables clocks to be specified from Device Tree via phandles
to the "prcc-kernel-clock" node.

Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoclk: ux500: Add Device Tree support for the PRCC Peripheral clock
Lee Jones [Tue, 17 Sep 2013 09:31:39 +0000 (10:31 +0100)]
clk: ux500: Add Device Tree support for the PRCC Peripheral clock

This patch enables clocks to be specified from Device Tree via phandles
to the "prcc-periph-clock" node.

Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoclk: ux500: Add Device Tree support for the PRCMU clock
Lee Jones [Tue, 17 Sep 2013 09:30:19 +0000 (10:30 +0100)]
clk: ux500: Add Device Tree support for the PRCMU clock

This patch enables clocks to be specified from Device Tree via phandles
to the "prcmu-clock" node.

Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoclk: ux500: Add a 2-cell Device Tree parser for obtaining PRCC clocks
Lee Jones [Mon, 22 Jul 2013 12:13:01 +0000 (13:13 +0100)]
clk: ux500: Add a 2-cell Device Tree parser for obtaining PRCC clocks

PRCC (peripheral and kernel) clocks are specified using a property tuple
<&phandle base bit>, where 'base' is the peripheral (1, 2, 3, 5 or 6),
and bit is read-in value into that peripheral stipulated by the hardware
specification.

Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoclk: ux500: Provide u8500_clk with skeleton Device Tree support
Lee Jones [Tue, 17 Sep 2013 09:26:24 +0000 (10:26 +0100)]
clk: ux500: Provide u8500_clk with skeleton Device Tree support

The functional components will be added on a per-clock basis.

Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoclk: ux500: Copy u8500_clk_init() ready for DT enablement
Lee Jones [Tue, 17 Sep 2013 09:11:53 +0000 (10:11 +0100)]
clk: ux500: Copy u8500_clk_init() ready for DT enablement

Here we're using the old clock initialisation function as a template.
It's necessary to remove all of the clk_register_clkdev() calls as
they don't make sense when booting with Device Tree.

Cc: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoclk: ux500: Remove BML8580 clock
Lee Jones [Thu, 8 Aug 2013 09:38:15 +0000 (10:38 +0100)]
clk: ux500: Remove BML8580 clock

There is no mention of the PRCMU_BML8580CLK in any of the Design
Specifications for the chips supported in Mainline. In fact, where it
is incorrectly used in the u8540 clock definition driver it would
have the side effect of using the incorrect clock management address
([PRCM_BML8580CLK_MGT] 0x108 instead of the correct value 0x04C).

Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Don't attempt to enable the Nomadik System Timer twice
Lee Jones [Wed, 18 Sep 2013 07:55:19 +0000 (08:55 +0100)]
ARM: ux500: Don't attempt to enable the Nomadik System Timer twice

When booting with DT enabled we already call clocksource_of_init(),
which in turn calls the OF version of nmdk_timer_init().

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Add a DT node for the Nomadik System Timer (MTU0)
Lee Jones [Wed, 18 Sep 2013 08:54:07 +0000 (09:54 +0100)]
ARM: ux500: Add a DT node for the Nomadik System Timer (MTU0)

The MTU0 is required for full booting of the system. The driver has
been previously DT:ed and is in use on the Nomadik platform, but we
also need to enable it on ux500 based systems.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Supply the TWD Timer clock lookup to the DBX500 DT
Lee Jones [Wed, 5 Jun 2013 11:26:52 +0000 (12:26 +0100)]
ARM: ux500: Supply the TWD Timer clock lookup to the DBX500 DT

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Add TWD (fixed-factor) clock node to DBx500 Device Tree
Lee Jones [Thu, 6 Jun 2013 09:54:48 +0000 (10:54 +0100)]
ARM: ux500: Add TWD (fixed-factor) clock node to DBx500 Device Tree

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Supply the RTC clock lookup to the DBX500 DT
Lee Jones [Wed, 5 Jun 2013 11:27:24 +0000 (12:27 +0100)]
ARM: ux500: Supply the RTC clock lookup to the DBX500 DT

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Add RTC (fixed-frequency) clock node to DBx500 Device Tree
Lee Jones [Thu, 6 Jun 2013 09:54:27 +0000 (10:54 +0100)]
ARM: ux500: Add RTC (fixed-frequency) clock node to DBx500 Device Tree

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Supply the MSP (Audio) clocks lookup to the DBX500 DT
Lee Jones [Mon, 3 Jun 2013 12:18:00 +0000 (13:18 +0100)]
ARM: ux500: Supply the MSP (Audio) clocks lookup to the DBX500 DT

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Supply the SDI (MMC) clocks lookup to the DBX500 DT
Lee Jones [Thu, 6 Jun 2013 11:28:50 +0000 (12:28 +0100)]
ARM: ux500: Supply the SDI (MMC) clocks lookup to the DBX500 DT

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Supply the UART clocks lookup to the DBX500 DT
Lee Jones [Mon, 3 Jun 2013 12:17:17 +0000 (13:17 +0100)]
ARM: ux500: Supply the UART clocks lookup to the DBX500 DT

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Supply the I2C clocks lookup to the DBX500 DT
Lee Jones [Mon, 3 Jun 2013 12:15:22 +0000 (13:15 +0100)]
ARM: ux500: Supply the I2C clocks lookup to the DBX500 DT

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Add PRCC Kernel clock node to DBx500 Device Tree
Lee Jones [Thu, 6 Jun 2013 09:52:50 +0000 (10:52 +0100)]
ARM: ux500: Add PRCC Kernel clock node to DBx500 Device Tree

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Supply the Ethernet clock lookup to Snowball's DT
Lee Jones [Mon, 3 Jun 2013 12:06:13 +0000 (13:06 +0100)]
ARM: ux500: Supply the Ethernet clock lookup to Snowball's DT

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Supply the USB clock lookup to the DBX500 DT
Lee Jones [Mon, 3 Jun 2013 12:08:26 +0000 (13:08 +0100)]
ARM: ux500: Supply the USB clock lookup to the DBX500 DT

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Supply the GPIO clocks lookup to the DBX500 DT
Lee Jones [Mon, 3 Jun 2013 12:07:51 +0000 (13:07 +0100)]
ARM: ux500: Supply the GPIO clocks lookup to the DBX500 DT

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Add PRCC Peripheral clock node to DBx500 Device Tree
Lee Jones [Thu, 6 Jun 2013 09:51:04 +0000 (10:51 +0100)]
ARM: ux500: Add PRCC Peripheral clock node to DBx500 Device Tree

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Supply the DMA clock lookup to the DBX500 DT
Lee Jones [Mon, 3 Jun 2013 12:13:54 +0000 (13:13 +0100)]
ARM: ux500: Supply the DMA clock lookup to the DBX500 DT

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Add PRCMU clock node to DBx500 Device Tree
Lee Jones [Wed, 18 Sep 2013 08:53:10 +0000 (09:53 +0100)]
ARM: ux500: Add PRCMU clock node to DBx500 Device Tree

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agomfd: dbx500: Remove any mention of the BML8580CLK
Lee Jones [Mon, 19 Aug 2013 11:23:05 +0000 (12:23 +0100)]
mfd: dbx500: Remove any mention of the BML8580CLK

The platform which it pertains to is no longer supported and is actually
causing some confusion in the new common clock implementation. A recent
patch removed its use in the clock driver, let's take out the definitions
too.

Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agomfd: dbx500-prcmu: Move PRCMU numerical clock identifiers into DT include file
Lee Jones [Thu, 6 Jun 2013 10:50:47 +0000 (11:50 +0100)]
mfd: dbx500-prcmu: Move PRCMU numerical clock identifiers into DT include file

These are required to request DBx500 PRCMU clocks from Device Tree. The
numbers used are taken directly from the Hardware Specification document.
We're moving them from the DBx500 PRCMU include file into the DT include
directory and referencing them from the former via a #include.

Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agomfd: dbx500-prcmu: Correctly reorder PRCMU clock identifiers
Lee Jones [Thu, 6 Jun 2013 10:57:27 +0000 (11:57 +0100)]
mfd: dbx500-prcmu: Correctly reorder PRCMU clock identifiers

... as stipulated by the Hardware Specification document.

Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agodt: dbx5x0: remove mentor,musb binding
Sebastian Andrzej Siewior [Tue, 20 Aug 2013 16:40:27 +0000 (18:40 +0200)]
dt: dbx5x0: remove mentor,musb binding

The "mentor,musb" binding isn't documented so I was about
to document it.

The node is missing a few properties for configuration like
"multipoint", "dyn_fifo", "num_eps" or "ram_bits". However
I am not sure "missing" is the right word here because some
of those informations might be obtained from the chip itself
but it is not done (yet).

Further the ePARP 2.3.1 says the matching goes from left to
right taking the fist match. Right now there is jus a driver
for "stericsson,db8500-musb" and none for "mentor,musb".
I'm not 100% that it is simply possible to have a generic
since even for DMA we have ifdefs in the driver between
"generic mentor dma" and "ux500 dma" and I mean within musb
and not the dma code.

For that reason (that I am not sure a generic musb binding
is possible and how its binding / required properties will
look like) and the reason that we have here a minor binding
without a driver to look at I suggest to remove that binding.

If the majority of people prefer to keep this binding I'm
curious how the documentation of the binding should look like.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: skip redefined regulator names on v60plus board
Linus Walleij [Fri, 16 Aug 2013 11:53:14 +0000 (13:53 +0200)]
ARM: ux500: skip redefined regulator names on v60plus board

These regulator rail names are already set in the
ste-href.dtsi file included by this file, this is just redoing
the naming for no benefit, so delete it.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: delete surplus PRCMU regulator defines
Linus Walleij [Fri, 16 Aug 2013 11:40:55 +0000 (13:40 +0200)]
ARM: ux500: delete surplus PRCMU regulator defines

The Ux500 boards are layered like this:
ste-snowball.dts includes ste-href.dtsi that includes
ste-dbx500.dtsi.

The dbx500.dtsi defines the PRCMU SoC regulators so the SoC will
probe and you can use ampersand references where need be.

However the HREF common dtsi and these two boards redefine the
same PRCMU SoC regulators with the very same names and properties
for no reason. This is like filling in the same line three
times instead of drawing it once. Just delete the surplus
references and have the PRCMU regulators defines in the SoC
files ste-dbx500.dtsi, this is enough.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: ux500: Remove PrimeCell IDs from Nomadik I2C DT nodes
Lee Jones [Tue, 10 Sep 2013 12:49:02 +0000 (13:49 +0100)]
ARM: ux500: Remove PrimeCell IDs from Nomadik I2C DT nodes

Turns out that they're actually not required and the driver probes just
fine without them. The ID is incorrect at the moment anyway. They actually
currently specify the stn8815.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoLinux 3.12-rc1 v3.12-rc1
Linus Torvalds [Mon, 16 Sep 2013 20:17:51 +0000 (16:17 -0400)]
Linux 3.12-rc1

11 years agoMerge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Linus Torvalds [Mon, 16 Sep 2013 20:10:26 +0000 (16:10 -0400)]
Merge branch 'timers/core' of git://git./linux/kernel/git/tip/tip

Pull timer code update from Thomas Gleixner:
 - armada SoC clocksource overhaul with a trivial merge conflict
 - Minor improvements to various SoC clocksource drivers

* 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding
  clocksource: armada-370-xp: Get reference fixed-clock by name
  clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
  clocksource: armada-370-xp: Fix device-tree binding
  clocksource: armada-370-xp: Introduce new compatibles
  clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
  clocksource: armada-370-xp: Simplify TIMER_CTRL register access
  clocksource: armada-370-xp: Use BIT()
  ARM: timer-sp: Set dynamic irq affinity
  ARM: nomadik: add dynamic irq flag to the timer
  clocksource: sh_cmt: 32-bit control register support
  clocksource: em_sti: Convert to devm_* managed helpers

11 years agoMerge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Linus Torvalds [Mon, 16 Sep 2013 19:39:21 +0000 (15:39 -0400)]
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French:
 "Two minor cifs fixes and a minor documentation cleanup for cifs.txt"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: update cifs.txt and remove some outdated infos
  cifs: Avoid calling unlock_page() twice in cifs_readpage() when using fscache
  cifs: Do not take a reference to the page in cifs_readpage_worker()

11 years agoMerge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi
Linus Torvalds [Mon, 16 Sep 2013 19:37:52 +0000 (15:37 -0400)]
Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi

Pull UBI fixes from Artem Bityutskiy:
 "Just a single fastmap fix plus a regression fix"

* tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi:
  UBI: Fix invalidate_fastmap()
  UBI: Fix PEB leak in wear_leveling_worker()

11 years agoMerge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs
Linus Torvalds [Mon, 16 Sep 2013 19:36:55 +0000 (15:36 -0400)]
Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs

Pull ubifs fix from Artem Bityutskiy:
 "Just one patch which fixes the power-cut recovery testing mode.

  I'll start using a single UBI/UBIFS tree instead of 2 trees from now
  on.  So in the future you'll get 1 small pull request instead of 2
  tiny ones"

* tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: remove invalid warn msg with tst_recovery enabled