From 735041a6138a33b1958590cb9635ce226f044a6b Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Sat, 24 Jul 2021 17:53:57 +0200 Subject: [PATCH] arm64: allwinner: Remove sun50i-a64-opp This is unneeded now that the DTS have the opp. MFC after: 1 week Sponsored by: Diablotin Systems --- release/arm64/PINE64-LTS.conf | 2 +- release/arm64/PINE64.conf | 2 +- release/arm64/PINEBOOK.conf | 2 +- sys/dts/arm64/overlays/sun50i-a64-opp.dtso | 77 ---------------------- sys/modules/dtb/allwinner/Makefile | 3 +- 5 files changed, 4 insertions(+), 82 deletions(-) delete mode 100644 sys/dts/arm64/overlays/sun50i-a64-opp.dtso diff --git a/release/arm64/PINE64-LTS.conf b/release/arm64/PINE64-LTS.conf index 4006f6273307..fa4ab6fd5302 100644 --- a/release/arm64/PINE64-LTS.conf +++ b/release/arm64/PINE64-LTS.conf @@ -13,7 +13,7 @@ IMAGE_SIZE="3072M" KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" PART_SCHEME="GPT" -FDT_OVERLAYS="sun50i-a64-timer,sun50i-a64-opp" +FDT_OVERLAYS="sun50i-a64-timer" export BOARDNAME="PINE64-LTS" arm_install_uboot() { diff --git a/release/arm64/PINE64.conf b/release/arm64/PINE64.conf index 87cb9c584c54..c5aa86fc8160 100644 --- a/release/arm64/PINE64.conf +++ b/release/arm64/PINE64.conf @@ -13,7 +13,7 @@ IMAGE_SIZE="3072M" KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" PART_SCHEME="GPT" -FDT_OVERLAYS="sun50i-a64-timer,sun50i-a64-opp" +FDT_OVERLAYS="sun50i-a64-timer" export BOARDNAME="PINE64" arm_install_uboot() { diff --git a/release/arm64/PINEBOOK.conf b/release/arm64/PINEBOOK.conf index da5d31149c04..17e287bc55ad 100644 --- a/release/arm64/PINEBOOK.conf +++ b/release/arm64/PINEBOOK.conf @@ -13,7 +13,7 @@ IMAGE_SIZE="3072M" KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" PART_SCHEME="GPT" -FDT_OVERLAYS="sun50i-a64-timer,sun50i-a64-opp" +FDT_OVERLAYS="sun50i-a64-timer" export BOARDNAME="PINEBOOK" arm_install_uboot() { diff --git a/sys/dts/arm64/overlays/sun50i-a64-opp.dtso b/sys/dts/arm64/overlays/sun50i-a64-opp.dtso deleted file mode 100644 index 8a26c2c20422..000000000000 --- a/sys/dts/arm64/overlays/sun50i-a64-opp.dtso +++ /dev/null @@ -1,77 +0,0 @@ -/dts-v1/; -/plugin/; - -/ { - compatible = "allwinner,sun50i-a64"; -}; - -&{/} { - cpu0_opp_table: opp_table0 { - compatible = "operating-points-v2"; - opp-shared; - - opp-648000000 { - opp-hz = /bits/ 64 <648000000>; - opp-microvolt = <1040000>; - clock-latency-ns = <244144>; /* 8 32k periods */ - }; - opp-792000000 { - opp-hz = /bits/ 64 <792000000>; - opp-microvolt = <1100000>; - clock-latency-ns = <244144>; /* 8 32k periods */ - }; - opp-816000000 { - opp-hz = /bits/ 64 <816000000>; - opp-microvolt = <1100000>; - clock-latency-ns = <244144>; /* 8 32k periods */ - }; - opp-912000000 { - opp-hz = /bits/ 64 <912000000>; - opp-microvolt = <1120000>; - clock-latency-ns = <244144>; /* 8 32k periods */ - }; - opp-960000000 { - opp-hz = /bits/ 64 <960000000>; - opp-microvolt = <1160000>; - clock-latency-ns = <244144>; /* 8 32k periods */ - }; - opp-1008000000 { - opp-hz = /bits/ 64 <1008000000>; - opp-microvolt = <1200000>; - clock-latency-ns = <244144>; /* 8 32k periods */ - }; - opp-1056000000 { - opp-hz = /bits/ 64 <1056000000>; - opp-microvolt = <1240000>; - clock-latency-ns = <244144>; /* 8 32k periods */ - }; - opp-1104000000 { - opp-hz = /bits/ 64 <1104000000>; - opp-microvolt = <1260000>; - clock-latency-ns = <244144>; /* 8 32k periods */ - }; - opp-1152000000 { - opp-hz = /bits/ 64 <1152000000>; - opp-microvolt = <1300000>; - clock-latency-ns = <244144>; /* 8 32k periods */ - }; - }; -}; - -&{/cpus/cpu@0} { - operating-points-v2 = <&cpu0_opp_table>; - clocks = <&ccu 1>; - cpu-supply = <®_dcdc2>; -}; - -&{/cpus/cpu@1} { - operating-points-v2 = <&cpu0_opp_table>; -}; - -&{/cpus/cpu@2} { - operating-points-v2 = <&cpu0_opp_table>; -}; - -&{/cpus/cpu@3} { - operating-points-v2 = <&cpu0_opp_table>; -}; diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index fe3dccc7fd91..5b9d93a7a20e 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -54,8 +54,7 @@ DTS= \ allwinner/sun50i-h6-pine-h64.dts \ allwinner/sun50i-h6-pine-h64-model-b.dts -DTSO= sun50i-a64-opp.dtso \ - sun50i-a64-pwm.dtso \ +DTSO= sun50i-a64-pwm.dtso \ sun50i-a64-rpwm.dtso \ sun50i-a64-spi0-spigen.dtso \ sun50i-a64-timer.dtso \