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

Commit b96d4e92 authored by Christian Hewitt's avatar Christian Hewitt Committed by Kevin Hilman
Browse files

arm64: dts: meson-g12b: support a311d and s922x cpu operating points 



Meson g12b ships with a low-speed (S922X) and high-speed (A311D) variant
so remove cpu_opp_table nodes in meson-g12b.dtsi and create two new dtsi
that can be included in device-specific dts files. Opp points were taken
from the vendor BSP kernel.

Also make meson-g12b-odroid-n2.dts include the new meson-g12b-s922x.dtsi.

Signed-off-by: default avatarChristian Hewitt <christianshewitt@gmail.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
Tested-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 8f920256

arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi

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

/*

 * Copyright (c) 2019 BayLibre, SAS

 * Author: Neil Armstrong <narmstrong@baylibre.com>

 */



#include "meson-g12b.dtsi"



/ {

	cpu_opp_table_0: opp-table-0 {

		compatible = "operating-points-v2";

		opp-shared;



		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <731000>;

		};



		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			opp-microvolt = <731000>;

		};



		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <731000>;

		};



		opp-667000000 {

			opp-hz = /bits/ 64 <667000000>;

			opp-microvolt = <731000>;

		};



		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <761000>;

		};



		opp-1200000000 {

			opp-hz = /bits/ 64 <1200000000>;

			opp-microvolt = <781000>;

		};



		opp-1398000000 {

			opp-hz = /bits/ 64 <1398000000>;

			opp-microvolt = <811000>;

		};



		opp-1512000000 {

			opp-hz = /bits/ 64 <1512000000>;

			opp-microvolt = <861000>;

		};



		opp-1608000000 {

			opp-hz = /bits/ 64 <1608000000>;

			opp-microvolt = <901000>;

		};



		opp-1704000000 {

			opp-hz = /bits/ 64 <1704000000>;

			opp-microvolt = <951000>;

		};



		opp-1800000000 {

			opp-hz = /bits/ 64 <1800000000>;

			opp-microvolt = <1001000>;

		};

	};



	cpub_opp_table_1: opp-table-1 {

		compatible = "operating-points-v2";

		opp-shared;



		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <731000>;

		};



		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			opp-microvolt = <731000>;

		};



		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <731000>;

		};



		opp-667000000 {

			opp-hz = /bits/ 64 <667000000>;

			opp-microvolt = <731000>;

		};



		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <731000>;

		};



		opp-1200000000 {

			opp-hz = /bits/ 64 <1200000000>;

			opp-microvolt = <751000>;

		};



		opp-1398000000 {

			opp-hz = /bits/ 64 <1398000000>;

			opp-microvolt = <771000>;

		};



		opp-1512000000 {

			opp-hz = /bits/ 64 <1512000000>;

			opp-microvolt = <771000>;

		};



		opp-1608000000 {

			opp-hz = /bits/ 64 <1608000000>;

			opp-microvolt = <781000>;

		};



		opp-1704000000 {

			opp-hz = /bits/ 64 <1704000000>;

			opp-microvolt = <791000>;

		};



		opp-1800000000 {

			opp-hz = /bits/ 64 <1800000000>;

			opp-microvolt = <831000>;

		};



                opp-1908000000 {

                        opp-hz = /bits/ 64 <1908000000>;

                        opp-microvolt = <861000>;

                };



                opp-2016000000 {

                        opp-hz = /bits/ 64 <2016000000>;

                        opp-microvolt = <911000>;

                };



                opp-2108000000 {

                        opp-hz = /bits/ 64 <2108000000>;

                        opp-microvolt = <951000>;

                };



                opp-2208000000 {

                        opp-hz = /bits/ 64 <2208000000>;

                        opp-microvolt = <1011000>;

                };

	};

};

arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts

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


/dts-v1/;



#include "meson-g12b.dtsi"

#include "meson-g12b-s922x.dtsi"

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

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

#include <dt-bindings/sound/meson-g12a-tohdmitx.h>

arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi

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

/*

 * Copyright (c) 2019 BayLibre, SAS

 * Author: Neil Armstrong <narmstrong@baylibre.com>

 */



#include "meson-g12b.dtsi"



