diff options
author | Olof Johansson <olof@lixom.net> | 2016-11-18 13:38:47 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-11-18 13:38:47 -0500 |
commit | f3dcae8f4d36c9865ef7420e846b77e425042dc0 (patch) | |
tree | 131852ca7a73b1893413a9c268ebd658cad50dcf | |
parent | 7af5664e0c5035b0542726cf2d4957d244136b86 (diff) | |
parent | 3b23aabfcd48988179f7c6c2dde01f3356f68213 (diff) |
Merge tag 'hisi-armv7-soc-dt-for-4.10' of git://github.com/hisilicon/linux-hisi into next/dt
ARM: DT: Hisilicon ARMv7 SoC DT updates for 4.10
- Remove skeleton.dtsi inclusion for the Hip01, Hi3620 and Hix5hd2
* tag 'hisi-armv7-soc-dt-for-4.10' of git://github.com/hisilicon/linux-hisi:
ARM: dts: hisi-x5hd2: Remove skeleton.dtsi inclusion
ARM: dts: hi3620: Remove skeleton.dtsi inclusion
ARM: dts: hip01: Remove skeleton.dtsi inclusion
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/boot/dts/hi3620.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/hip01.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/hisi-x5hd2.dtsi | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi index 45eea81678c0..541d70094544 100644 --- a/arch/arm/boot/dts/hi3620.dtsi +++ b/arch/arm/boot/dts/hi3620.dtsi | |||
@@ -11,10 +11,12 @@ | |||
11 | * publishhed by the Free Software Foundation. | 11 | * publishhed by the Free Software Foundation. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "skeleton.dtsi" | ||
15 | #include <dt-bindings/clock/hi3620-clock.h> | 14 | #include <dt-bindings/clock/hi3620-clock.h> |
16 | 15 | ||
17 | / { | 16 | / { |
17 | #address-cells = <1>; | ||
18 | #size-cells = <1>; | ||
19 | |||
18 | aliases { | 20 | aliases { |
19 | serial0 = &uart0; | 21 | serial0 = &uart0; |
20 | serial1 = &uart1; | 22 | serial1 = &uart1; |
diff --git a/arch/arm/boot/dts/hip01.dtsi b/arch/arm/boot/dts/hip01.dtsi index 4e9562f806a2..9d5fd5cfefa6 100644 --- a/arch/arm/boot/dts/hip01.dtsi +++ b/arch/arm/boot/dts/hip01.dtsi | |||
@@ -11,8 +11,6 @@ | |||
11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "skeleton.dtsi" | ||
15 | |||
16 | / { | 14 | / { |
17 | interrupt-parent = <&gic>; | 15 | interrupt-parent = <&gic>; |
18 | #address-cells = <1>; | 16 | #address-cells = <1>; |
diff --git a/arch/arm/boot/dts/hisi-x5hd2.dtsi b/arch/arm/boot/dts/hisi-x5hd2.dtsi index fdcc23d203e5..506fdc10706d 100644 --- a/arch/arm/boot/dts/hisi-x5hd2.dtsi +++ b/arch/arm/boot/dts/hisi-x5hd2.dtsi | |||
@@ -7,10 +7,12 @@ | |||
7 | * publishhed by the Free Software Foundation. | 7 | * publishhed by the Free Software Foundation. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "skeleton.dtsi" | ||
11 | #include <dt-bindings/clock/hix5hd2-clock.h> | 10 | #include <dt-bindings/clock/hix5hd2-clock.h> |
12 | 11 | ||
13 | / { | 12 | / { |
13 | #address-cells = <1>; | ||
14 | #size-cells = <1>; | ||
15 | |||
14 | aliases { | 16 | aliases { |
15 | serial0 = &uart0; | 17 | serial0 = &uart0; |
16 | }; | 18 | }; |