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

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

Merge tag 'hip05-dt-for-4.3' of git://github.com/hisilicon/linux-hisi into next/dt 

Merge "ARM64: DT: Hisilicon hip05 soc and D02 board updates for 4.3" from Wei Xu:

- Updated the hisilicon devicetree bindings document to support hip05-D02 board
- Added dts files for hip05 SoC and D02 board

* tag 'hip05-dt-for-4.3' of git://github.com/hisilicon/linux-hisi:
  arm64: dts: add dts files for Hisilicon Hip05-D02 Development Board
  arm64: hip05-d02: Document devicetree bindings for Hisilicon Hip05-D02 Board
parents 049e6dde fcab303c

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

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ HiKey Board 
Required root node properties:

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



HiP05 D02 Board

Required root node properties:

	- compatible = "hisilicon,hip05-d02";



Hisilicon system controller



Required properties:

arch/arm64/boot/dts/hisilicon/Makefile

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

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



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

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

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

 * dts file for Hisilicon D02 Development Board

 *

 * Copyright (C) 2014,2015 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 "hip05.dtsi"



/ {

	model = "Hisilicon Hip05 D02 Development Board";

	compatible = "hisilicon,hip05-d02";



	memory@00000000 {

		device_type = "memory";

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

	};



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&uart0 {

	status = "ok";

};

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

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

 * dts file for Hisilicon D02 Development Board

 *

 * Copyright (C) 2014,2015 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.

 *

 */



#include <dt-bindings/interrupt-controller/arm-gic.h>



/ {

	compatible = "hisilicon,hip05-d02";

	interrupt-parent = <&gic>;

	#address-cells = <2>;

	#size-cells = <2>;



	psci {

		compatible = "arm,psci-0.2";

		method = "smc";

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu-map {

			cluster0 {

				core0 {

					cpu = <&cpu0>;

				};

				core1 {

					cpu = <&cpu1>;

				};

				core2 {

					cpu = <&cpu2>;

				};

				core3 {

					cpu = <&cpu3>;

				};

			};

			cluster1 {

				core0 {

					cpu = <&cpu4>;

				};

				core1 {

					cpu = <&cpu5>;

				};

				core2 {

					cpu = <&cpu6>;

				};

				core3 {

					cpu = <&cpu7>;

				};

			};

			cluster2 {

				core0 {

					cpu = <&cpu8>;

				};

				core1 {

					cpu = <&cpu9>;

				};

				core2 {

					cpu = <&cpu10>;

				};

				core3 {

					cpu = <&cpu11>;

				};

			};

			cluster3 {

				core0 {

					cpu = <&cpu12>;

				};

				core1 {

					cpu = <&cpu13>;

				};

				core2 {

					cpu = <&cpu14>;

				};

				core3 {

					cpu = <&cpu15>;

				};

			};

		};



		cpu0: cpu@20000 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20000>;

			enable-method = "psci";

		};



		cpu1: cpu@20001 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20001>;

			enable-method = "psci";

		};



		cpu2: cpu@20002 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20002>;

			enable-method = "psci";

		};



		cpu3: cpu@20003 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20003>;

			enable-method = "psci";

		};



		cpu4: cpu@20100 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20100>;

			enable-method = "psci";

		};



		cpu5: cpu@20101 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20101>;

			enable-method = "psci";

		};



		cpu6: cpu@20102 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20102>;

			enable-method = "psci";

		};



		cpu7: cpu@20103 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20103>;

			enable-method = "psci";

		};



		cpu8: cpu@20200 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20200>;

			enable-method = "psci";

		};



		cpu9: cpu@20201 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20201>;

			enable-method = "psci";

		};



		cpu10: cpu@20202 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20202>;

			enable-method = "psci";

		};



		cpu11: cpu@20203 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20203>;

			enable-method = "psci";

		};



		cpu12: cpu@20300 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20300>;

			enable-method = "psci";

		};



		cpu13: cpu@20301 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20301>;

			enable-method = "psci";

		};



		cpu14: cpu@20302 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20302>;

			enable-method = "psci";

		};



		cpu15: cpu@20303 {

			device_type = "cpu";

			compatible = "arm,cortex-a57", "arm,armv8";

			reg = <0x20303>;

			enable-method = "psci";

		};

	};



	gic: interrupt-controller@8d000000 {

		compatible = "arm,gic-v3";

                #interrupt-cells = <3>;

                #address-cells = <2>;

                #size-cells = <2>;

                ranges;

                interrupt-controller;

                #redistributor-regions = <1>;

                redistributor-stride = <0x0 0x30000>;

		reg = <0x0 0x8d000000 0 0x10000>,	/* GICD */

		      <0x0 0x8d100000 0 0x300000>,	/* GICR */

		      <0x0 0xfe000000 0 0x10000>,	/* GICC */

		      <0x0 0xfe010000 0 0x10000>,       /* GICH */

		      <0x0 0xfe020000 0 0x10000>;       /* GICV */

		interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;



		its_totems: interrupt-controller@8c000000 {

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

			msi-controller;

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

		};

	};



	timer {

		compatible = "arm,armv8-timer";

		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,

			     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,

			     <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,

			     <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;

	};



	pmu {

		compatible = "arm,armv8-pmuv3";

		interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;

	};



	soc {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		refclk200mhz: refclk200mhz {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <200000000>;

		};



		uart0: uart@80300000 {

			compatible = "snps,dw-apb-uart";

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

			interrupts = <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&refclk200mhz>;

			clock-names = "apb_pclk";

			reg-shift = <2>;

			reg-io-width = <4>;

			status = "disabled";

		};



		uart1: uart@80310000 {

			compatible = "snps,dw-apb-uart";

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

			interrupts = <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&refclk200mhz>;

			clock-names = "apb_pclk";

			reg-shift = <2>;

			reg-io-width = <4>;

			status = "disabled";

		};

	};

};