diff options
author | Linus Torvalds | 2017-05-09 12:07:33 -0500 |
---|---|---|
committer | Linus Torvalds | 2017-05-09 12:07:33 -0500 |
commit | c6778ff813d2ca3e3c8733c87dc8b6831a64578b (patch) | |
tree | cc0a79f229fdcd723a7597500dcda06e6a4d9deb /Documentation | |
parent | 0ff4c01b279a590a2826ade9321ad8c7ca5a1b6c (diff) | |
parent | 3c0e3abd5ee59acbcbd5d8fc624eaf63f6e7b53c (diff) | |
download | kernel-c6778ff813d2ca3e3c8733c87dc8b6831a64578b.tar.gz kernel-c6778ff813d2ca3e3c8733c87dc8b6831a64578b.tar.xz kernel-c6778ff813d2ca3e3c8733c87dc8b6831a64578b.zip |
Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM 64-bit DT updates from Olof Johansson:
"Device-tree updates for arm64 platforms. Just as with 32-bit, a bunch
of smaller changes, but also some new platforms that are worth
mentioning:
- Rockchip RK3399 platforms for Chromebooks, including Samsung
Chromebook Plus (Kevin)
- Orange Pi PC2 (Allwinner H5)
- Freescale LS2088A and LS1088A SoCs
- Expanded support for Nvidia Tegra186 (and Jetson TX2)"
* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (180 commits)
arm64: dts: Add basic DT to support Spreadtrum's SP9860G
arm64: dts: exynos: Use - instead of @ for DT OPP entries
arm64: dts: exynos: Add support for s6e3hf2 panel device on TM2e board
arm64: dts: juno: add information about L1 and L2 caches
arm64: dts: juno: fix few unit address format warnings
arm64: marvell: dts: enable the crypto engine on the Armada 8040 DB
arm64: marvell: dts: enable the crypto engine on the Armada 7040 DB
arm64: marvell: dts: add crypto engine description for 7k/8k
arm64: dts: marvell: add sdhci support for Armada 7K/8K
arm64: dts: marvell: add eMMC support for Armada 37xx
arm64: dts: hisi: add pinctrl dtsi file for HiKey960 development board
arm64: dts: hisi: add drive strength levels of the pins for Hi3660 SoC
arm64: dts: hisi: enable the NIC and SAS for the hip07-d05 board
arm64: dts: hisi: add SAS nodes for the hip07 SoC
arm64: dts: hisi: add RoCE nodes for the hip07 SoC
arm64: dts: hisi: add network related nodes for the hip07 SoC
arm64: dts: hisi: add mbigen nodes for the hip07 SoC
arm64: dts: rockchip: fix the memory size of PX5 Evaluation board
arm64: dts: hisilicon: add dts files for hi3798cv200-poplar board
dt-bindings: arm: hisilicon: add bindings for hi3798cv200 SoC and Poplar board
...
Diffstat (limited to 'Documentation')
10 files changed, 73 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt index c246cd2730d9..bfd5b558477d 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.txt +++ b/Documentation/devicetree/bindings/arm/amlogic.txt | |||
@@ -43,8 +43,11 @@ Board compatible values: | |||
43 | - "wetek,hub" (Meson gxbb) | 43 | - "wetek,hub" (Meson gxbb) |
44 | - "wetek,play2" (Meson gxbb) | 44 | - "wetek,play2" (Meson gxbb) |
45 | - "amlogic,p212" (Meson gxl s905x) | 45 | - "amlogic,p212" (Meson gxl s905x) |
46 | - "khadas,vim" (Meson gxl s905x) | ||
47 | |||
46 | - "amlogic,p230" (Meson gxl s905d) | 48 | - "amlogic,p230" (Meson gxl s905d) |
47 | - "amlogic,p231" (Meson gxl s905d) | 49 | - "amlogic,p231" (Meson gxl s905d) |
50 | - "hwacom,amazetv" (Meson gxl s905x) | ||
48 | - "amlogic,q200" (Meson gxm s912) | 51 | - "amlogic,q200" (Meson gxm s912) |
49 | - "amlogic,q201" (Meson gxm s912) | 52 | - "amlogic,q201" (Meson gxm s912) |
50 | - "nexbox,a95x" (Meson gxbb or Meson gxl s905x) | 53 | - "nexbox,a95x" (Meson gxbb or Meson gxl s905x) |
diff --git a/Documentation/devicetree/bindings/arm/cavium-thunder2.txt b/Documentation/devicetree/bindings/arm/cavium-thunder2.txt new file mode 100644 index 000000000000..dc5dd65cbce7 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/cavium-thunder2.txt | |||
@@ -0,0 +1,8 @@ | |||
1 | Cavium ThunderX2 CN99XX platform tree bindings | ||
2 | ---------------------------------------------- | ||
3 | |||
4 | Boards with Cavium ThunderX2 CN99XX SoC shall have the root property: | ||
5 | compatible = "cavium,thunderx2-cn9900", "brcm,vulcan-soc"; | ||
6 | |||
7 | These SoC uses the "cavium,thunder2" core which will be compatible | ||
8 | with "brcm,vulcan". | ||
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt index 698ad1f097fa..1030f5f50207 100644 --- a/Documentation/devicetree/bindings/arm/cpus.txt +++ b/Documentation/devicetree/bindings/arm/cpus.txt | |||
@@ -170,6 +170,7 @@ nodes to be present and contain the properties described below. | |||
170 | "brcm,brahma-b15" | 170 | "brcm,brahma-b15" |
171 | "brcm,vulcan" | 171 | "brcm,vulcan" |
172 | "cavium,thunder" | 172 | "cavium,thunder" |
173 | "cavium,thunder2" | ||
173 | "faraday,fa526" | 174 | "faraday,fa526" |
174 | "intel,sa110" | 175 | "intel,sa110" |
175 | "intel,sa1100" | 176 | "intel,sa1100" |
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt index c9c567ae227f..cdb9dd705754 100644 --- a/Documentation/devicetree/bindings/arm/fsl.txt +++ b/Documentation/devicetree/bindings/arm/fsl.txt | |||
@@ -179,6 +179,18 @@ LS1046A ARMv8 based RDB Board | |||
179 | Required root node properties: | 179 | Required root node properties: |
180 | - compatible = "fsl,ls1046a-rdb", "fsl,ls1046a"; | 180 | - compatible = "fsl,ls1046a-rdb", "fsl,ls1046a"; |
181 | 181 | ||
182 | LS1088A SoC | ||
183 | Required root node properties: | ||
184 | - compatible = "fsl,ls1088a"; | ||
185 | |||
186 | LS1088A ARMv8 based QDS Board | ||
187 | Required root node properties: | ||
188 | - compatible = "fsl,ls1088a-qds", "fsl,ls1088a"; | ||
189 | |||
190 | LS1088A ARMv8 based RDB Board | ||
191 | Required root node properties: | ||
192 | - compatible = "fsl,ls1088a-rdb", "fsl,ls1088a"; | ||
193 | |||
182 | LS2080A SoC | 194 | LS2080A SoC |
183 | Required root node properties: | 195 | Required root node properties: |
184 | - compatible = "fsl,ls2080a"; | 196 | - compatible = "fsl,ls2080a"; |
@@ -195,3 +207,14 @@ LS2080A ARMv8 based RDB Board | |||
195 | Required root node properties: | 207 | Required root node properties: |
196 | - compatible = "fsl,ls2080a-rdb", "fsl,ls2080a"; | 208 | - compatible = "fsl,ls2080a-rdb", "fsl,ls2080a"; |
197 | 209 | ||
210 | LS2088A SoC | ||
211 | Required root node properties: | ||
212 | - compatible = "fsl,ls2088a"; | ||
213 | |||
214 | LS2088A ARMv8 based QDS Board | ||
215 | Required root node properties: | ||
216 | - compatible = "fsl,ls2088a-qds", "fsl,ls2088a"; | ||
217 | |||
218 | LS2088A ARMv8 based RDB Board | ||
219 | Required root node properties: | ||
220 | - compatible = "fsl,ls2088a-rdb", "fsl,ls2088a"; | ||
diff --git a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt index f1c1e21a8110..2e732152064b 100644 --- a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt +++ b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt | |||
@@ -4,6 +4,14 @@ Hi3660 SoC | |||
4 | Required root node properties: | 4 | Required root node properties: |
5 | - compatible = "hisilicon,hi3660"; | 5 | - compatible = "hisilicon,hi3660"; |
6 | 6 | ||
7 | Hi3798cv200 SoC | ||
8 | Required root node properties: | ||
9 | - compatible = "hisilicon,hi3798cv200"; | ||
10 | |||
11 | Hi3798cv200 Poplar Board | ||
12 | Required root node properties: | ||
13 | - compatible = "hisilicon,hi3798cv200-poplar", "hisilicon,hi3798cv200"; | ||
14 | |||
7 | Hi4511 Board | 15 | Hi4511 Board |
8 | Required root node properties: | 16 | Required root node properties: |
9 | - compatible = "hisilicon,hi3620-hi4511"; | 17 | - compatible = "hisilicon,hi3620-hi4511"; |
diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt index 6b8d50a0ee78..c965d99e86c2 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.txt +++ b/Documentation/devicetree/bindings/arm/rockchip.txt | |||
@@ -59,6 +59,17 @@ Rockchip platforms device tree bindings | |||
59 | - compatible = "google,veyron-brain-rev0", "google,veyron-brain", | 59 | - compatible = "google,veyron-brain-rev0", "google,veyron-brain", |
60 | "google,veyron", "rockchip,rk3288"; | 60 | "google,veyron", "rockchip,rk3288"; |
61 | 61 | ||
62 | - Google Gru (dev-board): | ||
63 | Required root node properties: | ||
64 | - compatible = "google,gru-rev15", "google,gru-rev14", | ||
65 | "google,gru-rev13", "google,gru-rev12", | ||
66 | "google,gru-rev11", "google,gru-rev10", | ||
67 | "google,gru-rev9", "google,gru-rev8", | ||
68 | "google,gru-rev7", "google,gru-rev6", | ||
69 | "google,gru-rev5", "google,gru-rev4", | ||
70 | "google,gru-rev3", "google,gru-rev2", | ||
71 | "google,gru", "rockchip,rk3399"; | ||
72 | |||
62 | - Google Jaq (Haier Chromebook 11 and more): | 73 | - Google Jaq (Haier Chromebook 11 and more): |
63 | Required root node properties: | 74 | Required root node properties: |
64 | - compatible = "google,veyron-jaq-rev5", "google,veyron-jaq-rev4", | 75 | - compatible = "google,veyron-jaq-rev5", "google,veyron-jaq-rev4", |
@@ -73,6 +84,15 @@ Rockchip platforms device tree bindings | |||
73 | "google,veyron-jerry-rev3", "google,veyron-jerry", | 84 | "google,veyron-jerry-rev3", "google,veyron-jerry", |
74 | "google,veyron", "rockchip,rk3288"; | 85 | "google,veyron", "rockchip,rk3288"; |
75 | 86 | ||
87 | - Google Kevin (Samsung Chromebook Plus): | ||
88 | Required root node properties: | ||
89 | - compatible = "google,kevin-rev15", "google,kevin-rev14", | ||
90 | "google,kevin-rev13", "google,kevin-rev12", | ||
91 | "google,kevin-rev11", "google,kevin-rev10", | ||
92 | "google,kevin-rev9", "google,kevin-rev8", | ||
93 | "google,kevin-rev7", "google,kevin-rev6", | ||
94 | "google,kevin", "google,gru", "rockchip,rk3399"; | ||
95 | |||
76 | - Google Mickey (Asus Chromebit CS10): | 96 | - Google Mickey (Asus Chromebit CS10): |
77 | Required root node properties: | 97 | Required root node properties: |
78 | - compatible = "google,veyron-mickey-rev8", "google,veyron-mickey-rev7", | 98 | - compatible = "google,veyron-mickey-rev8", "google,veyron-mickey-rev7", |
@@ -141,6 +161,10 @@ Rockchip platforms device tree bindings | |||
141 | Required root node properties: | 161 | Required root node properties: |
142 | - compatible = "rockchip,rk3288-fennec", "rockchip,rk3288"; | 162 | - compatible = "rockchip,rk3288-fennec", "rockchip,rk3288"; |
143 | 163 | ||
164 | - Rockchip RK3328 evb: | ||
165 | Required root node properties: | ||
166 | - compatible = "rockchip,rk3328-evb", "rockchip,rk3328"; | ||
167 | |||
144 | - Rockchip RK3399 evb: | 168 | - Rockchip RK3399 evb: |
145 | Required root node properties: | 169 | Required root node properties: |
146 | - compatible = "rockchip,rk3399-evb", "rockchip,rk3399"; | 170 | - compatible = "rockchip,rk3399-evb", "rockchip,rk3399"; |
diff --git a/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt b/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt index ce06435d28ed..a09d627b5508 100644 --- a/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt +++ b/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt | |||
@@ -5,7 +5,8 @@ controllers within the SoC. | |||
5 | 5 | ||
6 | Required Properties: | 6 | Required Properties: |
7 | 7 | ||
8 | - compatible: should be "amlogic,gxbb-clkc" | 8 | - compatible: should be "amlogic,gxbb-clkc" for GXBB SoC, |
9 | or "amlogic,gxl-clkc" for GXL and GXM SoC. | ||
9 | - reg: physical base address of the clock controller and length of memory | 10 | - reg: physical base address of the clock controller and length of memory |
10 | mapped region. | 11 | mapped region. |
11 | 12 | ||
diff --git a/Documentation/devicetree/bindings/clock/qoriq-clock.txt b/Documentation/devicetree/bindings/clock/qoriq-clock.txt index aa3526f229a7..6ed469c66b32 100644 --- a/Documentation/devicetree/bindings/clock/qoriq-clock.txt +++ b/Documentation/devicetree/bindings/clock/qoriq-clock.txt | |||
@@ -35,6 +35,7 @@ Required properties: | |||
35 | * "fsl,ls1021a-clockgen" | 35 | * "fsl,ls1021a-clockgen" |
36 | * "fsl,ls1043a-clockgen" | 36 | * "fsl,ls1043a-clockgen" |
37 | * "fsl,ls1046a-clockgen" | 37 | * "fsl,ls1046a-clockgen" |
38 | * "fsl,ls1088a-clockgen" | ||
38 | * "fsl,ls2080a-clockgen" | 39 | * "fsl,ls2080a-clockgen" |
39 | Chassis-version clock strings include: | 40 | Chassis-version clock strings include: |
40 | * "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks | 41 | * "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks |
diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.txt b/Documentation/devicetree/bindings/soc/rockchip/grf.txt index 13ec0992de0f..cc9f05d3cbc1 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.txt +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.txt | |||
@@ -18,6 +18,7 @@ Required Properties: | |||
18 | - "rockchip,rk3188-grf", "syscon": for rk3188 | 18 | - "rockchip,rk3188-grf", "syscon": for rk3188 |
19 | - "rockchip,rk3228-grf", "syscon": for rk3228 | 19 | - "rockchip,rk3228-grf", "syscon": for rk3228 |
20 | - "rockchip,rk3288-grf", "syscon": for rk3288 | 20 | - "rockchip,rk3288-grf", "syscon": for rk3288 |
21 | - "rockchip,rk3328-grf", "syscon": for rk3328 | ||
21 | - "rockchip,rk3368-grf", "syscon": for rk3368 | 22 | - "rockchip,rk3368-grf", "syscon": for rk3368 |
22 | - "rockchip,rk3399-grf", "syscon": for rk3399 | 23 | - "rockchip,rk3399-grf", "syscon": for rk3399 |
23 | - compatible: PMUGRF should be one of the following: | 24 | - compatible: PMUGRF should be one of the following: |
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index ee558477e164..f9fe94535b46 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt | |||
@@ -139,6 +139,7 @@ holt Holt Integrated Circuits, Inc. | |||
139 | honeywell Honeywell | 139 | honeywell Honeywell |
140 | hp Hewlett Packard | 140 | hp Hewlett Packard |
141 | holtek Holtek Semiconductor, Inc. | 141 | holtek Holtek Semiconductor, Inc. |
142 | hwacom HwaCom Systems Inc. | ||
142 | i2se I2SE GmbH | 143 | i2se I2SE GmbH |
143 | ibm International Business Machines (IBM) | 144 | ibm International Business Machines (IBM) |
144 | idt Integrated Device Technologies, Inc. | 145 | idt Integrated Device Technologies, Inc. |
@@ -162,6 +163,7 @@ jedec JEDEC Solid State Technology Association | |||
162 | karo Ka-Ro electronics GmbH | 163 | karo Ka-Ro electronics GmbH |
163 | keithkoep Keith & Koep GmbH | 164 | keithkoep Keith & Koep GmbH |
164 | keymile Keymile GmbH | 165 | keymile Keymile GmbH |
166 | khadas Khadas | ||
165 | kinetic Kinetic Technologies | 167 | kinetic Kinetic Technologies |
166 | kosagi Sutajio Ko-Usagi PTE Ltd. | 168 | kosagi Sutajio Ko-Usagi PTE Ltd. |
167 | kyo Kyocera Corporation | 169 | kyo Kyocera Corporation |