diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-21 00:16:43 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-21 00:16:43 -0400 |
commit | ea832c41dacbc4a5f3888d9ef7c38213914aba2a (patch) | |
tree | bee97817d9a55f000e2bec5fa5d62d325050e6a6 /arch/arm/boot/dts/pxa3xx.dtsi | |
parent | b74aae9a2074e1caa2e40bf119f3a633f77c94e4 (diff) | |
parent | 84bae6c379e362aa017efd417199f51d5c2273ac (diff) |
Merge branch 'next/dt' into next/multiplatform
* next/dt: (182 commits)
ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support
ARM: tegra: Add Avionic Design Medcom-Wide support
ARM: tegra: Add Avionic Design Plutux support
ARM: tegra: Add Avionic Design Tamonten support
ARM: tegra: dts: Add pwm label
ARM: dt: tegra: whistler: configure power off
ARM: mxs: m28evk: Disable OCOTP OUI loading
ARM: imx6q: use pll2_pfd2_396m as the enfc_sel's parent
ARM: dts: imx6q-sabrelite: add usbotg pinctrl support
ARM: dts: imx23-olinuxino: Add USB host support
ARM: dts: imx6q-sabrelite: add usbmisc device
ARM: dts: mx23: Add USB resources
ARM: dts: mxs: Add ethernetX to macX aliases
ARM: msm: Remove non-DT targets from 8960
ARM: msm: Add DT support for 8960
ARM: msm: Move io mapping prototypes to common.h
ARM: msm: Rename board-msm8x60 to signify its DT only status
ARM: msm: Make 8660 a DT only target
ARM: msm: Move 8660 to DT timer
ARM: msm: Add DT support to msm_timer
...
Diffstat (limited to 'arch/arm/boot/dts/pxa3xx.dtsi')
-rw-r--r-- | arch/arm/boot/dts/pxa3xx.dtsi | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi new file mode 100644 index 000000000000..f9d92da86783 --- /dev/null +++ b/arch/arm/boot/dts/pxa3xx.dtsi | |||
@@ -0,0 +1,32 @@ | |||
1 | /* The pxa3xx skeleton simply augments the 2xx version */ | ||
2 | /include/ "pxa2xx.dtsi" | ||
3 | |||
4 | / { | ||
5 | model = "Marvell PXA3xx familiy SoC"; | ||
6 | compatible = "marvell,pxa3xx"; | ||
7 | |||
8 | pxabus { | ||
9 | pwri2c: i2c@40f500c0 { | ||
10 | compatible = "mrvl,pwri2c"; | ||
11 | reg = <0x40f500c0 0x30>; | ||
12 | interrupts = <6>; | ||
13 | #address-cells = <0x1>; | ||
14 | #size-cells = <0>; | ||
15 | status = "disabled"; | ||
16 | }; | ||
17 | |||
18 | nand0: nand@43100000 { | ||
19 | compatible = "marvell,pxa3xx-nand"; | ||
20 | reg = <0x43100000 90>; | ||
21 | interrupts = <45>; | ||
22 | #address-cells = <1>; | ||
23 | #size-cells = <1>; | ||
24 | status = "disabled"; | ||
25 | }; | ||
26 | |||
27 | pxairq: interrupt-controller@40d00000 { | ||
28 | marvell,intc-priority; | ||
29 | marvell,intc-nr-irqs = <56>; | ||
30 | }; | ||
31 | }; | ||
32 | }; | ||