author | Dan Murphy <DMurphy@ti.com> | |
Fri, 29 Aug 2014 16:15:58 +0000 (11:15 -0500) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Fri, 29 Aug 2014 16:15:58 +0000 (11:15 -0500) |
TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-3.14.y
* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
clk: ti: change clock init to use generic of_clk_init
arm: dts: dra7: Change the total dma-req numbers to crossbar channels
arm: dra: Enable dma crossbar support on dra7xx
arm: dts: dra: Add dma-request crossbar phandle to dma-spec
arm: dts: dra: Add dma crossbar node
drivers: dma: Add dma crossbar driver
drivers: omap-dma: Add crossbar line as a resource to omap_chan structure
drivers: dma: omap-dma: Add a seperate xlate function to get router data
drivers: dma: of-dma: Add support for dma-request line routers
drivers: dma: omap-dma: Avoid hard-coding of the dma-request channels
ARM: dts: DRA7: DMM: Fix interrupts property
ARM: dts: DRA7: hwspinlock: Remove interrupts property
ARM: DRA7: hwmod: Fix RNG hwmod flags
Signed-off-by: Dan Murphy <DMurphy@ti.com>
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-3.14.y
* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
clk: ti: change clock init to use generic of_clk_init
arm: dts: dra7: Change the total dma-req numbers to crossbar channels
arm: dra: Enable dma crossbar support on dra7xx
arm: dts: dra: Add dma-request crossbar phandle to dma-spec
arm: dts: dra: Add dma crossbar node
drivers: dma: Add dma crossbar driver
drivers: omap-dma: Add crossbar line as a resource to omap_chan structure
drivers: dma: omap-dma: Add a seperate xlate function to get router data
drivers: dma: of-dma: Add support for dma-request line routers
drivers: dma: omap-dma: Avoid hard-coding of the dma-request channels
ARM: dts: DRA7: DMM: Fix interrupts property
ARM: dts: DRA7: hwspinlock: Remove interrupts property
ARM: DRA7: hwmod: Fix RNG hwmod flags
Signed-off-by: Dan Murphy <DMurphy@ti.com>
1 | 2 | |||
---|---|---|---|---|
arch/arm/boot/dts/dra7.dtsi | patch | | diff1 | | diff2 | | blob | history |
arch/arm/mach-omap2/Kconfig | patch | | diff1 | | diff2 | | blob | history |
arch/arm/mach-omap2/io.c | patch | | diff1 | | diff2 | | blob | history |
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge
diff --cc arch/arm/mach-omap2/Kconfig
Simple merge
diff --cc arch/arm/mach-omap2/io.c
Simple merge
Simple merge