From: Olof Johansson Date: Fri, 16 May 2014 23:07:37 +0000 (-0700) Subject: Merge tag 'socfpga-dt-updates-for-3.16_v3' of git://git.rocketboards.org/linux-socfpg... X-Git-Tag: v3.16-rc1~30^2~41^2~27 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2bfac3a551978c4953f659e1bd18d58c3c249f64;p=linux.git 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 --- 2bfac3a551978c4953f659e1bd18d58c3c249f64