From d6185b560000dda25029727464b8a262d23ee0f9 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Tue, 3 May 2016 15:56:53 +0300 Subject: [PATCH] Fix DVFS settings for several H3 boards --- config/boards/nanopim1.conf | 2 +- config/fex/nanopim1.fex | 6 ++++-- config/fex/orangepilite.fex | 6 ++++-- config/fex/orangepione.fex | 6 ++++-- scripts/firstrun | 6 ++---- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/config/boards/nanopim1.conf b/config/boards/nanopim1.conf index 4bba40395..98511843d 100644 --- a/config/boards/nanopim1.conf +++ b/config/boards/nanopim1.conf @@ -3,7 +3,7 @@ LINUXFAMILY=sun8i BOOTCONFIG=FriendlyARM_NanoPi_M1_defconfig MODULES="#gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #ap6211" MODULES_NEXT="brcmfmac" -CPUMIN=240000 +CPUMIN=480000 CPUMAX=1200000 CLI_TARGET="jessie:default,dev" DESKTOP_TARGET="jessie:default" diff --git a/config/fex/nanopim1.fex b/config/fex/nanopim1.fex index 0f6f4fb25..94d565863 100644 --- a/config/fex/nanopim1.fex +++ b/config/fex/nanopim1.fex @@ -692,10 +692,10 @@ ls_used = 0 pmuic_type = 1 pmu_gpio0 = port:PL06<1><1><2><1> pmu_level0 = 11300 -pmu_level1 = 01100 +pmu_level1 = 1100 max_freq = 1200000000 min_freq = 480000000 -LV_count = 4 +LV_count = 5 LV1_freq = 1200000000 LV1_volt = 1300 LV2_freq = 1008000000 @@ -704,6 +704,8 @@ LV3_freq = 816000000 LV3_volt = 1100 LV4_freq = 648000000 LV4_volt = 1100 +LV5_freq = 480000000 +LV5_volt = 1100 [gpu_dvfs_table] G_LV_count = 3 diff --git a/config/fex/orangepilite.fex b/config/fex/orangepilite.fex index c70709df2..cb8c16b07 100644 --- a/config/fex/orangepilite.fex +++ b/config/fex/orangepilite.fex @@ -727,10 +727,10 @@ ir_tx = port:PH07<2> pmuic_type = 1 pmu_gpio0 = port:PL06<1><1><2><1> pmu_level0 = 11300 -pmu_level1 = 01100 +pmu_level1 = 1100 max_freq = 1200000000 min_freq = 480000000 -LV_count = 4 +LV_count = 5 LV1_freq = 1200000000 LV1_volt = 1300 LV2_freq = 1008000000 @@ -739,6 +739,8 @@ LV3_freq = 816000000 LV3_volt = 1100 LV4_freq = 648000000 LV4_volt = 1100 +LV5_freq = 480000000 +LV5_volt = 1100 [gpu_dvfs_table] G_LV_count = 3 diff --git a/config/fex/orangepione.fex b/config/fex/orangepione.fex index 4dabfbd40..ec94f12fc 100644 --- a/config/fex/orangepione.fex +++ b/config/fex/orangepione.fex @@ -727,10 +727,10 @@ ir_tx = port:PH07<2> pmuic_type = 1 pmu_gpio0 = port:PL06<1><1><2><1> pmu_level0 = 11300 -pmu_level1 = 01100 +pmu_level1 = 1100 max_freq = 1200000000 min_freq = 480000000 -LV_count = 4 +LV_count = 5 LV1_freq = 1200000000 LV1_volt = 1300 LV2_freq = 1008000000 @@ -739,6 +739,8 @@ LV3_freq = 816000000 LV3_volt = 1100 LV4_freq = 648000000 LV4_volt = 1100 +LV5_freq = 480000000 +LV5_volt = 1100 [gpu_dvfs_table] G_LV_count = 3 diff --git a/scripts/firstrun b/scripts/firstrun index 694d3e421..053d882e2 100644 --- a/scripts/firstrun +++ b/scripts/firstrun @@ -141,13 +141,11 @@ autodetect_sunxi() { ;; "Orange Pi One") ln -sf /boot/bin/orangepione.bin /boot/script.bin - sed -i -e 's/MIN_SPEED=480000/MIN_SPEED=648000/' \ - -e 's/MAX_SPEED=1296000/MAX_SPEED=1200000/' /etc/default/cpufrequtils + sed -i -e 's/MAX_SPEED=1296000/MAX_SPEED=1200000/' /etc/default/cpufrequtils ;; "Orange Pi Lite") ln -sf /boot/bin/orangepilite.bin /boot/script.bin - sed -i -e 's/MIN_SPEED=480000/MIN_SPEED=648000/' \ - -e 's/MAX_SPEED=1296000/MAX_SPEED=1200000/' /etc/default/cpufrequtils + sed -i -e 's/MAX_SPEED=1296000/MAX_SPEED=1200000/' /etc/default/cpufrequtils ;; "Banana Pi M2+") if [ "X${ScriptBinName}" != "X${ScriptBinUsed##*/}" ]; then