Skip to content

Commit 08fd8c9

Browse files
olofjolofj
committed
Merge tag 'hisi-arm64-dt-for-4.12' of git://github.com/hisilicon/linux-hisi into next/dt64
ARM64: DT: Hisilicon SoC DT updates for 4.12 - Reset the hi6220 mmc hosts to avoid hang - Add the binding for the hi3798cv200 SoC and the poplar board - Add basic dts files to support the hi3798cv200 poplar board - Enable the Mbigen, XGE, RoCE and SAS for the hip07 d05 board - Add driver strength MACRO for the hi3660 SoC - Add the pinctrl dtsi file for hikey960 board to configure the pins * tag 'hisi-arm64-dt-for-4.12' of git://github.com/hisilicon/linux-hisi: 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: hisilicon: add dts files for hi3798cv200-poplar board dt-bindings: arm: hisilicon: add bindings for hi3798cv200 SoC and Poplar board arm64: dts: hi6220: Reset the mmc hosts Signed-off-by: Olof Johansson <[email protected]>
2 parents b42f455 + d4e1eae commit 08fd8c9

File tree

10 files changed

+1507
-0
lines changed

10 files changed

+1507
-0
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ Hi3660 SoC
44
Required root node properties:
55
- compatible = "hisilicon,hi3660";
66

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+
715
Hi4511 Board
816
Required root node properties:
917
- compatible = "hisilicon,hi3620-hi4511";

‎arch/arm64/boot/dts/hisilicon/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
dtb-$(CONFIG_ARCH_HISI) += hi3660-hikey960.dtb
2+
dtb-$(CONFIG_ARCH_HISI) += hi3798cv200-poplar.dtb
23
dtb-$(CONFIG_ARCH_HISI) += hi6220-hikey.dtb
34
dtb-$(CONFIG_ARCH_HISI) += hip05-d02.dtb
45
dtb-$(CONFIG_ARCH_HISI) += hip06-d03.dtb

‎arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/dts-v1/;
99

1010
#include "hi3660.dtsi"
11+
#include "hikey960-pinctrl.dtsi"
1112

1213
/ {
1314
model = "HiKey960";

‎arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
/*
2+
* DTS File for HiSilicon Poplar Development Board
3+
*
4+
* Copyright (c) 2016-2017 HiSilicon Technologies Co., Ltd.
5+
*
6+
* Released under the GPLv2 only.
7+
* SPDX-License-Identifier: GPL-2.0
8+
*/
9+
10+
/dts-v1/;
11+
12+
#include <dt-bindings/gpio/gpio.h>
13+
#include "hi3798cv200.dtsi"
14+
15+
/ {
16+
model = "HiSilicon Poplar Development Board";
17+
compatible = "hisilicon,hi3798cv200-poplar", "hisilicon,hi3798cv200";
18+
19+
aliases {
20+
serial0 = &uart0;
21+
serial2 = &uart2;
22+
};
23+
24+
chosen {
25+
stdout-path = "serial0:115200n8";
26+
};
27+
28+
memory@0 {
29+
device_type = "memory";
30+
reg = <0x0 0x0 0x0 0x80000000>;
31+
};
32+
33+
leds {
34+
compatible = "gpio-leds";
35+
36+
user-led0 {
37+
label = "USER-LED0";
38+
gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
39+
linux,default-trigger = "heartbeat";
40+
default-state = "off";
41+
};
42+
43+
user-led1 {
44+
label = "USER-LED1";
45+
gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
46+
linux,default-trigger = "mmc0";
47+
default-state = "off";
48+
};
49+
50+
user-led2 {
51+
label = "USER-LED2";
52+
gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
53+
linux,default-trigger = "none";
54+
default-state = "off";
55+
};
56+
57+
user-led3 {
58+
label = "USER-LED3";
59+
gpios = <&gpio10 6 GPIO_ACTIVE_LOW>;
60+
linux,default-trigger = "cpu0";
61+
default-state = "off";
62+
};
63+
};
64+
};
65+
66+
&gmac1 {
67+
status = "okay";
68+
#address-cells = <1>;
69+
#size-cells = <0>;
70+
phy-handle = <&eth_phy1>;
71+
phy-mode = "rgmii";
72+
hisilicon,phy-reset-delays-us = <10000 10000 30000>;
73+
74+
eth_phy1: phy@3 {
75+
reg = <3>;
76+
};
77+
};
78+
79+
&gpio1 {
80+
status = "okay";
81+
gpio-line-names = "LS-GPIO-E", "",
82+
"", "",
83+
"", "LS-GPIO-F",
84+
"", "LS-GPIO-J";
85+
};
86+
87+
&gpio2 {
88+
status = "okay";
89+
gpio-line-names = "LS-GPIO-H", "LS-GPIO-I",
90+
"LS-GPIO-L", "LS-GPIO-G",
91+
"LS-GPIO-K", "",
92+
"", "";
93+
};
94+
95+
&gpio3 {
96+
status = "okay";
97+
gpio-line-names = "", "",
98+
"", "",
99+
"LS-GPIO-C", "",
100+
"", "LS-GPIO-B";
101+
};
102+
103+
&gpio4 {
104+
status = "okay";
105+
gpio-line-names = "", "",
106+
"", "",
107+
"", "LS-GPIO-D",
108+
"", "";
109+
};
110+
111+
&gpio5 {
112+
status = "okay";
113+
gpio-line-names = "", "USER-LED-1",
114+
"USER-LED-2", "",
115+
"", "LS-GPIO-A",
116+
"", "";
117+
};
118+
119+
&gpio6 {
120+
status = "okay";
121+
gpio-line-names = "", "",
122+
"", "USER-LED-0",
123+
"", "",
124+
"", "";
125+
};
126+
127+
&gpio10 {
128+
status = "okay";
129+
gpio-line-names = "", "",
130+
"", "",
131+
"", "",
132+
"USER-LED-3", "";
133+
};
134+
135+
&i2c0 {
136+
status = "okay";
137+
label = "LS-I2C0";
138+
};
139+
140+
&i2c2 {
141+
status = "okay";
142+
label = "LS-I2C1";
143+
};
144+
145+
&ir {
146+
status = "okay";
147+
};
148+
149+
&spi0 {
150+
status = "okay";
151+
label = "LS-SPI0";
152+
};
153+
154+
&uart0 {
155+
status = "okay";
156+
};
157+
158+
&uart2 {
159+
status = "okay";
160+
label = "LS-UART0";
161+
};
162+
/* No optional LS-UART1 on Low Speed Expansion Connector. */

0 commit comments

Comments
 (0)