Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3dcae8f authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 7af5664e 3b23aabf
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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;
+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@
 * published by the Free Software Foundation.
 */

#include "skeleton.dtsi"

/ {
	interrupt-parent = <&gic>;
	#address-cells = <1>;
+3 −1
Original line number Diff line number Diff line
@@ -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;
	};