| author | Dan Murphy <DMurphy@ti.com> | |
| Wed, 5 Nov 2014 12:33:09 +0000 (06:33 -0600) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Wed, 5 Nov 2014 12:33:09 +0000 (06:33 -0600) | ||
| commit | 8d9e0b637357cb0e0abaa49d47cfc20ea777010c | |
| tree | 0039cf80510e19d1c2df773b9332041654e92b01 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 0a2175ca7d7e8b3160801580e3325ccf3b2abaf1 | commit | diff |
| parent | d4c9e00df1c9d04f4d4794ea2859d08c275e4e1e | commit | diff |
Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.14.y
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: amx3xx: limit the maximum frequency of DPLLs based on spec
ARM: OMAP2+: clock: add support for specifying max rate for DPLLs
ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken
Signed-off-by: Dan Murphy <DMurphy@ti.com>
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: amx3xx: limit the maximum frequency of DPLLs based on spec
ARM: OMAP2+: clock: add support for specifying max rate for DPLLs
ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken
Signed-off-by: Dan Murphy <DMurphy@ti.com>
| arch/arm/mach-omap2/omap_hwmod_7xx_data.c | diff1 | | diff2 | | blob | history |
| drivers/clk/ti/dpll.c | diff1 | | diff2 | | blob | history |
| include/linux/clk/ti.h | diff1 | | diff2 | | blob | history |