From nobody Sun Feb 8 20:13:05 2026 Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74585304BDF for ; Fri, 9 Jan 2026 21:02:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767992556; cv=none; b=Q2tDoqmF8yk02+tfOv0CIaZi+Ef3ZkRojCMA0lHlIpKDOJg9OYSAZo+AixnwNEt7Eews2+R4fVbKuIj3X+c4pcwpCJ5wQO3OVqCUrUKIUf3uLOxnNdTSDlcIOP4cOFEEa+nNcEazLJLeleqDugYvxSLQ7iqvFYK4AXoZv/Khaew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767992556; c=relaxed/simple; bh=MIhCbUC5ocN+9NwYvrFWPw2726/aOQXhvOjlUZfkMXc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=lOLhm/qRgvLS6IaztUlUGJYb1f/2Vlrhr/0/lJfsFXTCSmyvUpg6xzo98wDMHKJY9z6XbC4vE8r5LeQuPSeAft3H9NjqRwh3rdgaGM0oD3JdBTb3VVum4W7pMPjY/J4HBgEbEQ/I/gHBJLJLPDsQkiuh6ENMU0OQOw/DMjoX3tE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com; spf=pass smtp.mailfrom=googlemail.com; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b=Y95o7UR5; arc=none smtp.client-ip=209.85.208.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=googlemail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="Y95o7UR5" Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-64baaa754c6so6385060a12.3 for ; Fri, 09 Jan 2026 13:02:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1767992549; x=1768597349; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fV2e32+Ij+WSa21EamLUbL8uiXqtCH1kWHqaBcm+AnE=; b=Y95o7UR5Urvhvw766zVSn0i9xxTivqNBiv7mpxYqQht0SDiapSTxwtH2US8Huw0kd3 jjDLdSeIq9pHUVSCS0VDIwNN3fKjgMlDBNnZIiaKWNkFJFp6wXgrQ033nXltrQXPnYpQ uHRC2egRHcpxWbchUkxJE7/es33WV6DO2u2V/jWxOdMPmiNNbZsDy/ASN6cI8b2Cp9Tr EYljI7M5YMPRf2LOJfVGhZ/Etr0bBmiHKuAmhC7qjUX28M3qSbijzWwWclacIOxlR6Ij KQngEAqEbM6Ytr1D5QJj8n0Um2Dg6tVhQVs8Q1XrgKtkTG0+V+kWSy0iHgsZLgh7cUnk 9khA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767992549; x=1768597349; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fV2e32+Ij+WSa21EamLUbL8uiXqtCH1kWHqaBcm+AnE=; b=XOOJ2LTqCuhO7sBGGOw+iFKCZQWKznMsDXeHQrvEdjxoVU3gLhSSLnWnpxQ4ddedht hxrfpPfdJ96EMCk8EJXO3shl80KY1SIeVro2sdjOC11p326yRJoDyNdAZ+Iitlbn7S5Z GTIF+UoMC5DrvlN57aDBMVAAKna03NLj16PG9J7QYF4+Adb1xeMpQQG27elheBPMnajO S7P1BXCHfHMU+MbKrECyuor5lnPjLNKOVjJtZ/QhVLCGsm9YS2rwlKE1Sd/QbUG7ijyA qM4CqOOgYeT3cFzdx++1A+ullpxCi7VHx9uaK5aRiEG80lCerEVx0aYhTJ8VQD/EkR/X 5rCA== X-Forwarded-Encrypted: i=1; AJvYcCX4EDCfe4qce/CIG1DbPPKFC5Prf9ukcvqayKW/xpqlvevAeggQZwFe69CQ0r6ZMpITf0FKBLoBe7bKmx8=@vger.kernel.org X-Gm-Message-State: AOJu0YxwATfk9KQi30hoKeN1HMl6GryyhFg6EJDia8lbADsqTda91z3j Vj0zYH6yePFqVYaCsjOwJC70Jbu334503rl62w/rg276Jh38ZwfzvF5k X-Gm-Gg: AY/fxX4ZnY7JUjR1f/kfOqexzJkYufoMcRcwp8AaWYdLaJ0TUtHD0s17gi8Wlc9ENAu XoGGxyO5qEtRqmIGFRjD1srRCs8OctIk56ggXLLdrxB0KMz/AHmBxzx6ta3vZQt/9Unt5t4fjSo xw3mPkh6JNKBHu2qIZOfF1gjuhv4tsGYVqDgjnpKPjy7Zos25NSo5KU/GuLLhS6p2U77dE8YKfE vZ12izJ0k3us7Q+1Q/RgFO122J6m2WaReBqo6+PYP3tQyO2kOzyGuYWaaS8BFbfUr5dgr4GUmDL C1hLVWxbi9iINmNzGz6jS2Cj17lauT2SlVd1Akzzqt6DEysDrRJVRjkfU5ymmQc40nJBbLy5P2Y SJVr+VDd9qq9Q59bipY1SK+xqmvW5Ww/tu6GjPANib62DUmwkiJQ2l9FP5/WY1Omeekm37ph95u FIhWaux9vt344HFWLU+m+H0OR5oE5SzK81KTsaQ+UjOQmV29J0rrXh4IGSWVTx8dWAVHMXibI5K bx8pydZ2MAvase9sJDTPt/R5r+2Yk6yO12vZLFIjNM= X-Google-Smtp-Source: AGHT+IGRZySNRyM85Hacs42nYDTPpBQ3MX8sowJF4XP7WFryeun3vhdWyZgSoov4UeJOWt3GLTnYCQ== X-Received: by 2002:a17:907:7f86:b0:b84:2b4b:ab12 with SMTP id a640c23a62f3a-b84453a1251mr1037515966b.40.1767992548990; Fri, 09 Jan 2026 13:02:28 -0800 (PST) Received: from blackbox (dynamic-2a02-3100-afbb-db00-1e86-0bff-fe2f-57b7.310.pool.telefonica.de. [2a02:3100:afbb:db00:1e86:bff:fe2f:57b7]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-b842a4d3113sm1217894866b.43.2026.01.09.13.02.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jan 2026 13:02:27 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, neil.armstrong@linaro.org, Martin Blumenstingl Subject: [PATCH v2] arm64: dts: amlogic: move CPU OPP table and clock assignment to SoC.dtsi Date: Fri, 9 Jan 2026 22:02:17 +0100 Message-ID: <20260109210217.828961-1-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Neil Armstrong --- Changes since v1 at [0]: - rebase on top of 6.19-rc1 (previously I had a temporary change as parent of this one (which resulted in v1 not applying) [0] https://lore.kernel.org/linux-amlogic/890f1ce6-60d2-47d4-8552-940f3abd7= c1e@linaro.org/T/#m25c47d91bbc194cc228ea3c4efc653edccadf7db .../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 { =20 &cpu0 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu2 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu3 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 ðmac { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/a= rm64/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 { =20 &cpu0 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu2 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu3 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &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 { =20 &cpu0 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu2 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu3 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cvbs_vdac_port { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/b= oot/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 { =20 &cpu0 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu2 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu3 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &clkc_audio { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm6= 4/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 { =20 &cpu0 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu2 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu3 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &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@0 { i-cache-sets =3D <32>; next-level-cache =3D <&l2>; #cooling-cells =3D <2>; + operating-points-v2 =3D <&cpu_opp_table>; + clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 cpu1: cpu@1 { @@ -40,6 +42,8 @@ cpu1: cpu@1 { i-cache-sets =3D <32>; next-level-cache =3D <&l2>; #cooling-cells =3D <2>; + operating-points-v2 =3D <&cpu_opp_table>; + clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 cpu2: cpu@2 { @@ -55,6 +59,8 @@ cpu2: cpu@2 { i-cache-sets =3D <32>; next-level-cache =3D <&l2>; #cooling-cells =3D <2>; + operating-points-v2 =3D <&cpu_opp_table>; + clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 cpu3: cpu@3 { @@ -70,6 +76,8 @@ cpu3: cpu@3 { i-cache-sets =3D <32>; next-level-cache =3D <&l2>; #cooling-cells =3D <2>; + operating-points-v2 =3D <&cpu_opp_table>; + clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 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 @@ =20 /dts-v1/; =20 -#include #include "meson-g12b-a311d.dtsi" #include "meson-libretech-cottonwood.dtsi" =20 @@ -74,38 +73,26 @@ sound { =20 &cpu0 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu100 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu101 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu102 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu103 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &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 =3D <&cpu_opp_table_0>; +}; + +&cpu1 { + operating-points-v2 =3D <&cpu_opp_table_0>; +}; + +&cpu100 { + operating-points-v2 =3D <&cpub_opp_table_1>; +}; + +&cpu101 { + operating-points-v2 =3D <&cpub_opp_table_1>; +}; + +&cpu102 { + operating-points-v2 =3D <&cpub_opp_table_1>; +}; + +&cpu103 { + operating-points-v2 =3D <&cpub_opp_table_1>; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arc= h/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 { =20 &cpu0 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu100 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu101 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu102 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu103 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &ext_mdio { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/ar= m64/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 { =20 &cpu0 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu100 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu101 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu102 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu103 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 ð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 { =20 &cpu0 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu100 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu101 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu102 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu103 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &pwm_ab { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/a= rch/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 { =20 &cpu0 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu100 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu101 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu102 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu103 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 /* RK817 only supports 12.5mV steps, round up the values */ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm6= 4/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 { =20 &cpu0 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu100 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu101 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu102 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu103 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &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 { =20 &cpu0 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu100 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu101 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu102 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu103 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &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 =3D <&cpu_opp_table_0>; +}; + +&cpu1 { + operating-points-v2 =3D <&cpu_opp_table_0>; +}; + +&cpu100 { + operating-points-v2 =3D <&cpub_opp_table_1>; +}; + +&cpu101 { + operating-points-v2 =3D <&cpub_opp_table_1>; +}; + +&cpu102 { + operating-points-v2 =3D <&cpub_opp_table_1>; +}; + +&cpu103 { + operating-points-v2 =3D <&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 { =20 &cpu0 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table_0>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu100 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu101 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu102 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cpu103 { cpu-supply =3D <&vddcpu_a>; - operating-points-v2 =3D <&cpub_opp_table_1>; - clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 &cvbs_vdac_port { diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/= dts/amlogic/meson-g12b.dtsi index 23358d94844c..18506d54d239 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@0 { i-cache-sets =3D <32>; next-level-cache =3D <&l2_cache_l>; #cooling-cells =3D <2>; + clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 cpu1: cpu@1 { @@ -73,6 +74,7 @@ cpu1: cpu@1 { i-cache-sets =3D <32>; next-level-cache =3D <&l2_cache_l>; #cooling-cells =3D <2>; + clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 cpu100: cpu@100 { @@ -89,6 +91,7 @@ cpu100: cpu@100 { i-cache-sets =3D <32>; next-level-cache =3D <&l2_cache_b>; #cooling-cells =3D <2>; + clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 cpu101: cpu@101 { @@ -105,6 +108,7 @@ cpu101: cpu@101 { i-cache-sets =3D <32>; next-level-cache =3D <&l2_cache_b>; #cooling-cells =3D <2>; + clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 cpu102: cpu@102 { @@ -121,6 +125,7 @@ cpu102: cpu@102 { i-cache-sets =3D <64>; next-level-cache =3D <&l2_cache_b>; #cooling-cells =3D <2>; + clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 cpu103: cpu@103 { @@ -137,6 +142,8 @@ cpu103: cpu@103 { i-cache-sets =3D <64>; next-level-cache =3D <&l2_cache_b>; #cooling-cells =3D <2>; + operating-points-v2 =3D <&cpub_opp_table_1>; + clocks =3D <&clkc CLKID_CPUB_CLK>; }; =20 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 { =20 &cpu0 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU1_CLK>; }; =20 &cpu2 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU2_CLK>; }; =20 &cpu3 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU3_CLK>; }; =20 &cvbs_vdac_port { diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm= 64/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 { =20 &cpu0 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU1_CLK>; }; =20 &cpu2 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU2_CLK>; }; =20 &cpu3 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU3_CLK>; }; =20 &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 { =20 &cpu0 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU1_CLK>; }; =20 &cpu2 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU2_CLK>; }; =20 &cpu3 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU3_CLK>; }; =20 &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 { =20 &cpu0 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU1_CLK>; }; =20 &cpu2 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU2_CLK>; }; =20 &cpu3 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU3_CLK>; }; =20 &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 @@ =20 /dts-v1/; =20 -#include #include "meson-sm1.dtsi" #include "meson-libretech-cottonwood.dtsi" =20 @@ -62,24 +61,16 @@ sound { =20 &cpu0 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU1_CLK>; }; =20 &cpu2 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU2_CLK>; }; =20 &cpu3 { cpu-supply =3D <&vddcpu_b>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&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 { =20 &cpu0 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 &cpu1 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU1_CLK>; }; =20 &cpu2 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU2_CLK>; }; =20 &cpu3 { cpu-supply =3D <&vddcpu>; - operating-points-v2 =3D <&cpu_opp_table>; - clocks =3D <&clkc CLKID_CPU3_CLK>; }; =20 ðmac { diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/d= ts/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@0 { i-cache-sets =3D <32>; next-level-cache =3D <&l2>; #cooling-cells =3D <2>; + operating-points-v2 =3D <&cpu_opp_table>; + clocks =3D <&clkc CLKID_CPU_CLK>; }; =20 cpu1: cpu@1 { @@ -78,6 +80,8 @@ cpu1: cpu@1 { i-cache-sets =3D <32>; next-level-cache =3D <&l2>; #cooling-cells =3D <2>; + operating-points-v2 =3D <&cpu_opp_table>; + clocks =3D <&clkc CLKID_CPU1_CLK>; }; =20 cpu2: cpu@2 { @@ -93,6 +97,8 @@ cpu2: cpu@2 { i-cache-sets =3D <32>; next-level-cache =3D <&l2>; #cooling-cells =3D <2>; + operating-points-v2 =3D <&cpu_opp_table>; + clocks =3D <&clkc CLKID_CPU2_CLK>; }; =20 cpu3: cpu@3 { @@ -108,6 +114,8 @@ cpu3: cpu@3 { i-cache-sets =3D <32>; next-level-cache =3D <&l2>; #cooling-cells =3D <2>; + operating-points-v2 =3D <&cpu_opp_table>; + clocks =3D <&clkc CLKID_CPU3_CLK>; }; =20 l2: l2-cache0 { --=20 2.52.0