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

Commit d6a58a5c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'hip0x-dt-for-4.7' of git://github.com/hisilicon/linux-hisi into next/dt64 

Merge "ARM64: DT: Hisilicon hip05 and hip06 updates for 4.7" Wei Xu:

- Fix its node without msi-cells for hip05
- Add nor flash node for hip05 D02 board
- Add initial dts for hip06 D03 board
- Reorder and add the hip06 D03 binding in the binding document

* tag 'hip0x-dt-for-4.7' of git://github.com/hisilicon/linux-hisi:
  Documentation: arm64: Add Hisilicon Hip06 D03 dts binding
  arm64: dts: Add initial dts for Hisilicon Hip06 D03 board
  arm64: dts: hip05: Add nor flash support
  arm64: dts: hip05: fix its node without msi-cells
parents bf6fc0a2 4cfcb351

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

+12 −8
Original line number Diff line number Diff line 
Hisilicon Platforms Device Tree Bindings

----------------------------------------------------

Hi6220 SoC

Required root node properties:

	- compatible = "hisilicon,hi6220";



Hi4511 Board

Required root node properties:

	- compatible = "hisilicon,hi3620-hi4511";



HiP04 D01 Board

Hi6220 SoC

Required root node properties:

	- compatible = "hisilicon,hip04-d01";

	- compatible = "hisilicon,hi6220";



HiKey Board

Required root node properties:

	- compatible = "hisilicon,hi6220-hikey", "hisilicon,hi6220";



HiP01 ca9x2 Board

Required root node properties:

	- compatible = "hisilicon,hip01-ca9x2";



HiKey Board

HiP04 D01 Board

Required root node properties:

	- compatible = "hisilicon,hi6220-hikey", "hisilicon,hi6220";

	- compatible = "hisilicon,hip04-d01";



HiP05 D02 Board

Required root node properties:

	- compatible = "hisilicon,hip05-d02";



HiP06 D03 Board

Required root node properties:

	- compatible = "hisilicon,hip06-d03";



Hisilicon system controller



Required properties:

arch/arm64/boot/dts/hisilicon/Makefile

+3 −1
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_HISI) += hi6220-hikey.dtb hip05-d02.dtb

dtb-$(CONFIG_ARCH_HISI) += hi6220-hikey.dtb

dtb-$(CONFIG_ARCH_HISI) += hip05-d02.dtb

dtb-$(CONFIG_ARCH_HISI) += hip06-d03.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

arch/arm64/boot/dts/hisilicon/hip05-d02.dts

+34 −0
Original line number Diff line number Diff line
@@ -52,3 +52,37 @@ 
&peri_gpio0 {

	status = "ok";

};



&lbc {

	status = "ok";

	#address-cells = <2>;

	#size-cells = <1>;

	ranges = <0 0 0x0 0x90000000 0x08000000>,

		 <1 0 0x0 0x98000000 0x08000000>;



	nor-flash@0,0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "numonyx,js28f00a", "cfi-flash";

		reg = <0 0x0 0x08000000>;

		bank-width = <2>;

		/* The three parts may not used */

		partition@0 {

			label = "BIOS";

			reg = <0x0 0x300000>;

		};

		partition@300000 {

			label = "Linux";

			reg = <0x300000 0xa00000>;

		};

		partition@1000000 {

			label = "Rootfs";

			reg = <0x01000000 0x02000000>;

		};

	};



	cpld@1,0 {

		compatible = "hisilicon,hip05-cpld";

		reg = <1 0x0 0x100>;

	};

};

arch/arm64/boot/dts/hisilicon/hip05.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -249,24 +249,28 @@ 
		its_peri: interrupt-controller@8c000000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x8c000000 0x0 0x40000>;

		};



		its_m3: interrupt-controller@a3000000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0xa3000000 0x0 0x40000>;

		};



		its_pcie: interrupt-controller@b7000000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0xb7000000 0x0 0x40000>;

		};



		its_dsa: interrupt-controller@c6000000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0xc6000000 0x0 0x40000>;

		};

	};
@@ -323,6 +327,12 @@ 
			status = "disabled";

		};



		lbc: localbus@80380000 {

			compatible = "hisilicon,hisi-localbus", "simple-bus";

			reg = <0x0 0x80380000 0x0 0x10000>;

			status = "disabled";

		};



		peri_gpio0: gpio@802e0000 {

			#address-cells = <1>;

			#size-cells = <0>;

arch/arm64/boot/dts/hisilicon/hip06-d03.dts

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/**

 * dts file for Hisilicon D03 Development Board

 *

 * Copyright (C) 2016 Hisilicon Ltd.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * publishhed by the Free Software Foundation.

 *

 */



/dts-v1/;



#include "hip06.dtsi"



/ {

	model = "Hisilicon Hip06 D03 Development Board";

	compatible = "hisilicon,hip06-d03";



	memory@00000000 {

		device_type = "memory";

		reg = <0x0 0x00000000 0x0 0x40000000>;

	};



	chosen { };

};



&usb_ohci {

	status = "ok";

};



&usb_ehci {

	status = "ok";

};