From b1afe9a41a1eef93adbfeced550f1a7372fbc3e9 Mon Sep 17 00:00:00 2001 From: Hong Guo Date: Mon, 14 May 2018 19:35:02 +0800 Subject: [PATCH] arm64: dts: g12a: add cpufreq 1.92G. PD#165143: cpufreq: add cpufreq 1.92G. Change-Id: I8b9dddf8c4c138bf4b5763f707c174ad48e8a53a Signed-off-by: Hong Guo --- arch/arm64/boot/dts/amlogic/g12a_pxp.dts | 3 ++- arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts | 3 ++- arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts | 3 ++- arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts | 3 ++- arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts | 3 ++- arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts | 3 ++- arch/arm64/boot/dts/amlogic/g12a_s905d2_u220.dts | 3 ++- arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts | 3 ++- arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts | 3 ++- arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts | 3 ++- drivers/amlogic/clk/g12a/g12a.h | 1 + 11 files changed, 21 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts index c208b8fd77e5..7953333067e5 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts @@ -350,6 +350,7 @@ }; /* Audio Related end */ + /*DCDC for MP8756GD*/ cpu_opp_table0: cpu_opp_table0 { compatible = "operating-points-v2"; opp-shared; @@ -395,7 +396,7 @@ opp-microvolt = <861000>; }; opp10 { - opp-hz = /bits/ 64 <1896000000>; + opp-hz = /bits/ 64 <1920000000>; opp-microvolt = <981000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts index c4db9d8a68a9..e062c368b284 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts @@ -621,6 +621,7 @@ }; /* Audio Related end */ + /*DCDC for MP8756GD*/ cpu_opp_table0: cpu_opp_table0 { compatible = "operating-points-v2"; opp-shared; @@ -666,7 +667,7 @@ opp-microvolt = <861000>; }; opp10 { - opp-hz = /bits/ 64 <1896000000>; + opp-hz = /bits/ 64 <1920000000>; opp-microvolt = <981000>; }; opp11 { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts index 8104450032d0..667b5f2a6d4c 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts @@ -570,6 +570,7 @@ }; /* Audio Related end */ + /*DCDC for MP8756GD*/ cpu_opp_table0: cpu_opp_table0 { compatible = "operating-points-v2"; opp-shared; @@ -615,7 +616,7 @@ opp-microvolt = <861000>; }; opp10 { - opp-hz = /bits/ 64 <1896000000>; + opp-hz = /bits/ 64 <1920000000>; opp-microvolt = <981000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts index a08974b90704..2eef8e0a28b3 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts @@ -660,6 +660,7 @@ }; /* Audio Related end */ + /*DCDC for MP8756GD*/ cpu_opp_table0: cpu_opp_table0 { compatible = "operating-points-v2"; opp-shared; @@ -705,7 +706,7 @@ opp-microvolt = <861000>; }; opp10 { - opp-hz = /bits/ 64 <1896000000>; + opp-hz = /bits/ 64 <1920000000>; opp-microvolt = <981000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts index 52074456d54a..7fd43d142379 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts @@ -728,6 +728,7 @@ }; /* Audio Related end */ + /*DCDC for MP8756GD*/ cpu_opp_table0: cpu_opp_table0 { compatible = "operating-points-v2"; opp-shared; @@ -773,7 +774,7 @@ opp-microvolt = <861000>; }; opp10 { - opp-hz = /bits/ 64 <1896000000>; + opp-hz = /bits/ 64 <1920000000>; opp-microvolt = <981000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts index a9b8e7937965..cdefd47a3420 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts @@ -729,6 +729,7 @@ }; /* Audio Related end */ + /*DCDC for MP8756GD*/ cpu_opp_table0: cpu_opp_table0 { compatible = "operating-points-v2"; opp-shared; @@ -774,7 +775,7 @@ opp-microvolt = <861000>; }; opp10 { - opp-hz = /bits/ 64 <1896000000>; + opp-hz = /bits/ 64 <1920000000>; opp-microvolt = <981000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u220.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u220.dts index 519de9408ae3..c4e8261ac316 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u220.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u220.dts @@ -647,6 +647,7 @@ }; /* Audio Related end */ + /*DCDC for SY8120B1ABC*/ cpu_opp_table0: cpu_opp_table0 { compatible = "operating-points-v2"; opp-shared; @@ -692,7 +693,7 @@ opp-microvolt = <861000>; }; opp10 { - opp-hz = /bits/ 64 <1896000000>; + opp-hz = /bits/ 64 <1920000000>; opp-microvolt = <981000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts index 43336ad4081c..ae5deb78ecc9 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts @@ -661,6 +661,7 @@ }; /* Audio Related end */ + /*DCDC for SY8120B1ABC*/ cpu_opp_table0: cpu_opp_table0 { compatible = "operating-points-v2"; opp-shared; @@ -706,7 +707,7 @@ opp-microvolt = <921000>; }; opp10 { - opp-hz = /bits/ 64 <1896000000>; + opp-hz = /bits/ 64 <1920000000>; opp-microvolt = <1011000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts index dbc7fa6c2d5b..99993f8ea0de 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts @@ -758,6 +758,7 @@ }; /* Audio Related end */ + /*DCDC for SY8120B1ABC*/ cpu_opp_table0: cpu_opp_table0 { compatible = "operating-points-v2"; opp-shared; @@ -803,7 +804,7 @@ opp-microvolt = <861000>; }; opp10 { - opp-hz = /bits/ 64 <1896000000>; + opp-hz = /bits/ 64 <1920000000>; opp-microvolt = <981000>; }; }; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts index af4902fd8982..f7369f882b45 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts @@ -621,6 +621,7 @@ }; /* Audio Related end */ + /*DCDC for MP1605GTF*/ cpu_opp_table0: cpu_opp_table0 { compatible = "operating-points-v2"; opp-shared; @@ -666,7 +667,7 @@ opp-microvolt = <861000>; }; opp10 { - opp-hz = /bits/ 64 <1896000000>; + opp-hz = /bits/ 64 <1920000000>; opp-microvolt = <981000>; }; }; diff --git a/drivers/amlogic/clk/g12a/g12a.h b/drivers/amlogic/clk/g12a/g12a.h index d85be70d82b2..03a060c43ea4 100644 --- a/drivers/amlogic/clk/g12a/g12a.h +++ b/drivers/amlogic/clk/g12a/g12a.h @@ -137,6 +137,7 @@ static const struct pll_rate_table g12a_pll_rate_table[] = { PLL_RATE(1704000000, 142, 1, 1), /*DCO=3408M*/ PLL_RATE(1800000000, 150, 1, 1), /*DCO=3600M*/ PLL_RATE(1896000000, 158, 1, 1), /*DCO=3792M*/ + PLL_RATE(1920000000, 160, 1, 1), /*DCO=3840M*/ PLL_RATE(2016000000, 168, 1, 1), /*DCO=4032M*/ PLL_RATE(2100000000, 175, 1, 1), /*DCO=4200M*/ PLL_RATE(2196000000, 183, 1, 1), /*DCO=4392M*/