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

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

Merge tag 'actions-arm-dt-for-4.15' of... 

Merge tag 'actions-arm-dt-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/dt

Pull "Actions Semi ARM based SoC DT for v4.15" from Andreas Färber:

This updates the Guitar board DT with a clock node for the debug UART
and adds a new DT for the CubieBoard6.
It also updates the S500 DT with CPU power domains.

* tag 'actions-arm-dt-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions:
  ARM: dts: owl-s500: Add CubieBoard6
  dt-bindings: arm: actions: Add CubieBoard6
  ARM: dts: owl-s500-guitar-bb-rev-b: Add fake uart3 clock
  ARM: dts: owl-s500: Set power domains for CPU2 and CPU3
parents d29d3078 7f6a78fe

Documentation/devicetree/bindings/arm/actions.txt

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Boards: 


Root node property compatible must contain, depending on board:



 - Cubietech CubieBoard6: "cubietech,cubieboard6"

 - LeMaker Guitar Base Board rev. B: "lemaker,guitar-bb-rev-b", "lemaker,guitar"

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -705,6 +705,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ 
	orion5x-netgear-wnr854t.dtb \

	orion5x-rd88f5182-nas.dtb

dtb-$(CONFIG_ARCH_ACTIONS) += \

	owl-s500-cubieboard6.dtb \

	owl-s500-guitar-bb-rev-b.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += \

	prima2-evb.dtb

arch/arm/boot/dts/owl-s500-cubieboard6.dts

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

 * Cubietech CubieBoard6

 *

 * Copyright (c) 2017 Andreas Färber

 *

 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)

 */



/dts-v1/;



#include "owl-s500.dtsi"



/ {

	compatible = "cubietech,cubieboard6", "actions,s500";

	model = "CubieBoard6";



	aliases {

		serial3 = &uart3;

	};



	chosen {

		stdout-path = "serial3:115200n8";

	};



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x80000000>;

	};



	uart3_clk: uart3-clk {

		compatible = "fixed-clock";

		clock-frequency = <921600>;

		#clock-cells = <0>;

	};

};



&timer {

	clocks = <&hosc>;

};



&uart3 {

	status = "okay";

	clocks = <&uart3_clk>;

};

arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts

+7 −0
Original line number Diff line number Diff line
@@ -19,8 +19,15 @@ 
	chosen {

		stdout-path = "serial3:115200n8";

	};



	uart3_clk: uart3-clk {

		compatible = "fixed-clock";

		clock-frequency = <921600>;

		#clock-cells = <0>;

	};

};



&uart3 {

	status = "okay";

	clocks = <&uart3_clk>;

};

arch/arm/boot/dts/owl-s500.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



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

#include <dt-bindings/power/owl-s500-powergate.h>



/ {

	compatible = "actions,s500";
@@ -43,6 +44,7 @@ 
			compatible = "arm,cortex-a9";

			reg = <0x2>;

			enable-method = "actions,s500-smp";

			power-domains = <&sps S500_PD_CPU2>;

		};



		cpu3: cpu@3 {
@@ -50,6 +52,7 @@ 
			compatible = "arm,cortex-a9";

			reg = <0x3>;

			enable-method = "actions,s500-smp";

			power-domains = <&sps S500_PD_CPU3>;

		};

	};