summaryrefslogtreecommitdiffstats
path: root/include/keys
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-05-23 22:35:56 +0200
committerArnd Bergmann <arnd@arndb.de>2014-05-23 22:35:56 +0200
commit21c27cabe69bdce92130364efe5d945323b37986 (patch)
treed1d00cf490b0e548226a4cece2e17de1cd20e151 /include/keys
parentdee1c20c2a16bb73f1efaed5a535fcc64fdeb72d (diff)
parentca766449a8116f8174e9928d1f4889a858c07610 (diff)
Merge tag 'sti-dt-for-v3.16-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/dt
Merge "ARM: STi: DT changes for v3.16, v3" from Maxime Coquelin: Please consider these STi DT updates for v3.16. This 3rd version takes into account Olof's comments on the v2: - Fix upper-cases in labels and node names - Sort compatibles order from specific to generic - Sort dts entries in Makefile It also adds support for the B2020 revision E board for STiH416 SoC. Note that two reset patches are part of this pull request, in order to avoid compilation breakage. Adding these two patches in this pull request has been accepted by Philipp Zabel. * tag 'sti-dt-for-v3.16-1' of git://git.stlinux.com/devel/kernel/linux-sti: (23 commits) ARM: sti: stih41x: Provide a proper header for this DTSI file ARM: sti: stih416: Enable board LED support for B2020 RevE ARM: sti: stih416: Add support for B2020 RevE ARM: STi: DT: STiH41x Add clk_ignore_unused to bootargs ARM: STi: DT: STiH415: 415 DT Entry for clockgen A9 ARM: STi: DT: STiH415: Remove unused CLK_S_GMAC0_PHY & CLK_S_ETH1_PHY fixed clocks ARM: STi: DT: STiH415: Remove unused CLK_S_ICN_REG_0 fixed clock ARM: STi: DT: STiH415: 415 DT Entry for clockgen A0/1/10/11/12 ARM: STi: DT: STiH416: 416 DT Entry for clockgen A9/DDR/GPU ARM: STi: DT: STiH416: 416 DT Entry for clockgen B/C/D/E/F ARM: STi: DT: STiH416: Remove unused CLK_S_GMAC0_PHY & CLK_S_ETH1_PHY fixed clocks ARM: STi: DT: STiH416: Remove unused CLK_S_ICN_REG_0 fixed clock ARM: STi: DT: STiH416: 416 DT Entry for clockgen A0/1/10/11/12 ARM: STi: DT: STiH41x: Rename CLK_SYSIN into clk_sysin ARM: STi: DT: add keyscan for stih41x-b2000 ARM: STi: DT: add keyscan for stih416 ARM: STi: DT: add keyscan for stih415 driver: reset: sti: add keyscan for stih416 driver: reset: sti: add keyscan for stih415 ARM: dts: STiH407: Add B2120 board support ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/keys')
0 files changed, 0 insertions, 0 deletions