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 /Documentation/devicetree/bindings/misc | |
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 'Documentation/devicetree/bindings/misc')
-rw-r--r-- | Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt b/Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt new file mode 100644 index 000000000000..c7a26ca8da12 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt | |||
@@ -0,0 +1,40 @@ | |||
1 | * Freescale Management Complex | ||
2 | |||
3 | The Freescale Management Complex (fsl-mc) is a hardware resource | ||
4 | manager that manages specialized hardware objects used in | ||
5 | network-oriented packet processing applications. After the fsl-mc | ||
6 | block is enabled, pools of hardware resources are available, such as | ||
7 | queues, buffer pools, I/O interfaces. These resources are building | ||
8 | blocks that can be used to create functional hardware objects/devices | ||
9 | such as network interfaces, crypto accelerator instances, L2 switches, | ||
10 | etc. | ||
11 | |||
12 | Required properties: | ||
13 | |||
14 | - compatible | ||
15 | Value type: <string> | ||
16 | Definition: Must be "fsl,qoriq-mc". A Freescale Management Complex | ||
17 | compatible with this binding must have Block Revision | ||
18 | Registers BRR1 and BRR2 at offset 0x0BF8 and 0x0BFC in | ||
19 | the MC control register region. | ||
20 | |||
21 | - reg | ||
22 | Value type: <prop-encoded-array> | ||
23 | Definition: A standard property. Specifies one or two regions | ||
24 | defining the MC's registers: | ||
25 | |||
26 | -the first region is the command portal for the | ||
27 | this machine and must always be present | ||
28 | |||
29 | -the second region is the MC control registers. This | ||
30 | region may not be present in some scenarios, such | ||
31 | as in the device tree presented to a virtual machine. | ||
32 | |||
33 | Example: | ||
34 | |||
35 | fsl_mc: fsl-mc@80c000000 { | ||
36 | compatible = "fsl,qoriq-mc"; | ||
37 | reg = <0x00000008 0x0c000000 0 0x40>, /* MC portal base */ | ||
38 | <0x00000000 0x08340000 0 0x40000>; /* MC control reg */ | ||
39 | }; | ||
40 | |||