Merge branch 'qcom/dt' into next/dt

Browse source

* qcom/dt:
  ARM: dts: MSM8974: Add MMIO architected timer node
  ARM: dts: MSM8974: Add restart node
  ARM: msm: Simplify ARCH_MSM_DT config
  ARM: msm: Add support for MSM8974 SoC
  ARM: msm: trout: fix uninit var warning

Signed-off-by: Olof Johansson <olof@lixom.net>

...

This commit is contained in:

Olof Johansson 2014-01-02 10:23:58 -08:00

parent aa1ed457ae 47c5a5d6fd

commit c56569b372

3 changed files with 116 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

97

arch/arm/boot/dts/qcom-msm8974.dtsi

View file

15

arch/arm/mach-msm/Kconfig

View file

12

arch/arm/mach-msm/board-trout.c

View file