summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAgeFilesLines
* MMC: dw_mmc: PIO mode fixesAndrey Panov2015-03-091-73/+56
| | | | | | | | | | Simplify PIO mode routines. Fix a bug when IO is possibly performed twice because of using old interrupt status. Support for slow-speed card writes. Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/tegra'Sascha Hauer2015-03-092-4/+7
|\
| * mci: tegra: handle mmc aliasesLucas Stach2015-03-041-0/+3
| | | | | | | | | | | | | | | | This allows to have fixed device names for the SDMMC controllers. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * of: make of_alias_get work on all types of DT pathsLucas Stach2015-03-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | of_alias_get assumed that a DT path is always the full node path, whic is not necessarily the case, as there are other valid path descriptions. All of them are handled by of_find_node_by_path. As there is already a preparsed list with all DT aliases that handles this case properly we can simply reuse that one. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/streaming-dma'Sascha Hauer2015-03-0935-171/+264
|\ \ | | | | | | | | | | | | Conflicts: drivers/mci/dw_mmc.c
| * | usb: host: ohci: convert to streaming DMA opsLucas Stach2015-03-061-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | usb: host: ehci: convert to streaming DMA opsLucas Stach2015-03-061-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | usb: gadget: fsl_udc: convert to streaming DMA opsLucas Stach2015-03-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: xgmac: convert to streaming DMA opsLucas Stach2015-03-061-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: rtl8169: convert to streaming DMA opsLucas Stach2015-03-062-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: orion-gbe: convert to streaming DMA opsLucas Stach2015-03-061-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: macb: convert to streaming DMA opsLucas Stach2015-03-061-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: fec: convert to streaming DMA opsLucas Stach2015-03-061-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: designware: convert to streaming DMA opsLucas Stach2015-03-061-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: davinci_emac: convert to streaming DMA opsLucas Stach2015-03-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: at91_ether: convert to streaming DMA opsLucas Stach2015-03-061-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: cpsw: convert to streaming DMA opsLucas Stach2015-03-061-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: arc-emac: convert to streaming DMA opsLucas Stach2015-03-061-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | MCI: tegra-sdmmc: convert to streaming DMA opsLucas Stach2015-03-061-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | MCI: imx: convert to streaming DMA opsLucas Stach2015-03-061-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | MCI: dw-mmc: convert to streaming DMA opsLucas Stach2015-03-062-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | AHCI: convert to streaming DMA opsLucas Stach2015-03-061-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move to the common streaming DMA ops in order to get rid of the direct usage of the ARM MMU functions for the cache maintenance. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: move DMA alloc functions to dma.hLucas Stach2015-03-0629-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This better separates the DMA from the MMU functionality. Also move all drivers that only depends on asm/mmu.h for the alloc functions over to the common header. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: change dma_alloc/free_coherent to match other architecturesLucas Stach2015-03-0622-52/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | As a lot drivers currently rely on the 1:1 virt->phys mapping on ARM we define DMA_ADDRESS_BROKEN to mark them. In order to use them on other architectures with a different mapping they need proper fixing. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | NIOS2: use dma_addr_t in dma_alloc_coherentLucas Stach2015-03-061-1/+1
| |/ | | | | | | | | | | | | | | | | This allows to consolidate the prototype of this function across architectures. Also guard against calles that pass in NULL as the dma handle pointer. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/rockchip'Sascha Hauer2015-03-0916-115/+2654
|\ \ | | | | | | | | | | | | Conflicts: arch/arm/Kconfig
| * | MMC: dw_mmc: Add support for PIO mode and Rockchip variant of this hardwareAndrey Panov2015-03-052-15/+194
| | | | | | | | | | | | | | | Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: Rockchip: Update clk driver from Linux kernel for use with newer DTSAndrey Panov2015-03-057-87/+2096
| | | | | | | | | | | | | | | Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | NET: arc_emac: Update for newer DTS, support for Rockchip .compatibleAndrey Panov2015-03-051-7/+17
| | | | | | | | | | | | | | | Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | CLK: Check and do not allow to register clock twiceAndrey Panov2015-03-051-0/+10
| | | | | | | | | | | | | | | Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | CLK: clk-divider: Respect CLK_DIVIDER_POWER_OF_TWO flagAndrey Panov2015-03-051-0/+9
| | | | | | | | | | | | | | | Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | CLK: clk-divider: Introduce clk_divider_alloc() and *_free() routinesAndrey Panov2015-03-051-5/+22
| | | | | | | | | | | | | | | Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | CLK: clk-divider: Respect CLK_DIVIDER_HIWORD_MASK flagAndrey Panov2015-03-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | It is required for Rockchip SoCs where clock settings registers have write-enable mask in high word. Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | CLK: clk-mux: Respect CLK_MUX_HIWORD_MASK flagAndrey Panov2015-03-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | It is required for Rockchip SoCs where clock settings registers have write-enable mask in high word. Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | CLK: Add fractional divider clock support from Linux kernelAndrey Panov2015-03-052-1/+154
| | | | | | | | | | | | | | | Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | CLK: Add support for composite clock from Linux kernelAndrey Panov2015-03-052-1/+146
| |/ | | | | | | | | Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/misc'Sascha Hauer2015-03-094-15/+72
|\ \
| * | clk: Treat NULL as dummy clocksSascha Hauer2015-03-051-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | NULL pointers should be treated as dummy clocks as done in the kernel. Using a not fully filled in clk * array for of_clk_add_provider may result in NULL clks. When these are passed into the clk framework we should not crash. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | led: gpio: add support for default-state dt-propertyHubert Feurstein2015-03-041-0/+8
| | | | | | | | | | | | | | | | | | | | | This patch adds support for the default-state device tree property. Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: designware: don't depend on CONFIG_OFTREELucas Stach2015-03-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver is written in a way that is should also work without DT, but it had a compile time dependency on CONFIG_OFTREE. Fixes: drivers/built-in.o: In function `dwc_probe_dt': drivers/net/designware.c:413: undefined reference to `of_get_phy_mode' Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | firmware: altera: Make nSTAT GPIO optionalAndrey Smirnov2015-02-191-15/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By taking parts of the programming handshaking protocol on faith it is possible to make due with only two GPIO for programming Altera FPGAs. This is not a very advisable practice, but sometime unavoidable in GPIO constrained designs. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/imx'Sascha Hauer2015-03-091-8/+6
|\ \ \
| * | | PWM: i.MX: register successfully without aliasSascha Hauer2015-03-091-8/+6
| |/ / | | | | | | | | | | | | | | | | | | When a PWM does not have an of alias generate a name from the base address so that we can register it successfully. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/sandbox-of'Sascha Hauer2015-03-063-10/+4
|\ \ \
| * | | of/base: fix sparse warning, don't use integer 0 as NULL pointerMarc Kleine-Budde2015-03-031-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | of_path: of_find_path(): remove unused variable lenMarc Kleine-Budde2015-03-031-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | drivers: remove unused function dev_protect()Marc Kleine-Budde2015-03-031-6/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/mtd-partitions'Sascha Hauer2015-03-063-9/+234
|\ \ \ \
| * | | | mtd: fixup device tree partitionsSascha Hauer2015-02-121-0/+64
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | mtd: Add a partitions parameter to mtd devicesSascha Hauer2015-02-121-1/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The partitions parameter allows to partition a mtd device using a standard cmdline partition description string. This way the partitions of a mtd device can be changed at once. The output of the string can be used to be passed to the kernel as cmdline partition string. The partitions can also still be changed with addpart/delpart, the partitions parameter will be updated accordingly. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>