diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 12:36:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 12:36:52 -0500 |
commit | a233bb742aed62fc6164073d9835135f639b8828 (patch) | |
tree | 4cec22b707a29a52f9946da6393c9580221d0a6e /arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | |
parent | 878ba61aa98cbb97a513757800e77613f856a029 (diff) | |
parent | 880c0d140deb12d5be39a96375fcc42ad357f17d (diff) |
Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC DT updates from Olof Johansson:
"DT changes continue to be the bulk of our merge window contents.
We continue to have a large set of changes across the board as new
platforms and drivers are added.
Some of the new platforms are:
- Alphascale ASM9260
- Marvell Armada 388
- CSR Atlas7
- TI Davinci DM816x
- Hisilicon HiP01
- ST STiH418
There have also been some sweeping changes, including relicensing of
DTS contents from GPL to GPLv2+/X11 so that the same files can be
reused in other non-GPL projects more easily. There's also been
changes to the DT Makefile to make it a little less conflict-ridden
and churny down the road"
* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (330 commits)
ARM: dts: Add PPMU node for exynos4412-trats2
ARM: dts: Add PPMU node for exynos3250-monk and exynos3250-rinato
ARM: dts: Add PPMU dt node for exynos4 and exynos4210
ARM: dts: Add PPMU dt node for exynos3250
ARM: dts: add mipi dsi device node for exynos4415
ARM: dts: add fimd device node for exynos4415
ARM: dts: Add syscon phandle to the video-phy node for Exynos4
ARM: dts: Add sound nodes for exynos4412-trats2
ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2
ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsi
ARM: dts: Add max77693 charger node for exynos4412-trats2
ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2
ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2
ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2
ARM: dts: am57xx-beagle-x15: Fix USB2 mode
ARM: dts: am57xx-beagle-x15: Add extcon nodes for USB
ARM: dts: dra72-evm: Add extcon nodes for USB
ARM: dts: dra7-evm: Add extcon nodes for USB
ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boards
ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb
...
Diffstat (limited to 'arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts')
-rw-r--r-- | arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts new file mode 100644 index 000000000000..7d6868acb1c6 --- /dev/null +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | |||
@@ -0,0 +1,37 @@ | |||
1 | /* | ||
2 | * Broadcom BCM470X / BCM5301X ARM platform code. | ||
3 | * DTS for Buffalo WZR-900DHP | ||
4 | * | ||
5 | * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com> | ||
6 | * | ||
7 | * Licensed under the GNU/GPL. See COPYING for details. | ||
8 | */ | ||
9 | |||
10 | /dts-v1/; | ||
11 | |||
12 | #include "bcm47081.dtsi" | ||
13 | |||
14 | / { | ||
15 | compatible = "buffalo,wzr-900dhp", "brcm,bcm47081", "brcm,bcm4708"; | ||
16 | model = "Buffalo WZR-900DHP (BCM47081)"; | ||
17 | |||
18 | chosen { | ||
19 | bootargs = "console=ttyS0,115200"; | ||
20 | }; | ||
21 | |||
22 | memory { | ||
23 | reg = <0x00000000 0x08000000>; | ||
24 | }; | ||
25 | |||
26 | gpio-keys { | ||
27 | compatible = "gpio-keys"; | ||
28 | #address-cells = <1>; | ||
29 | #size-cells = <0>; | ||
30 | |||
31 | restart { | ||
32 | label = "Reset"; | ||
33 | linux,code = <KEY_RESTART>; | ||
34 | gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>; | ||
35 | }; | ||
36 | }; | ||
37 | }; | ||