[PATCH] arm64: dts: amlogic: move CPU OPP table and clock assignment to SoC.dtsi
neil.armstrong at linaro.org
neil.armstrong at linaro.org
Wed Jan 7 06:03:18 PST 2026
On 1/6/26 10:06, Martin Blumenstingl wrote:
> Move the assignment of the CPU clocks and the CPU OPP table(s) from
> board.dts to SoC.dtsi to reduce the code duplication.
>
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
> ---
> .../boot/dts/amlogic/meson-g12a-fbx8am.dts | 8 -------
> .../dts/amlogic/meson-g12a-radxa-zero.dts | 8 -------
> .../boot/dts/amlogic/meson-g12a-sei510.dts | 8 -------
> .../boot/dts/amlogic/meson-g12a-u200.dts | 8 -------
> .../boot/dts/amlogic/meson-g12a-x96-max.dts | 8 -------
> arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 8 +++++++
> .../amlogic/meson-g12b-a311d-libretech-cc.dts | 13 ----------
> .../boot/dts/amlogic/meson-g12b-a311d.dtsi | 24 +++++++++++++++++++
> .../dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 12 ----------
> .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 12 ----------
> .../dts/amlogic/meson-g12b-khadas-vim3.dtsi | 12 ----------
> .../amlogic/meson-g12b-odroid-go-ultra.dts | 12 ----------
> .../boot/dts/amlogic/meson-g12b-odroid.dtsi | 12 ----------
> .../dts/amlogic/meson-g12b-radxa-zero2.dts | 12 ----------
> .../boot/dts/amlogic/meson-g12b-s922x.dtsi | 24 +++++++++++++++++++
> .../boot/dts/amlogic/meson-g12b-w400.dtsi | 12 ----------
> arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 7 ++++++
> .../boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 8 -------
> .../boot/dts/amlogic/meson-sm1-bananapi.dtsi | 8 -------
> .../dts/amlogic/meson-sm1-khadas-vim3l.dts | 8 -------
> .../boot/dts/amlogic/meson-sm1-odroid.dtsi | 8 -------
> .../amlogic/meson-sm1-s905d3-libretech-cc.dts | 9 -------
> .../boot/dts/amlogic/meson-sm1-sei610.dts | 8 -------
> arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 8 +++++++
> 24 files changed, 71 insertions(+), 186 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts
> index d0a3b4b9229c..abf6b63ea0d7 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts
> @@ -265,26 +265,18 @@ &clkc_audio {
>
> &cpu0 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu2 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu3 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> ðmac {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
> index 4353485c6f26..a85f383a1699 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
> @@ -218,26 +218,18 @@ &clkc_audio {
>
> &cpu0 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu2 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu3 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cvbs_vdac_port {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
> index f39fcabc763f..5b6716aeaae5 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
> @@ -312,26 +312,18 @@ &clkc_audio {
>
> &cpu0 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu2 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu3 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cvbs_vdac_port {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
> index b5bf8ecc91e6..dd9da7a5ec5f 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
> @@ -405,26 +405,18 @@ &clkc_audio {
>
> &cpu0 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu2 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu3 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &clkc_audio {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
> index 5ab460a3e637..015e3c7e3a91 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
> @@ -261,26 +261,18 @@ &clkc_audio {
>
> &cpu0 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu2 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu3 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cvbs_vdac_port {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
> index 1321ad95923d..51317d11f263 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
> @@ -25,6 +25,8 @@ cpu0: cpu at 0 {
> i-cache-sets = <32>;
> next-level-cache = <&l2>;
> #cooling-cells = <2>;
> + operating-points-v2 = <&cpu_opp_table>;
> + clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> cpu1: cpu at 1 {
> @@ -40,6 +42,8 @@ cpu1: cpu at 1 {
> i-cache-sets = <32>;
> next-level-cache = <&l2>;
> #cooling-cells = <2>;
> + operating-points-v2 = <&cpu_opp_table>;
> + clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> cpu2: cpu at 2 {
> @@ -55,6 +59,8 @@ cpu2: cpu at 2 {
> i-cache-sets = <32>;
> next-level-cache = <&l2>;
> #cooling-cells = <2>;
> + operating-points-v2 = <&cpu_opp_table>;
> + clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> cpu3: cpu at 3 {
> @@ -70,6 +76,8 @@ cpu3: cpu at 3 {
> i-cache-sets = <32>;
> next-level-cache = <&l2>;
> #cooling-cells = <2>;
> + operating-points-v2 = <&cpu_opp_table>;
> + clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> l2: l2-cache0 {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts
> index 82546b738977..5747acf8f337 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts
> @@ -6,7 +6,6 @@
>
> /dts-v1/;
>
> -#include <dt-bindings/clock/g12a-clkc.h>
> #include "meson-g12b-a311d.dtsi"
> #include "meson-libretech-cottonwood.dtsi"
>
> @@ -74,38 +73,26 @@ sound {
>
> &cpu0 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu100 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu101 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu102 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu103 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &pwm_ab {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
> index 8ecb5bd125c1..f15baa708b36 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
> @@ -109,3 +109,27 @@ opp-2208000000 {
> };
> };
> };
> +
> +&cpu0 {
> + operating-points-v2 = <&cpu_opp_table_0>;
> +};
> +
> +&cpu1 {
> + operating-points-v2 = <&cpu_opp_table_0>;
> +};
> +
> +&cpu100 {
> + operating-points-v2 = <&cpub_opp_table_1>;
> +};
> +
> +&cpu101 {
> + operating-points-v2 = <&cpub_opp_table_1>;
> +};
> +
> +&cpu102 {
> + operating-points-v2 = <&cpub_opp_table_1>;
> +};
> +
> +&cpu103 {
> + operating-points-v2 = <&cpub_opp_table_1>;
> +};
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
> index 39011b645128..7a204d324dd4 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
> @@ -153,38 +153,26 @@ &cecb_AO {
>
> &cpu0 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu100 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu101 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu102 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu103 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &ext_mdio {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
> index 1b08303c4282..4321d08d11a6 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
> @@ -261,38 +261,26 @@ &cecb_AO {
>
> &cpu0 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu100 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu101 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu102 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu103 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> ðmac {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
> index fc737499f207..b16247e0df9f 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
> @@ -49,38 +49,26 @@ vddcpu_b: regulator-vddcpu-b {
>
> &cpu0 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu100 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu101 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu102 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu103 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &pwm_ab {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
> index d5938a4a6da3..c81d7fdbe2f5 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
> @@ -279,38 +279,26 @@ &arb {
>
> &cpu0 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu100 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu101 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu102 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu103 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> /* RK817 only supports 12.5mV steps, round up the values */
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
> index 3298d59833b6..88d995006f94 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
> @@ -225,38 +225,26 @@ &clkc_audio {
>
> &cpu0 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu100 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu101 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu102 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu103 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu_thermal {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
> index 1e5c6f984945..e95e193eaebc 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
> @@ -257,38 +257,26 @@ &clkc_audio {
>
> &cpu0 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu100 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu101 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu102 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu103 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu_thermal {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
> index 19cad93a6889..eef98add05c6 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
> @@ -99,3 +99,27 @@ opp-1908000000 {
> };
> };
> };
> +
> +&cpu0 {
> + operating-points-v2 = <&cpu_opp_table_0>;
> +};
> +
> +&cpu1 {
> + operating-points-v2 = <&cpu_opp_table_0>;
> +};
> +
> +&cpu100 {
> + operating-points-v2 = <&cpub_opp_table_1>;
> +};
> +
> +&cpu101 {
> + operating-points-v2 = <&cpub_opp_table_1>;
> +};
> +
> +&cpu102 {
> + operating-points-v2 = <&cpub_opp_table_1>;
> +};
> +
> +&cpu103 {
> + operating-points-v2 = <&cpub_opp_table_1>;
> +};
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
> index 9b6d780eada7..4834f418bef5 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
> @@ -211,38 +211,26 @@ &cecb_AO {
>
> &cpu0 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table_0>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu100 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu101 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu102 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cpu103 {
> cpu-supply = <&vddcpu_a>;
> - operating-points-v2 = <&cpub_opp_table_1>;
> - clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> &cvbs_vdac_port {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
> index 9d5e28cf5958..7aff554085e3 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
> @@ -57,6 +57,7 @@ cpu0: cpu at 0 {
> i-cache-sets = <32>;
> next-level-cache = <&l2_cache_b>;
> #cooling-cells = <2>;
> + clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> cpu1: cpu at 1 {
> @@ -73,6 +74,7 @@ cpu1: cpu at 1 {
> i-cache-sets = <32>;
> next-level-cache = <&l2_cache_b>;
> #cooling-cells = <2>;
> + clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> cpu100: cpu at 100 {
> @@ -89,6 +91,7 @@ cpu100: cpu at 100 {
> i-cache-sets = <32>;
> next-level-cache = <&l2_cache_b>;
> #cooling-cells = <2>;
> + clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> cpu101: cpu at 101 {
> @@ -105,6 +108,7 @@ cpu101: cpu at 101 {
> i-cache-sets = <32>;
> next-level-cache = <&l2_cache_b>;
> #cooling-cells = <2>;
> + clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> cpu102: cpu at 102 {
> @@ -121,6 +125,7 @@ cpu102: cpu at 102 {
> i-cache-sets = <64>;
> next-level-cache = <&l2_cache_b>;
> #cooling-cells = <2>;
> + clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> cpu103: cpu at 103 {
> @@ -137,6 +142,8 @@ cpu103: cpu at 103 {
> i-cache-sets = <64>;
> next-level-cache = <&l2_cache_b>;
> #cooling-cells = <2>;
> + operating-points-v2 = <&cpub_opp_table_1>;
> + clocks = <&clkc CLKID_CPUB_CLK>;
> };
>
> l2_cache_l: l2-cache-cluster0 {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
> index 9be3084b090d..661e454ca673 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
> @@ -145,26 +145,18 @@ &cecb_AO {
>
> &cpu0 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU1_CLK>;
> };
>
> &cpu2 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU2_CLK>;
> };
>
> &cpu3 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU3_CLK>;
> };
>
> &cvbs_vdac_port {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
> index 5e07f0f9538e..f0e4b168a411 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
> @@ -183,26 +183,18 @@ &arb {
>
> &cpu0 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU1_CLK>;
> };
>
> &cpu2 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU2_CLK>;
> };
>
> &cpu3 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU3_CLK>;
> };
>
> &ext_mdio {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
> index a3d9b66b6878..4e1e9a502666 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
> @@ -49,26 +49,18 @@ sound {
>
> &cpu0 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU1_CLK>;
> };
>
> &cpu2 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU2_CLK>;
> };
>
> &cpu3 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU3_CLK>;
> };
>
> &pwm_AO_cd {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
> index c4524eb4f099..ad886d446e96 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
> @@ -248,26 +248,18 @@ &clkc_audio {
>
> &cpu0 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU1_CLK>;
> };
>
> &cpu2 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU2_CLK>;
> };
>
> &cpu3 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU3_CLK>;
> };
>
> &ext_mdio {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-s905d3-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-s905d3-libretech-cc.dts
> index 5daadfb170b4..2a16f54332df 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-sm1-s905d3-libretech-cc.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-s905d3-libretech-cc.dts
> @@ -6,7 +6,6 @@
>
> /dts-v1/;
>
> -#include <dt-bindings/clock/g12a-clkc.h>
> #include "meson-sm1.dtsi"
> #include "meson-libretech-cottonwood.dtsi"
>
> @@ -62,24 +61,16 @@ sound {
>
> &cpu0 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU1_CLK>;
> };
>
> &cpu2 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU2_CLK>;
> };
>
> &cpu3 {
> cpu-supply = <&vddcpu_b>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU3_CLK>;
> };
> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
> index 024d2eb8e6ee..e275b0f36b09 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
> @@ -357,26 +357,18 @@ &clkc_audio {
>
> &cpu0 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> &cpu1 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU1_CLK>;
> };
>
> &cpu2 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU2_CLK>;
> };
>
> &cpu3 {
> cpu-supply = <&vddcpu>;
> - operating-points-v2 = <&cpu_opp_table>;
> - clocks = <&clkc CLKID_CPU3_CLK>;
> };
>
> ðmac {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
> index e5db8ce94062..8f5b850b1774 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
> @@ -63,6 +63,8 @@ cpu0: cpu at 0 {
> i-cache-sets = <32>;
> next-level-cache = <&l2>;
> #cooling-cells = <2>;
> + operating-points-v2 = <&cpu_opp_table>;
> + clocks = <&clkc CLKID_CPU_CLK>;
> };
>
> cpu1: cpu at 1 {
> @@ -78,6 +80,8 @@ cpu1: cpu at 1 {
> i-cache-sets = <32>;
> next-level-cache = <&l2>;
> #cooling-cells = <2>;
> + operating-points-v2 = <&cpu_opp_table>;
> + clocks = <&clkc CLKID_CPU1_CLK>;
> };
>
> cpu2: cpu at 2 {
> @@ -93,6 +97,8 @@ cpu2: cpu at 2 {
> i-cache-sets = <32>;
> next-level-cache = <&l2>;
> #cooling-cells = <2>;
> + operating-points-v2 = <&cpu_opp_table>;
> + clocks = <&clkc CLKID_CPU2_CLK>;
> };
>
> cpu3: cpu at 3 {
> @@ -108,6 +114,8 @@ cpu3: cpu at 3 {
> i-cache-sets = <32>;
> next-level-cache = <&l2>;
> #cooling-cells = <2>;
> + operating-points-v2 = <&cpu_opp_table>;
> + clocks = <&clkc CLKID_CPU3_CLK>;
> };
>
> l2: l2-cache0 {
Thanks for the cleanup!
Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>
Thanks,
Neil
More information about the linux-amlogic
mailing list