diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 18:11:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 18:11:01 +0200 |
| commit | 85aea469ef65091ddcfadb848af1ef7ef1d9cedd (patch) | |
| tree | 110a0ceb0797f756b3ff35d82deb2e6b53376bd0 /arch/arm/mach-bcm/bcm_kona_smc.h | |
| parent | 767bf9f00ec753a3bba653844d7b858b8720707f (diff) | |
| parent | d903bc9ee9b67410d02923d98a8dd4ecf5a1bc69 (diff) | |
Merge tag 'mvebu-fixes-3.15-2' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for v3.15 (incremental #2)
- Armada 38x
- fix PCIe dt nodes for handling more interfaces
- mvebu
- mvebu-soc-id: fix clock handling and PCIe interface disabling.
* tag 'mvebu-fixes-3.15-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: fix definitions of PCIe interfaces on Armada 38x
ARM: mvebu: mvebu-soc-id: keep clock enabled if PCIe unit is enabled
ARM: mvebu: mvebu-soc-id: add missing clk_put() call
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-bcm/bcm_kona_smc.h')
0 files changed, 0 insertions, 0 deletions