Add imx7d speed grading and higher OPPs
Subsystems (5)
cover Add imx7d speed grading and higher OPPs
Changes since v1:
* Remove the match list from imx-cpufreq-dt
* Split arch and cpufreq changes
Link to v1: https://patchwork.kernel.org/project/linux-arm-kernel/list/?series=124427
Leonard Crestez (5):
cpufreq: imx-cpufreq-dt: Remove global platform match list
cpufreq: Switch imx7d to imx-cpufreq-dt for speed grading
ARM: imx: Switch imx7d to imx-cpufreq-dt for speed-grading
ARM: dts: imx7d: Update cpufreq OPP table
ARM: imx_v6_v7_defconfig: Enable CONFIG_ARM_IMX_CPUFREQ_DT
arch/arm/boot/dts/imx7d.dtsi | 16 +++++++++++++--- arch/arm/boot/dts/imx7s.dtsi | 4 ++++ arch/arm/configs/imx_v6_v7_defconfig | 1 + arch/arm/mach-imx/mach-imx7d.c | 7 +++++++ drivers/cpufreq/cpufreq-dt-platdev.c | 2 +- drivers/cpufreq/imx-cpufreq-dt.c | 18 ++---------------- 6 files changed, 28 insertions(+), 20 deletions(-)
Signature · 1 line
2.7.4
PATCH v2 1/5 cpufreq: imx-cpufreq-dt: Remove global platform match list
This is not currently needed, instead a platform device is always created from SOC-specific code.
We can use of_machine_is_compatible for per-SOC behavior instead.
--- drivers/cpufreq/imx-cpufreq-dt.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
drivers/cpufreq/imx-cpufreq-dt.c +2 -16
@@ -17,35 +17,21 @@#define OCOTP_CFG3_SPEED_GRADE_SHIFT 8#define OCOTP_CFG3_SPEED_GRADE_MASK (0x3 << 8)#define OCOTP_CFG3_MKT_SEGMENT_SHIFT 6#define OCOTP_CFG3_MKT_SEGMENT_MASK (0x3 << 6) -static const struct of_device_id imx_cpufreq_dt_match_list[] = { - { .compatible ="fsl,imx8mm" }, - { .compatible ="fsl,imx8mq" }, - {} -}; -/* cpufreq-dt device registered by imx-cpufreq-dt */ static struct platform_device *cpufreq_dt_pdev;static struct opp_table *cpufreq_opp_table;static int imx_cpufreq_dt_probe (struct platform_device *pdev) {struct device *cpu_dev =get_cpu_device (0 ); -struct device_node *np; -const struct of_device_id *match;u32 cell_value, supported_hw[2 ];int speed_grade, mkt_segment;int ret; - np =of_find_node_by_path ("/" ); - match =of_match_node (imx_cpufreq_dt_match_list, np); -of_node_put (np); -if (!match) -return -ENODEV ; - ret =nvmem_cell_read_u32 (cpu_dev,"speed_grade" , &cell_value);if (ret)return ret; speed_grade = (cell_value &OCOTP_CFG3_SPEED_GRADE_MASK ) >>OCOTP_CFG3_SPEED_GRADE_SHIFT ;
@@ -59,12 +45,12 @@ static int imx_cpufreq_dt_probe(struct platform_device *pdev)* consumer parts so clamp to 1 to avoid warning for "no OPPs" * * Applies to 8mq and 8mm. */ if (mkt_segment ==0 && speed_grade ==0 && ( - !strcmp (match->compatible,"fsl,imx8mm" ) || - !strcmp (match->compatible,"fsl,imx8mq" ))) +of_machine_is_compatible ("fsl,imx8mm" ) || +of_machine_is_compatible ("fsl,imx8mq" ))) speed_grade =1 ; supported_hw[0 ] =BIT (speed_grade); supported_hw[1 ] =BIT (mkt_segment); dev_info(&pdev->dev, "cpu speed grade %d mkt segment %d supported-hw %#x %#x\n",
Signature · 1 line
2.7.4
PATCH v2 2/5 cpufreq: Switch imx7d to imx-cpufreq-dt for speed grading
In reply to Leonard CrestezThis driver can handle speed grading bits on imx7d just like on imx8mq and imx8mm.
--- drivers/cpufreq/cpufreq-dt-platdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cpufreq-dt-platdev.c +1 -1
@@ -38,11 +38,10 @@ static const struct of_device_id whitelist[] __initconst = { { .compatible = "hisilicon,hi3660", }, { .compatible = "fsl,imx27", }, { .compatible = "fsl,imx51", }, { .compatible = "fsl,imx53", }, - { .compatible = "fsl,imx7d", }, { .compatible = "marvell,berlin", }, { .compatible = "marvell,pxa250", }, { .compatible = "marvell,pxa270", },
@@ -106,10 +105,11 @@ static const struct of_device_id whitelist[] __initconst = {*/ static const struct of_device_id blacklist[]__initconst = { { .compatible ="calxeda,highbank" , }, { .compatible ="calxeda,ecx-2000" , }, + { .compatible ="fsl,imx7d" , }, { .compatible ="fsl,imx8mq" , }, { .compatible ="fsl,imx8mm" , }, { .compatible ="marvell,armadaxp" , },
Signature · 1 line
2.7.4
PATCH v2 3/5 ARM: imx: Switch imx7d to imx-cpufreq-dt for speed-grading
In reply to Leonard CrestezThe imx-cpufreq-dt driver can handle speed grading bits on imx7d just like on imx8mq and imx8mm.
--- arch/arm/mach-imx/mach-imx7d.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/mach-imx/mach-imx7d.c +7 -0
@@ -95,10 +95,16 @@ static void __init imx7d_init_machine(void)imx_anatop_init ();imx7d_enet_init (); } +static void __init imx7d_init_late (void ) +{ +if (IS_ENABLED (CONFIG_ARM_IMX_CPUFREQ_DT )) +platform_device_register_simple ("imx-cpufreq-dt" ,-1 ,NULL ,0 ); +} +static void __init imx7d_init_irq (void ) {imx_init_revision_from_anatop ();imx_src_init ();irqchip_init ();
@@ -111,7 +117,8 @@ static const char *const imx7d_dt_compat[] __initconst = { };DT_MACHINE_START (IMX7D ,"Freescale i.MX7 Dual (Device Tree)" ) .init_irq = imx7d_init_irq, .init_machine = imx7d_init_machine, + .init_late = imx7d_init_late, .dt_compat = imx7d_dt_compat,MACHINE_END
Signature · 1 line
2.7.4
PATCH v2 4/5 ARM: dts: imx7d: Update cpufreq OPP table
In reply to Leonard CrestezAccording to latest docs imx7d chips can go from 800 to 1200 mhz. Maximum frequency is determined from two speed grading bits present in OCOTP fuses at same location as other imx chips.
Also update to "typical" voltages from latest datasheet, 25mv higher than current dts.
All imx7s parts are still fixed at 800mhz
Based on:
* IMX7DCEC Rev. 6, 03/2019
* IMX7SCEC Rev. 6, 03/2019
* IMX7DRM Rev. 1, 01/2018 Page 1102
--- arch/arm/boot/dts/imx7d.dtsi | 16 +++++++++++++--- arch/arm/boot/dts/imx7s.dtsi | 4 ++++ 2 files changed, 17 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx7d.dtsi +13 -3
@@ -10,10 +10,12 @@ cpus { cpu0: cpu@0 { clock-frequency = <996000000>; operating-points-v2 = <&cpu0_opp_table>; #cooling-cells = <2>; + nvmem-cells = <&cpu_speed_grade>; + nvmem-cell-names = "speed_grade"; }; cpu1: cpu@1 { compatible = "arm,cortex-a7"; device_type = "cpu";
@@ -37,19 +39,27 @@ compatible = "operating-points-v2"; opp-shared; opp-792000000 { opp-hz = /bits/ 64 <792000000>; - opp-microvolt = <975000>; + opp-microvolt = <1000000>; clock-latency-ns = <150000>; + opp-supported-hw = <0xf>, <0xf>; }; opp-996000000 { opp-hz = /bits/ 64 <996000000>; - opp-microvolt = <1075000>; + opp-microvolt = <1100000>; clock-latency-ns = <150000>; - opp-suspend; + opp-supported-hw = <0xc>, <0xf>; + }; + + opp-1200000000 { + opp-hz = /bits/ 64 <1200000000>; + opp-microvolt = <1225000>; + clock-latency-ns = <150000>; + opp-supported-hw = <0x8>, <0xf>; }; }; usbphynop2: usbphynop2 { compatible = "usb-nop-xceiv";
arch/arm/boot/dts/imx7s.dtsi +4 -0
@@ -549,10 +549,14 @@ }; tempmon_temp_grade: temp-grade@10 { reg = <0x10 0x4>; }; + + cpu_speed_grade: speed-grade@10 { + reg = <0x10 0x4>; + }; }; anatop: anatop@30360000 { compatible = "fsl,imx7d-anatop", "fsl,imx6q-anatop", "syscon", "simple-bus";
Signature · 1 line
2.7.4
PATCH v2 5/5 ARM: imx_v6_v7_defconfig: Enable CONFIG_ARM_IMX_CPUFREQ_DT
In reply to Leonard CrestezThis is used for imx7d speed grading.
--- arch/arm/configs/imx_v6_v7_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/imx_v6_v7_defconfig +1 -0
@@ -52,10 +52,11 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPUFREQ_DT=y CONFIG_ARM_IMX6Q_CPUFREQ=y +CONFIG_ARM_IMX_CPUFREQ_DT=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_PM_DEBUG=y
Signature · 1 line
2.7.4
Viresh Kumar
maintainerQuoted 7 lines · Leonard Crestez
Changes since v1:
* Remove the match list from imx-cpufreq-dt
* Split arch and cpufreq changes
Link to v1: https://patchwork.kernel.org/project/linux-arm-kernel/list/?series=124427Leonard Crestez (5):
cpufreq: imx-cpufreq-dt: Remove global platform match list
Added following to this patch:
Quoted 1 line
cpufreq: Switch imx7d to imx-cpufreq-dt for speed grading
Applied the first two patches. Thanks.
Signature · 1 line
viresh
Shawn Guo
AppliedQuoted 5 lines · Leonard Crestez
Changes since v1:
* Remove the match list from imx-cpufreq-dt
* Split arch and cpufreq changes
Link to v1: https://patchwork.kernel.org/project/linux-arm-kernel/list/?series=124427
Quoted 7 lines
Leonard Crestez (5):
cpufreq: imx-cpufreq-dt: Remove global platform match list
cpufreq: Switch imx7d to imx-cpufreq-dt for speed gradingARM: imx: Switch imx7d to imx-cpufreq-dt for speed-grading
ARM: dts: imx7d: Update cpufreq OPP table
ARM:imx_v6_v7_defconfig: EnableCONFIG_ARM_IMX_CPUFREQ_DT
Applied these 3, thanks.