diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 12:31:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 12:31:45 -0400 |
commit | 97b1007a2924aaa9126398623f6755a8c3c6a616 (patch) | |
tree | b65c6edb631256e64bb3c72f083fa1be048de097 /arch/arm/boot/dts/sama5d34ek.dts | |
parent | dfab34aa61a0f8c14a67d7b4c1dae28e57ba592d (diff) | |
parent | e0d20b69d3fa74a21ec363989612bddd58b930b8 (diff) |
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform updates from Olof Johansson:
"This branch contains part 1 of the platform updates for 3.10. Among
the highlights:
- Support for the new Atmel Cortex-A5 based platforms (SAMA5D3)
- New support for CSR SiRFatlas6 SoCs
- A handful of updates for NVidia T114 (a.k.a. Tegra 4)
- A bunch of updates for the shmobile platforms
- A handful of updates for davinci
- A few updates for Qualcomm MSM
- Plus a handful of other patches, defconfig updates, etc."
* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (135 commits)
ARM: tegra: pm: fix build error w/o PM_SLEEP
ARM: davinci: ensure global variables are declared
ARM: davinci: sram.c: fix incorrect type in assignment
ARM: davinci: da8xx dt: make file local symbols static
ARM: davinci: da8xx: add remoteproc support
ARM: socfpga: Upgrade clk driver for socfpga to make use of dts clock entries
ARM: socfpga: Add clock entries into device tree
ARM: socfpga: Enable soft reset
ARM: EXYNOS: replace cpumask by the corresponding macro
ARM: EXYNOS: handle properly the return values
ARM: EXYNOS: factor out the idle states
ARM: OMAP4: Enable fix for Cortex-A9 erratas
ARM: OMAP2+: Export SoC information to userspace
ARM: OMAP2+: SoC name and revision unification
ARM: OMAP2+: Move common part of late init into common function
ARM: tegra: pm: remove duplicated include from pm.c
ARM: davinci: da850: override mmc DT node device name
ARM: davinci: da850: add mmc DT entries
mmc: davinci_mmc: add DT support
ARM: SAMSUNG: check processor type before cache restoration in resume
...
Diffstat (limited to 'arch/arm/boot/dts/sama5d34ek.dts')
-rw-r--r-- | arch/arm/boot/dts/sama5d34ek.dts | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sama5d34ek.dts b/arch/arm/boot/dts/sama5d34ek.dts new file mode 100644 index 000000000000..d2739f8d7ae9 --- /dev/null +++ b/arch/arm/boot/dts/sama5d34ek.dts | |||
@@ -0,0 +1,61 @@ | |||
1 | /* | ||
2 | * sama5d34ek.dts - Device Tree file for SAMA5D34-EK board | ||
3 | * | ||
4 | * Copyright (C) 2013 Atmel, | ||
5 | * 2013 Ludovic Desroches <ludovic.desroches@atmel.com> | ||
6 | * | ||
7 | * Licensed under GPLv2 or later. | ||
8 | */ | ||
9 | /dts-v1/; | ||
10 | /include/ "sama5d3xmb.dtsi" | ||
11 | /include/ "sama5d3xdm.dtsi" | ||
12 | |||
13 | / { | ||
14 | model = "Atmel SAMA5D34-EK"; | ||
15 | compatible = "atmel,sama5d34ek", "atmel,sama5ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5"; | ||
16 | |||
17 | ahb { | ||
18 | apb { | ||
19 | spi0: spi@f0004000 { | ||
20 | status = "okay"; | ||
21 | }; | ||
22 | |||
23 | ssc0: ssc@f0008000 { | ||
24 | status = "okay"; | ||
25 | }; | ||
26 | |||
27 | can0: can@f000c000 { | ||
28 | status = "okay"; | ||
29 | }; | ||
30 | |||
31 | i2c0: i2c@f0014000 { | ||
32 | status = "okay"; | ||
33 | }; | ||
34 | |||
35 | i2c1: i2c@f0018000 { | ||
36 | status = "okay"; | ||
37 | |||
38 | 24c256@50 { | ||
39 | compatible = "24c256"; | ||
40 | reg = <0x50>; | ||
41 | pagesize = <64>; | ||
42 | }; | ||
43 | }; | ||
44 | |||
45 | macb0: ethernet@f0028000 { | ||
46 | status = "okay"; | ||
47 | }; | ||
48 | }; | ||
49 | }; | ||
50 | |||
51 | leds { | ||
52 | d3 { | ||
53 | label = "d3"; | ||
54 | gpios = <&pioE 24 0>; | ||
55 | }; | ||
56 | }; | ||
57 | |||
58 | sound { | ||
59 | status = "okay"; | ||
60 | }; | ||
61 | }; | ||