/ {

	cpu_opp_table_0: opp-table-0 {

		compatible = "operating-points-v2";

		opp-shared;



		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <731000>;

		};



		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			opp-microvolt = <731000>;

		};



		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <731000>;

		};



		opp-667000000 {

			opp-hz = /bits/ 64 <667000000>;

			opp-microvolt = <731000>;

		};



		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <731000>;

		};



		opp-1200000000 {

			opp-hz = /bits/ 64 <1200000000>;

			opp-microvolt = <731000>;

		};



		opp-1398000000 {

			opp-hz = /bits/ 64 <1398000000>;

			opp-microvolt = <761000>;

		};



		opp-1512000000 {

			opp-hz = /bits/ 64 <1512000000>;

			opp-microvolt = <791000>;

		};



		opp-1608000000 {

			opp-hz = /bits/ 64 <1608000000>;

			opp-microvolt = <831000>;

		};



		opp-1704000000 {

			opp-hz = /bits/ 64 <1704000000>;

			opp-microvolt = <861000>;

		};



		opp-1896000000 {

			opp-hz = /bits/ 64 <1896000000>;

			opp-microvolt = <981000>;

		};

	};



	cpub_opp_table_1: opp-table-1 {

		compatible = "operating-points-v2";

		opp-shared;



		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <751000>;

		};



		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			opp-microvolt = <751000>;

		};



		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <751000>;

		};



		opp-667000000 {

			opp-hz = /bits/ 64 <667000000>;

			opp-microvolt = <751000>;

		};



		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <771000>;

		};



		opp-1200000000 {

			opp-hz = /bits/ 64 <1200000000>;

			opp-microvolt = <771000>;

		};



		opp-1398000000 {

			opp-hz = /bits/ 64 <1398000000>;

			opp-microvolt = <791000>;

		};



		opp-1512000000 {

			opp-hz = /bits/ 64 <1512000000>;

			opp-microvolt = <821000>;

		};



		opp-1608000000 {

			opp-hz = /bits/ 64 <1608000000>;

			opp-microvolt = <861000>;

		};



		opp-1704000000 {

			opp-hz = /bits/ 64 <1704000000>;

			opp-microvolt = <891000>;

		};

	};

};

arch/arm64/boot/dts/amlogic/meson-g12b.dtsi

+0 −115
Original line number Diff line number Diff line
@@ -95,121 +95,6 @@ 
			compatible = "cache";

		};

	};



	cpu_opp_table_0: opp-table-0 {

		compatible = "operating-points-v2";

		opp-shared;



		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <731000>;

		};



		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			opp-microvolt = <731000>;

		};



		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <731000>;

		};



		opp-666666666 {

			opp-hz = /bits/ 64 <666666666>;

			opp-microvolt = <731000>;

		};



		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <731000>;

		};



		opp-1200000000 {

			opp-hz = /bits/ 64 <1200000000>;

			opp-microvolt = <731000>;

		};



		opp-1398000000 {

			opp-hz = /bits/ 64 <1398000000>;

			opp-microvolt = <761000>;

		};



		opp-1512000000 {

			opp-hz = /bits/ 64 <1512000000>;

			opp-microvolt = <791000>;

		};



		opp-1608000000 {

			opp-hz = /bits/ 64 <1608000000>;

			opp-microvolt = <831000>;

		};



		opp-1704000000 {

			opp-hz = /bits/ 64 <1704000000>;

			opp-microvolt = <861000>;

		};



		opp-1896000000 {

			opp-hz = /bits/ 64 <1896000000>;

			opp-microvolt = <981000>;

		};

	};



	cpub_opp_table_1: opp-table-1 {

		compatible = "operating-points-v2";

		opp-shared;



		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <751000>;

		};



		opp-250000000 {

			opp-hz = /bits/ 64 <250000000>;

			opp-microvolt = <751000>;

		};



		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <751000>;

		};



		opp-666666666 {

			opp-hz = /bits/ 64 <666666666>;

			opp-microvolt = <751000>;

		};



		opp-1000000000 {

			opp-hz = /bits/ 64 <1000000000>;

			opp-microvolt = <751000>;

		};



		opp-1200000000 {

			opp-hz = /bits/ 64 <1200000000>;

			opp-microvolt = <771000>;

		};



		opp-1398000000 {

			opp-hz = /bits/ 64 <1398000000>;

			opp-microvolt = <791000>;

		};



		opp-1512000000 {

			opp-hz = /bits/ 64 <1512000000>;

			opp-microvolt = <821000>;

		};



		opp-1608000000 {

			opp-hz = /bits/ 64 <1608000000>;

			opp-microvolt = <861000>;

		};



		opp-1704000000 {

			opp-hz = /bits/ 64 <1704000000>;

			opp-microvolt = <891000>;

		};

	};

};



&clkc {