Skip to content

Commit

Permalink
Merge tag 'hisi-armv7-soc-dt-for-4.10' of git://github.com/hisilicon/…
Browse files Browse the repository at this point in the history
…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 <[email protected]>
  • Loading branch information
olofj committed Nov 18, 2016
2 parents 7af5664 + 3b23aab commit f3dcae8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion arch/arm/boot/dts/hi3620.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
* publishhed by the Free Software Foundation.
*/

#include "skeleton.dtsi"
#include <dt-bindings/clock/hi3620-clock.h>

/ {
#address-cells = <1>;
#size-cells = <1>;

aliases {
serial0 = &uart0;
serial1 = &uart1;
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/boot/dts/hip01.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
* published by the Free Software Foundation.
*/

#include "skeleton.dtsi"

/ {
interrupt-parent = <&gic>;
#address-cells = <1>;
Expand Down
4 changes: 3 additions & 1 deletion arch/arm/boot/dts/hisi-x5hd2.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
* publishhed by the Free Software Foundation.
*/

#include "skeleton.dtsi"
#include <dt-bindings/clock/hix5hd2-clock.h>

/ {
#address-cells = <1>;
#size-cells = <1>;

aliases {
serial0 = &uart0;
};
Expand Down

0 comments on commit f3dcae8

Please sign in to comment.