diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-17 03:07:37 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-17 03:07:37 +0400 |
| commit | 2bfac3a551978c4953f659e1bd18d58c3c249f64 (patch) | |
| tree | ac7d0038c89e1112dfae08702549ecce02213a07 /mm/memory.c | |
| parent | 2542f928b2131a0367e50a4390afc12084cc4cc4 (diff) | |
| parent | 8cb289ed60668d3350dda5aa19b4fa1dce1c07f1 (diff) | |
| download | linux-2bfac3a551978c4953f659e1bd18d58c3c249f64.tar.xz | |
Merge tag 'socfpga-dt-updates-for-3.16_v3' of git://git.rocketboards.org/linux-socfpga-next into next/dt
Merge "dts: socfpga: general updates for the socfpga platform" from Dinh
Nguyen:
Mostly DTS additions to the SOCFPGA platform from Steffan Trumtrar, and a
couple of device tree documentation updates/typo fix.
This one does not the GPIO binding patch, as that is pending further
discussion. Also, v3 fixes a rebase artifact and compile tested.
* tag 'socfpga-dt-updates-for-3.16_v3' of git://git.rocketboards.org/linux-socfpga-next:
ARM: socfpga: dts: Add div-reg to the main_pll clocks
ARM: socfpga: dts: add reset-controller
Documentation: dt: reset: move socfpga-reset
Documentation: dt: socfpga: add reset-cells property
ARM: socfpga: dts: Add DTS entries for USB
ARM: socfpga: dts: Remove hard coded clock-frequency property
ARM: socfpga: dts: add eeprom and rtc on i2c0
ARM: socfpga: dts: convert to preprocessor includes
ARM: socfpga: dts: add rtc on i2c0 to socrates
ARM: socfpga: dts: add support for EBV SOCrates
ARM: socfpga: dts: add can0+1
ARM: socfpga: dts: add i2c busses
ARM: socfpga: dts: add remaining interrupts for pdma
ARM: socfpga: dts: fix pdma interrupt
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions