Skip to content

Commit a233bb7

Browse files
torvaldstorvalds
committed
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 ...
2 parents 878ba61 + 880c0d1 commit a233bb7

File tree

249 files changed

+14920
-2428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+14920
-2428
lines changed

‎Documentation/devicetree/bindings/arm/armada-38x.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ Required root node property:
1515

1616
compatible: must contain "marvell,armada385"
1717

18+
In addition, boards using the Marvell Armada 388 SoC shall have the
19+
following property before the previous one:
20+
21+
Required root node property:
22+
23+
compatible: must contain "marvell,armada388"
24+
1825
Example:
1926

2027
compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";

‎Documentation/devicetree/bindings/arm/digicolor.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Conexant Digicolor Platforms Device Tree Bindings
2+
3+
Each device tree must specify which Conexant Digicolor SoC it uses.
4+
Must be the following compatible string:
5+
6+
cnxt,cx92755

‎Documentation/devicetree/bindings/arm/exynos/power_domain.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Optional Properties:
2323
devices in this power domain. Maximum of 4 pairs (N = 0 to 3)
2424
are supported currently.
2525

26-
Node of a device using power domains must have a samsung,power-domain property
26+
Node of a device using power domains must have a power-domains property
2727
defined with a phandle to respective power domain.
2828

2929
Example:

‎Documentation/devicetree/bindings/arm/fsl.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,11 @@ Example:
124124
compatible = "fsl,ls1021a-dcfg";
125125
reg = <0x0 0x1ee0000 0x0 0x10000>;
126126
};
127+
128+
Freescale LS2085A SoC Device Tree Bindings
129+
------------------------------------------
130+
131+
LS2085A ARMv8 based Simulator model
132+
Required root node properties:
133+
- compatible = "fsl,ls2085a-simu", "fsl,ls2085a";
134+

‎Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ HiP04 D01 Board
99
Required root node properties:
1010
- compatible = "hisilicon,hip04-d01";
1111

12+
HiP01 ca9x2 Board
13+
Required root node properties:
14+
- compatible = "hisilicon,hip01-ca9x2";
15+
1216

1317
Hisilicon system controller
1418

@@ -36,6 +40,27 @@ Example:
3640
reboot-offset = <0x4>;
3741
};
3842

43+
-----------------------------------------------------------------------
44+
Hisilicon HiP01 system controller
45+
46+
Required properties:
47+
- compatible : "hisilicon,hip01-sysctrl"
48+
- reg : Register address and size
49+
50+
The HiP01 system controller is mostly compatible with hisilicon
51+
system controller,but it has some specific control registers for
52+
HIP01 SoC family, such as slave core boot, and also some same
53+
registers located at different offset.
54+
55+
Example:
56+
57+
/* for hip01-ca9x2 */
58+
sysctrl: system-controller@10000000 {
59+
compatible = "hisilicon,hip01-sysctrl", "hisilicon,sysctrl";
60+
reg = <0x10000000 0x1000>;
61+
reboot-offset = <0x4>;
62+
};
63+
3964
-----------------------------------------------------------------------
4065
Hisilicon CPU controller
4166

‎Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Required properties:
77
- compatible: should be one of:
88
"mediatek,mt8135-sysirq"
99
"mediatek,mt8127-sysirq"
10+
"mediatek,mt6592-sysirq"
1011
"mediatek,mt6589-sysirq"
1112
"mediatek,mt6582-sysirq"
1213
"mediatek,mt6577-sysirq"

‎Documentation/devicetree/bindings/arm/rockchip.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@ Rockchip platforms device tree bindings
99
Required root node properties:
1010
- compatible = "mundoreader,bq-curie2", "rockchip,rk3066a";
1111

12+
- ChipSPARK Rayeager PX2 board:
13+
Required root node properties:
14+
- compatible = "chipspark,rayeager-px2", "rockchip,rk3066a";
15+
1216
- Radxa Rock board:
1317
Required root node properties:
1418
- compatible = "radxa,rock", "rockchip,rk3188";
19+
20+
- Firefly Firefly-RK3288 board:
21+
Required root node properties:
22+
- compatible = "firefly,firefly-rk3288", "rockchip,rk3288";
23+
or
24+
- compatible = "firefly,firefly-rk3288-beta", "rockchip,rk3288";

‎Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
SAMSUNG Exynos SoCs Chipid driver.
2+
3+
Required properties:
4+
- compatible : Should at least contain "samsung,exynos4210-chipid".
5+
6+
- reg: offset and length of the register set
7+
8+
Example:
9+
chipid@10000000 {
10+
compatible = "samsung,exynos4210-chipid";
11+
reg = <0x10000000 0x100>;
12+
};

‎Documentation/devicetree/bindings/arm/sirf.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ CSR SiRFprimaII and SiRFmarco device tree bindings.
33

44
Required root node properties:
55
- compatible:
6+
- "sirf,atlas6-cb" : atlas6 "cb" evaluation board
7+
- "sirf,atlas6" : atlas6 device based board
8+
- "sirf,atlas7-cb" : atlas7 "cb" evaluation board
9+
- "sirf,atlas7" : atlas7 device based board
610
- "sirf,prima2-cb" : prima2 "cb" evaluation board
7-
- "sirf,marco-cb" : marco "cb" evaluation board
811
- "sirf,prima2" : prima2 device based board
9-
- "sirf,marco" : marco device based board

‎Documentation/devicetree/bindings/bus/mvebu-mbus.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Required properties:
66
- compatible: Should be set to one of the following:
77
marvell,armada370-mbus
88
marvell,armadaxp-mbus
9-
marvell,armada370-mbus
10-
marvell,armadaxp-mbus
9+
marvell,armada375-mbus
10+
marvell,armada380-mbus
1111
marvell,kirkwood-mbus
1212
marvell,dove-mbus
1313
marvell,orion5x-88f5281-mbus

0 commit comments

Comments
 (0)