diff options
author | Kevin Hilman <khilman@linaro.org> | 2013-10-14 15:12:01 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-10-14 15:13:44 -0700 |
commit | 6a9d10d529db69244baab335fb02caba3d6ebbc9 (patch) | |
tree | 2466e2f7fb39cfb319450915f42e36bfb8e5dfe8 /include/net/bluetooth/hci.h | |
parent | 7a093c74c7a81bd441d78cb4c6c6260284908bc3 (diff) | |
parent | 163a036468c2eb8f30658dff6c0de6c959f79b0d (diff) |
Merge tag 'socfpga-dts-updates-for-v3.13' of git://git.rocketboards.org/linux-socfpga-next into next/dt
From Dinh Nguyen:
Updates to dts file structure for Altera's SOCFPGA
* Does not include any new bindings or bindings change
* Add dts file for a SOCFPGA with an Arria V FPGA
* Add a clocks property for the TWD timer
* Add support for Terasic SocKit Board which has Cyclone5 FPGA
* From Steffen Trumtrar:
"This series includes some minor cleanups (indentation and clock labels) and
reorders the socfpga dts hierarchy from:
socfpga.dtsi
-> socfpga_$board.dts
-> socfpga_$otherboard.dts
to
socfpga.dtsi
-> socfpga_cyclone5.dtsi
--> socfpga_cyclone5_$board.dts
--> socfpga_cyclone5_$otherboard.dts
"
* tag 'socfpga-dts-updates-for-v3.13' of git://git.rocketboards.org/linux-socfpga-next:
dts: socfpga: Add support for Altera's SOCFPGA Arria V board
ARM: socfpga: dts: fix s2f_* clock name
ARM: socfpga: dts: cleanup indentation
ARM: socfpga: dts: Add support for terasic SoCkit
ARM: socfpga: dts: Move common nodes to cyclone5 dtsi
arm: socfpga: Add clock for smp_twd timer
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'include/net/bluetooth/hci.h')
0 files changed, 0 insertions, 0 deletions