Commit 09fa4ba5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'actions-arm64-dt-for-4.16' of... 

Merge tag 'actions-arm64-dt-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/dt

Actions Semi arm64 based SoC DT for v4.16

This adds S700 SoC and CubieBoard7.

* tag 'actions-arm64-dt-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions

:
  arm64: dts: actions: Add S700 and CubieBoard7
  dt-bindings: power: Add Actions Semi S700 SPS
  dt-bindings: arm: actions: Add S700 and CubieBoard7

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9019e1f8 0bea2a65

Documentation/devicetree/bindings/arm/actions.txt

+15 −0
Original line number Diff line number Diff line
@@ -26,6 +26,21 @@ Root node property compatible must contain, depending on board: 
 - LeMaker Guitar Base Board rev. B: "lemaker,guitar-bb-rev-b", "lemaker,guitar"





S700 SoC

========



Required root node properties:



- compatible :  must contain "actions,s700"





Boards:



Root node property compatible must contain, depending on board:



 - Cubietech CubieBoard7: "cubietech,cubieboard7"





S900 SoC

========

Documentation/devicetree/bindings/power/actions,owl-sps.txt

+2 −0
Original line number Diff line number Diff line
@@ -2,10 +2,12 @@ Actions Semi Owl Smart Power System (SPS) 


Required properties:

- compatible          :  "actions,s500-sps" for S500

                         "actions,s700-sps" for S700

- reg                 :  Offset and length of the register set for the device.

- #power-domain-cells :  Must be 1.

                         See macros in:

                          include/dt-bindings/power/owl-s500-powergate.h for S500

                          include/dt-bindings/power/owl-s700-powergate.h for S700





Example:

arch/arm64/boot/dts/actions/Makefile

+2 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_ACTIONS) += s700-cubieboard7.dtb



dtb-$(CONFIG_ARCH_ACTIONS) += s900-bubblegum-96.dtb

arch/arm64/boot/dts/actions/s700-cubieboard7.dts

0 → 100644
+46 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (c) 2017 Andreas Färber

 */



/dts-v1/;



#include "s700.dtsi"



/ {

	compatible = "cubietech,cubieboard7", "actions,s700";

	model = "CubieBoard7";



	aliases {

		serial3 = &uart3;

	};



	chosen {

		stdout-path = "serial3:115200n8";

	};



	memory@0 {

		device_type = "memory";

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

	};



	memory@1,e0000000 {

		device_type = "memory";

		reg = <0x1 0xe0000000 0x0 0x0>;

	};



	uart3_clk: uart3-clk {

		compatible = "fixed-clock";

		clock-frequency = <921600>;

		#clock-cells = <0>;

	};

};



&timer {

	clocks = <&hosc>;

};



&uart3 {

	status = "okay";

	clocks = <&uart3_clk>;

};

arch/arm64/boot/dts/actions/s700.dtsi

0 → 100644
+169 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (c) 2017 Andreas Färber

 */



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



/ {

	compatible = "actions,s700";

	interrupt-parent = <&gic>;

	#address-cells = <2>;

	#size-cells = <2>;



	cpus {

		#address-cells = <2>;

		#size-cells = <0>;



		cpu0: cpu@0 {

			device_type = "cpu";

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

			reg = <0x0 0x0>;

			enable-method = "psci";

		};



		cpu1: cpu@1 {

			device_type = "cpu";

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

			reg = <0x0 0x1>;

			enable-method = "psci";

		};



		cpu2: cpu@2 {

			device_type = "cpu";

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

			reg = <0x0 0x2>;

			enable-method = "psci";

		};



		cpu3: cpu@3 {

			device_type = "cpu";

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

			reg = <0x0 0x3>;

			enable-method = "psci";

		};

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		secmon@1f000000 {

			reg = <0x0 0x1f000000 0x0 0x1000000>;

			no-map;

		};

	};



	psci {

		compatible = "arm,psci-0.2";

		method = "smc";

	};



	arm-pmu {

		compatible = "arm,cortex-a53-pmu";

		interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,

		             <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,

		             <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,

		             <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;

	};



	timer {

		compatible = "arm,armv8-timer";

		interrupts = <GIC_PPI 13

			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 14

			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 11

			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 10

			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;

	};



	hosc: hosc {

		compatible = "fixed-clock";

		clock-frequency = <24000000>;

		#clock-cells = <0>;

	};



	soc {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		gic: interrupt-controller@e00f1000 {

			compatible = "arm,gic-400";

			reg = <0x0 0xe00f1000 0x0 0x1000>,

			      <0x0 0xe00f2000 0x0 0x2000>,

			      <0x0 0xe00f4000 0x0 0x2000>,

			      <0x0 0xe00f6000 0x0 0x2000>;

			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;

			interrupt-controller;

			#interrupt-cells = <3>;

		};



		uart0: serial@e0120000 {

			compatible = "actions,s900-uart", "actions,owl-uart";

			reg = <0x0 0xe0120000 0x0 0x2000>;

			interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		uart1: serial@e0122000 {

			compatible = "actions,s900-uart", "actions,owl-uart";

			reg = <0x0 0xe0122000 0x0 0x2000>;

			interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		uart2: serial@e0124000 {

			compatible = "actions,s900-uart", "actions,owl-uart";

			reg = <0x0 0xe0124000 0x0 0x2000>;

			interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		uart3: serial@e0126000 {

			compatible = "actions,s900-uart", "actions,owl-uart";

			reg = <0x0 0xe0126000 0x0 0x2000>;

			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		uart4: serial@e0128000 {

			compatible = "actions,s900-uart", "actions,owl-uart";

			reg = <0x0 0xe0128000 0x0 0x2000>;

			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		uart5: serial@e012a000 {

			compatible = "actions,s900-uart", "actions,owl-uart";

			reg = <0x0 0xe012a000 0x0 0x2000>;

			interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		uart6: serial@e012c000 {

			compatible = "actions,s900-uart", "actions,owl-uart";

			reg = <0x0 0xe012c000 0x0 0x2000>;

			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		sps: power-controller@e01b0100 {

			compatible = "actions,s700-sps";

			reg = <0x0 0xe01b0100 0x0 0x100>;

			#power-domain-cells = <1>;

		};



		timer: timer@e024c000 {

			compatible = "actions,s700-timer";

			reg = <0x0 0xe024c000 0x0 0x4000>;

			interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "timer1";

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE