aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-02-28Btrfs: fix wrong reserved space when deleting a snapshot/subvolumeMiao Xie1-2/+19
When deleting a snapshot/subvolume, we need remove root ref/backref, dir entries and update the dir inode, so we must reserve free space for those operations. Signed-off-by: Miao Xie <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
2013-02-28Btrfs: fix wrong reserved space in qgroup during snap/subv creationMiao Xie5-36/+105
There are two problems in the space reservation of the snapshot/ subvolume creation. - don't reserve the space for the root item insertion - the space which is reserved in the qgroup is different with the free space reservation. we need reserve free space for 7 items, but in qgroup reservation, we need reserve space only for 3 items. So we implement new metadata reservation functions for the snapshot/subvolume creation. Signed-off-by: Miao Xie <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
2013-02-28Btrfs: remove unnecessary dget_parent/dput when creating the pending snapshotMiao Xie3-8/+8
Since we have grabbed the parent inode at the beginning of the snapshot creation, and both sync and async snapshot creation release it after the pending snapshots are actually created, it is safe to access the parent inode directly during the snapshot creation, we needn't use dget_parent/dput to fix the parent dentry and get the dir inode. Signed-off-by: Miao Xie <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
2013-02-28btrfs: remove a printk from scan_one_deviceDavid Sterba1-1/+0
Dave pointed out that he saw messages from btrfs although there was no such filesystem on his computers. The automatic device scan is called on every new blockdevice if the usual distro udev rule set is used. The printk introduced in 6f60cbd3ae442c was a remainder from copying portions of code from btrfs_get_bdev_and_sb which is used under different conditions and the warning makes sense there. Reported-by: Dave Chinner <[email protected]> Signed-off-by: David Sterba <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
2013-02-28Btrfs: fix NULL pointer after aborting a transactionLiu Bo1-1/+7
While doing cleanup work on an aborted transaction, we've set the global running transaction pointer to NULL _before_ waiting all other transaction handles to finish, so others'd hit NULL pointer crash when referencing the global running transaction pointer. This first sets a hint to avoid new transaction handle joining, then waits other existing handles to abort or finish so that we can safely set the above global pointer to NULL. Signed-off-by: Liu Bo <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
2013-02-28Btrfs: fix memory leak of log rootsLiu Bo2-2/+9
When we abort a transaction while fsyncing, we'll skip freeing log roots part of committing a transaction, which leads to memory leak. This adds a 'free log roots' in putting super when no more users hold references on log roots, so it's safe and clean. Signed-off-by: Liu Bo <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
2013-02-28Btrfs: copy everything if we've created an inline extentJosef Bacik1-0/+1
I noticed while looking into a tree logging bug that we aren't logging inline extents properly. Since this requires copying and it shouldn't happen too often just force us to copy everything for the inode into the tree log when we have an inline extent. With this patch we have valid data after a crash when we write an inline extent. Thanks, Cc: [email protected] Signed-off-by: Josef Bacik <[email protected]>
2013-02-28arm: mvebu: enable the SD card slot on Armada 370 Reference Design boardFlorian Fainelli1-0/+7
The Armada 370 Reference Design board has one SD card slot, directly connected to the SDIO IP of the SoC, so we enable this IP. there are no GPIOs for card-detect and write-protect so we do not specify any. Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: kirkwood: topkick: init mvsdio via DTJason Cooper2-6/+7
Signed-off-by: Jason Cooper <[email protected]> Tested-by: Andrew Lunn <[email protected]>
2013-02-28ARM: kirkwood: nsa310: convert to pinctrlJason Cooper4-35/+99
Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: Kirkwood: topkick: Enable i2c bus.Andrew Lunn1-1/+6
Add a DT node for I2C and pinctrl hog for the pins. There appears to be an i2c bus on topkick with a device on it: i2cdetect 0 WARNING! This program can confuse your I2C bus, cause data loss and worse! I will probe file /dev/i2c-0. I will probe address range 0x03-0x77. Continue? [Y/n] y 0 1 2 3 4 5 6 7 8 9 a b c d e f 00: -- -- -- -- -- -- -- -- -- -- -- -- -- 10: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 20: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 30: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 40: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 50: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 60: -- -- -- -- 64 -- -- -- -- -- -- -- -- -- -- -- 70: -- -- -- -- -- -- -- -- Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: kirkwood: topkick: convert to pinctrlJason Cooper2-42/+90
Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: dove: convert serial DT nodes to clocks propertySebastian Hesselbarth1-4/+4
of_serial now has support for using clocks property and we have a DT clock provider. This patch replaces the hard coded clock-frequency property with a clocks phandle to tclk. Signed-off-by: Sebastian Hesselbarth <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: Add SPI flash on Armada 370 DB boardGregory CLEMENT1-0/+12
This patch add support for the SPI flash MX25l25635E which is present on the Armada 370 DB board. This flash stores the bootloader and its environment. Signed-off-by: Gregory CLEMENT <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: Add SPI flash on Armada XP-DB boardGregory CLEMENT1-0/+12
This patch add support for the SPI flash M25P64 which is present on the Armada XP DB board. This flash stores the bootloader and its environment. Signed-off-by: Gregory CLEMENT <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: Add SPI flash on Armada XP-GP boardEzequiel Garcia1-0/+12
This patch adds an SPI master device node for Armada XP-GP board. This master node is an SPI flash controller 'n25q128a13'. Since there is no 'partitions' node declared, one full sized partition named as the device will be created. Cc: Thomas Petazzoni <[email protected]> Cc: Lior Amsalem <[email protected]> Tested-by: Gregory Clement <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Acked-by: Gregory Clement <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: Add support for SPI controller in Armada 370/XPEzequiel Garcia1-0/+21
The Armada 370 and Armada XP SoC has an SPI controller. This patch adds support for this controller in Armada 370 and Armada XP SoC common device tree files. Note that the Armada XP SPI register length is 0x50 bytes, while Armada 370 SPI register length is 0x28 bytes, so we choose the smaller of the two. Cc: Thomas Petazzoni <[email protected]> Cc: Lior Amsalem <[email protected]> Acked-by: Gregory Clement <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28clocksource: update and move armada-370-xp-timer documentation to timer ↵Gregory CLEMENT1-4/+7
directory Timer driver for Armada 370 and Armada XP have gained local timers support. So it needs new resources information regarding the IRQs and the registers. Also move the documentation in the new and more accurate directory Signed-off-by: Gregory CLEMENT <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: update DT to support local timersGregory CLEMENT1-2/+3
Now that the time-armada-370-xp support local timers, updated the device tree to take it into account. Signed-off-by: Gregory CLEMENT <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: Dove: convert usb host controller to DTSebastian Hesselbarth2-10/+16
With DT support for orion-ehci also convert Dove to it and remove the legacy calls and clock aliases. This patch is based on "ARM: Dove: split legacy and DT setup" applied to mvebu/boards recently. Signed-off-by: Sebastian Hesselbarth <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: Enable USB controllers on Armada 370/XP boardsEzequiel Garcia4-0/+34
This patch activates every USB port provided by each SoC. Except for Armada XP Openblocks AX3-4 board, where we enable only the first two USB ports until we have more information on the third one usage. Cc: Lior Amsalem <[email protected]> Cc: Thomas Petazzoni <[email protected]> Cc: Gregory CLEMENT <[email protected]> Tested-by: Nobuhiro Iwamatsu <[email protected]> Tested-by: Florian Fainelli <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: Add support for USB host controllers in Armada 370/XPEzequiel Garcia3-0/+41
The Armada 370 and Armada XP SoC has an Orion EHCI USB controller. This patch adds support for this controller in Armada 370 and Armada XP SoC common device tree files. Cc: Lior Amsalem <[email protected]> Cc: Thomas Petazzoni <[email protected]> Tested-by: Nobuhiro Iwamatsu <[email protected]> Tested-by: Florian Fainelli <[email protected]> Signed-off-by: Gregory CLEMENT <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: add button for OpenBlocks AX3-4Thomas Petazzoni1-0/+12
The OpenBlocks AX3-4 board has one software-controlled button on the front side, labeled "INIT", so we add minimal support for this button in the kernel. Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: Kirkwood: Convert NS2 to gpio-poweroff.Andrew Lunn2-14/+6
Remove C code and add a Device Tree node in its place. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Simon Guinot <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: Kirkwood: Convert NSA310 I2C to device treeAndrew Lunn2-6/+5
Add a sub-node into the I2C node to represent the adt7476 device. Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driverAndrew Lunn2-33/+5
Remove the C code and add a Device Tree node for gpio-poweroff. Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: Kirkwood: Convert NSA310 to DT based regulators.Andrew Lunn2-4/+17
Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: Dove: add fixed regulator for CuBox USB powerSebastian Hesselbarth2-1/+26
CuBox needs to enable USB power on a gpio pin. Add a fixed regulator to always enable usb power on boot. Signed-off-by: Sebastian Hesselbarth <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: Dove: move CuBox led pinctrl to gpio-leds nodeSebastian Hesselbarth1-1/+4
gpio-leds has support for pinctrl allocation, make use of it. Signed-off-by: Sebastian Hesselbarth <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: Kirkwood: Convert openblocks A6 board to pinctrlNobuhiro Iwamatsu2-44/+116
Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: Kirkwood: Add pinctrl of NAND to 88f6282Nobuhiro Iwamatsu1-0/+6
Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282Nobuhiro Iwamatsu1-0/+6
The 88f6282 has one more TWSI(TWSI1). This add the information to enable pinctl of TWSI1. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: kirkwood: add pinmux option for the SDIO interface on 88F6282Thomas Petazzoni1-0/+5
This commit adds a pinmux option, pmx_sdio, to enable the muxing of the SDIO interface on the 88F6282 SoC from Marvell. Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: kirkwood: mplcec4: use Device Tree to probe SDIOThomas Petazzoni2-9/+9
Now that the mvsdio driver has a Device Tree binding, and the SDIO controller is declared in kirkwood.dtsi, migrate the mplcec4 board to use the Device Tree to probe the SDIO controller and to mux the pins of the SDIO interface correctly. This patch has not been tested, it remains to be tested by a person having access to the hardware. Signed-off-by: Thomas Petazzoni <[email protected]> Cc: Stefan Peter <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: kirkwood: dreamplug: use Device Tree to probe SDIOThomas Petazzoni2-6/+7
Now that the mvsdio driver has a Device Tree binding, and the SDIO controller is declared in kirkwood.dtsi, migrate the dreamplug board to use the Device Tree to probe the SDIO controller and to mux this interface properly. Signed-off-by: Thomas Petazzoni <[email protected]> Cc: Jason Cooper <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: kirkwood: add Device Tree informations for the SDIO controllerThomas Petazzoni1-0/+8
Now that the SDIO controller has a Device Tree binding, let's use it in kirkwood.dtsi. Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: enable the SDIO interface on the Globalscale MiraboxThomas Petazzoni1-0/+10
The Globalscale Mirabox uses the SDIO interface of the Armada 370 to connect to a Wifi/Bluetooth SD8787 chip, so we enable the SDIO interface of this board in its Device Tree file. Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: enable the SD card slot on Armada 370 DB boardThomas Petazzoni1-0/+15
The Armada XP DB evaluation board has one SD card slot, directly connected to the SDIO IP of the SoC, so we add a device tree description for it. However, in the default configuration of the board, the SD card slot is not usable: the connector plugged into CON40 must be changed against a different one, provided with the board by the manufacturer. Since such a manual modification of the hardware is needed, we did not enable the SDIO interface by default, and left it to the board user to modify the Device Tree if needed. Since this board is really only an evaluation board for developers and not a final product, it is not too bad. Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: enable the SD card slot on Armada XP DB boardThomas Petazzoni1-0/+7
The Armada XP DB evaluation board has one SD card slot, directly connected to the SDIO IP of the SoC, so we enable this IP. Unfortunately, there are no GPIOs for card-detect and write-protect. Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: add pin muxing options for the SDIO interface on Armada XPThomas Petazzoni3-0/+18
The SDIO interface is only available on pins MPP30/31/32/33/34/35 on the various Armada XP variants, so we provide a pin muxing option for this in the Armada XP .dtsi files. Even though those muxing options are the same for MV78230, MV78260 and MV78460, we keep them in each .dtsi file, because the number of pins, and therefore the declaration of the pinctrl node, is different for each SoC variant. Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: add pin muxing options for the SDIO interface on Armada 370Thomas Petazzoni1-0/+12
The SDIO interface is available either on pins MPP9/11/12/13/14/15 or MPP47/48/49/50/51/52 on the Armada 370. Even though all combinations are potentially possible, those two muxing options are the most probable ones, so we provide those at the SoC level .dtsi file. In practice, in turns out the Armada 370 DB board uses the former, while the Armada 370 Mirabox uses the latter. Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: add DT information for the SDIO interface of Armada 370/XPThomas Petazzoni1-0/+8
Now that the mvsdio MMC driver has a Device Tree binding, we add the Device Tree informations to describe the SDIO interface available in the Armada 370/XP SoCs. Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: Add RTC support for Armada 370 and Armada XPGregory CLEMENT1-0/+6
The Armada 370 and Armada XP Socs have the same controller that the one used in the orion platforms. This patch updates the device tree for these SoCs. Signed-off-by: Gregory CLEMENT <[email protected]> Acked-by: Andrew Lunn <[email protected]> Tested-by: Florian Fainelli <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: update defconfig with ATAG support when using DTGregory CLEMENT1-0/+1
Some of the mvebu boards (mainly the development board) come with plug-in RAM modules. This patch allows to let the bootloaders which have no support for DTS to give the real amount of memory available on the board. Signed-off-by: Gregory CLEMENT <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: mvebu: Update defconfig to select SPI flash and MTD supportEzequiel Garcia1-0/+3
The Armada XP DB-MV784MP-GP board has an SPI flash device. These options allow to access that device over MTD. Signed-off-by: Ezequiel Garcia <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28ARM: mvebu: Update defconfig to select SPI supportEzequiel Garcia1-0/+2
Cc: Thomas Petazzoni <[email protected]> Cc: Lior Amsalem <[email protected]> Acked-by: Gregory Clement <[email protected]> Signed-off-by: Ezequiel Garcia <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: support for the new Armada XP development board(DB-MV784MP-GP)Gregory CLEMENT2-0/+102
This is the new Armada XP evaluation board from Marvell. It comes with a RS232 port over USB, a SATA link, an internal SSD, 4 Ethernet Gigabit links. Support for USB (Host and device), SDIO, PCIe will be added as drivers when they become available for Armada XP in mainline. Tested-by: Simon Guinot <[email protected]> Tested-by: Florian Fainelli <[email protected]> Signed-off-by: Gregory CLEMENT <[email protected]> Tested-by: Ezequiel Garcia <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: update defconfig with local timer supportGregory CLEMENT1-1/+0
Now that we have support for local timers, enable it by default Signed-off-by: Gregory CLEMENT <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28clocksource: time-armada-370-xp: add local timer supportGregory CLEMENT1-38/+112
On the SOCs Armada 370 and Armada XP, each CPU comes with two private timers. This patch use the timer 0 of each CPU as local timer for the clockevent if CONFIG_LOCAL_TIMER is selected. In the other case, use only the private Timer 0 of CPU 0. Signed-off-by: Gregory CLEMENT <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2013-02-28arm: mvebu: Add support for local interruptGregory CLEMENT1-4/+11
MPIC allows the use of private interrupt for each CPUs. The 28th first interrupts are per-cpu. This patch adds support to use them. Signed-off-by: Gregory CLEMENT <[email protected]> Signed-off-by: Jason Cooper <[email protected]>