Merge branch 'prima2/soc' into next/soc

Browse source

From Barry Song <Barry.Song@csr.com>:

SiRFatlas6 is much similar with SiRFprimaII with some changes about:
1. deleted l2 cache, sdmmc4, multimedia and so on
2. changed pinmux layout and clock layout
3. DMA access limitation disappears, that makes us not need DMA_ZONE
   on atlas6

* prima2/soc:
  ARM/dts: prima2: add .dtsi for atlas6 and .dts for atla6-evb board
  arm: prima2: add new SiRFatlas6 machine in common board

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

...

This commit is contained in:

Arnd Bergmann 2013-03-18 17:16:37 +01:00

parent f6161aa153 5fa2f9af76

commit 54fb32c06e

4 changed files with 776 additions and 1 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

78

arch/arm/boot/dts/atlas6-evb.dts

View file

668

arch/arm/boot/dts/atlas6.dtsi

View file

10

arch/arm/mach-prima2/Kconfig

View file

21

arch/arm/mach-prima2/common.c

View file