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

Commit 4f0d20ec authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: dts: Make CPU configuration more readable on exynos542x/5800 



Exynos5420 and Exynos5800 boards boot from big core (A15) but
Exynos5422 boards choose otherwise: LITTLE core (A7) (on Exynos5422 this
is property of the board - configurable by pulling up/down gpg2-1).
To make user-visible CPU ordering more consistent the 'cpus' node was
overridden by exynos5422-cpus.dtsi.

However this is a little bit ugly and error-prone. Overriding the CPU
child nodes requires to basically reverse what was done initially in
exynos5420.dtsi.

Instead, split CPU configuration entirely to separate files which should
be included by board DTS.

Suggested-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarChanho Park <parkch98@gmail.com>
parent 14579412

arch/arm/boot/dts/exynos5420-arndale-octa.dts

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


/dts-v1/;

#include "exynos5420.dtsi"

#include "exynos5420-cpus.dtsi"

#include <dt-bindings/gpio/gpio.h>

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

#include <dt-bindings/input/input.h>

arch/arm/boot/dts/exynos5420-cpus.dtsi

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

 * SAMSUNG EXYNOS5420 SoC cpu device tree source

 *

 * Copyright (c) 2015 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * This file provides desired ordering for Exynos5420 and Exynos5800

 * boards: CPU[0123] being the A15.

 *

 * The Exynos5420, 5422 and 5800 actually share the same CPU configuration

 * but particular boards choose different booting order.

 *

 * Exynos5420 and Exynos5800 always boot from Cortex-A15. On Exynos5422

 * booting cluster (big or LITTLE) is chosen by IROM code by reading

 * the gpg2-1 GPIO. By default all Exynos5422 based boards choose booting

 * from the LITTLE: Cortex-A7.

 *

 * 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

 * published by the Free Software Foundation.

 */



/ {

	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a15";

			reg = <0x0>;

			clock-frequency = <1800000000>;

			cci-control-port = <&cci_control1>;

		};



		cpu1: cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a15";

			reg = <0x1>;

			clock-frequency = <1800000000>;

			cci-control-port = <&cci_control1>;

		};



		cpu2: cpu@2 {

			device_type = "cpu";

			compatible = "arm,cortex-a15";

			reg = <0x2>;

			clock-frequency = <1800000000>;

			cci-control-port = <&cci_control1>;

		};



		cpu3: cpu@3 {

			device_type = "cpu";

			compatible = "arm,cortex-a15";

			reg = <0x3>;

			clock-frequency = <1800000000>;

			cci-control-port = <&cci_control1>;

		};



		cpu4: cpu@100 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x100>;

			clock-frequency = <1000000000>;

			cci-control-port = <&cci_control0>;

		};



		cpu5: cpu@101 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x101>;

			clock-frequency = <1000000000>;

			cci-control-port = <&cci_control0>;

		};



		cpu6: cpu@102 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x102>;

			clock-frequency = <1000000000>;

			cci-control-port = <&cci_control0>;

		};



		cpu7: cpu@103 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x103>;

			clock-frequency = <1000000000>;

			cci-control-port = <&cci_control0>;

		};

	};

};

arch/arm/boot/dts/exynos5420-peach-pit.dts

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <dt-bindings/clock/maxim,max77802.h>

#include <dt-bindings/regulator/maxim,max77802.h>

#include "exynos5420.dtsi"

#include "exynos5420-cpus.dtsi"



/ {

	model = "Google Peach Pit Rev 6+";

arch/arm/boot/dts/exynos5420-smdk5420.dts

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


/dts-v1/;

#include "exynos5420.dtsi"

#include "exynos5420-cpus.dtsi"

#include <dt-bindings/gpio/gpio.h>



/ {

arch/arm/boot/dts/exynos5420.dtsi

+4 −68
Original line number Diff line number Diff line
@@ -50,74 +50,10 @@ 
		usbdrdphy1 = &usbdrd_phy1;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a15";

			reg = <0x0>;

			clock-frequency = <1800000000>;

			cci-control-port = <&cci_control1>;

		};



		cpu1: cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a15";

			reg = <0x1>;

			clock-frequency = <1800000000>;

			cci-control-port = <&cci_control1>;

		};



		cpu2: cpu@2 {

			device_type = "cpu";

			compatible = "arm,cortex-a15";

			reg = <0x2>;

			clock-frequency = <1800000000>;

			cci-control-port = <&cci_control1>;

		};



		cpu3: cpu@3 {

			device_type = "cpu";

			compatible = "arm,cortex-a15";

			reg = <0x3>;

			clock-frequency = <1800000000>;

			cci-control-port = <&cci_control1>;

		};



		cpu4: cpu@100 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x100>;

			clock-frequency = <1000000000>;

			cci-control-port = <&cci_control0>;

		};



		cpu5: cpu@101 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x101>;

			clock-frequency = <1000000000>;

			cci-control-port = <&cci_control0>;

		};



		cpu6: cpu@102 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x102>;

			clock-frequency = <1000000000>;

			cci-control-port = <&cci_control0>;

		};



		cpu7: cpu@103 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			reg = <0x103>;

			clock-frequency = <1000000000>;

			cci-control-port = <&cci_control0>;

		};

	};

	/*

	 * The 'cpus' node is not present here but instead it is provided

	 * by exynos5420-cpus.dtsi or exynos5422-cpus.dtsi.

	 */



	cci: cci@10d20000 {

		compatible = "arm,cci-400";