Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 993eb0ae authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-devfreq' and 'pm-sleep' 

* pm-devfreq:
  PM / devfreq: rk3399_dmc: Remove explictly regulator_put call in .remove
  PM / devfreq: rockchip: add PM_DEVFREQ_EVENT dependency
  partial revert of "PM / devfreq: Add COMPILE_TEST for build coverage"
  PM / devfreq: rockchip: add devfreq driver for rk3399 dmc
  Documentation: bindings: add dt documentation for rk3399 dmc
  PM / devfreq: event: support rockchip dfi controller
  Documentation: bindings: add dt documentation for dfi controller
  PM / devfreq: event: remove duplicate devfreq_event_get_drvdata()
  PM / devfreq: fix Kconfig indent style
  PM / devfreq: Add COMPILE_TEST for build coverage
  PM / devfreq: exynos-ppmu: remove unneeded of_node_put()

* pm-sleep:
  PM / Hibernate: allow hibernation with PAGE_POISONING_ZERO
  PM / sleep: enable suspend-to-idle even without registered suspend_ops
  PM / sleep: Increase default DPM watchdog timeout to 120
parents e35db92b da4a6448 1ad1410f

Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 


* Rockchip rk3399 DFI device



Required properties:

- compatible: Must be "rockchip,rk3399-dfi".

- reg: physical base address of each DFI and length of memory mapped region

- rockchip,pmu: phandle to the syscon managing the "pmu general register files"

- clocks: phandles for clock specified in "clock-names" property

- clock-names : the name of clock used by the DFI, must be "pclk_ddr_mon";



Example:

	dfi: dfi@0xff630000 {

		compatible = "rockchip,rk3399-dfi";

		reg = <0x00 0xff630000 0x00 0x4000>;

		rockchip,pmu = <&pmugrf>;

		clocks = <&cru PCLK_DDR_MON>;

		clock-names = "pclk_ddr_mon";

		status = "disabled";

	};

Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt

0 → 100644
+209 −0
Original line number Diff line number Diff line 
* Rockchip rk3399 DMC(Dynamic Memory Controller) device



Required properties:

- compatible:		 Must be "rockchip,rk3399-dmc".

- devfreq-events:	 Node to get DDR loading, Refer to

			 Documentation/devicetree/bindings/devfreq/

			 rockchip-dfi.txt

- interrupts:		 The interrupt number to the CPU. The interrupt

			 specifier format depends on the interrupt controller.

			 It should be DCF interrupts, when DDR dvfs finish,

			 it will happen.

- clocks:		 Phandles for clock specified in "clock-names" property

- clock-names :		 The name of clock used by the DFI, must be

			 "pclk_ddr_mon";

- operating-points-v2:	 Refer to Documentation/devicetree/bindings/power/opp.txt

			 for details.

- center-supply:	 DMC supply node.

- status:		 Marks the node enabled/disabled.



Following properties are ddr timing:



- rockchip,dram_speed_bin :	  Value reference include/dt-bindings/clock/ddr.h,

				  it select ddr3 cl-trp-trcd type, default value

				  "DDR3_DEFAULT".it must selected according to

				  "Speed Bin" in ddr3 datasheet, DO NOT use

				  smaller "Speed Bin" than ddr3 exactly is.



- rockchip,pd_idle :		  Config the PD_IDLE value, defined the power-down

				  idle period, memories are places into power-down

				  mode if bus is idle for PD_IDLE DFI clocks.



- rockchip,sr_idle :		  Configure the SR_IDLE value, defined the

				  selfrefresh idle period, memories are places

				  into self-refresh mode if bus is idle for

				  SR_IDLE*1024 DFI clocks (DFI clocks freq is

				  half of dram's clocks), defaule value is "0".



- rockchip,sr_mc_gate_idle :	  Defined the self-refresh with memory and

				  controller clock gating idle period, memories

				  are places into self-refresh mode and memory

				  controller clock arg gating if bus is idle for

				  sr_mc_gate_idle*1024 DFI clocks.



- rockchip,srpd_lite_idle :	  Defined the self-refresh power down idle

				  period, memories are places into self-refresh

				  power down mode if bus is idle for

				  srpd_lite_idle*1024 DFI clocks. This parameter

				  is for LPDDR4 only.



- rockchip,standby_idle :	  Defined the standby idle period, memories are

				  places into self-refresh than controller, pi,

				  phy and dram clock will gating if bus is idle

				  for standby_idle * DFI clocks.



- rockchip,dram_dll_disb_freq :  It's defined the DDR3 dll bypass frequency in

				  MHz, when ddr freq less than DRAM_DLL_DISB_FREQ,

				  ddr3 dll will bypssed note: if dll was bypassed,

				  the odt also stop working.



- rockchip,phy_dll_disb_freq :	  Defined the PHY dll bypass frequency in

				  MHz (Mega Hz), when ddr freq less than

				  DRAM_DLL_DISB_FREQ, phy dll will bypssed.

				  note: phy dll and phy odt are independent.



- rockchip,ddr3_odt_disb_freq :  When dram type is DDR3, this parameter defined

				  the odt disable frequency in MHz (Mega Hz),

				  when ddr frequency less then ddr3_odt_disb_freq,

				  the odt on dram side and controller side are

				  both disabled.



- rockchip,ddr3_drv :		  When dram type is DDR3, this parameter define

				  the dram side driver stength in ohm, default

				  value is DDR3_DS_40ohm.



- rockchip,ddr3_odt :		  When dram type is DDR3, this parameter define

				  the dram side ODT stength in ohm, default value

				  is DDR3_ODT_120ohm.



- rockchip,phy_ddr3_ca_drv :	  When dram type is DDR3, this parameter define

				  the phy side CA line(incluing command line,

				  address line and clock line) driver strength.

				  Default value is PHY_DRV_ODT_40.



- rockchip,phy_ddr3_dq_drv :	  When dram type is DDR3, this parameter define

				  the phy side DQ line(incluing DQS/DQ/DM line)

				  driver strength. default value is PHY_DRV_ODT_40.



- rockchip,phy_ddr3_odt : 	  When dram type is DDR3, this parameter define the

				  phy side odt strength, default value is

				  PHY_DRV_ODT_240.



- rockchip,lpddr3_odt_disb_freq : When dram type is LPDDR3, this parameter defined

				  then odt disable frequency in MHz (Mega Hz),

				  when ddr frequency less then ddr3_odt_disb_freq,

				  the odt on dram side and controller side are

				  both disabled.



- rockchip,lpddr3_drv :	  When dram type is LPDDR3, this parameter define

				  the dram side driver stength in ohm, default

				  value is LP3_DS_34ohm.



- rockchip,lpddr3_odt :	  When dram type is LPDDR3, this parameter define

				  the dram side ODT stength in ohm, default value

				  is LP3_ODT_240ohm.



- rockchip,phy_lpddr3_ca_drv :	  When dram type is LPDDR3, this parameter define

				  the phy side CA line(incluing command line,

				  address line and clock line) driver strength.

				  default value is PHY_DRV_ODT_40.



- rockchip,phy_lpddr3_dq_drv :	  When dram type is LPDDR3, this parameter define

				  the phy side DQ line(incluing DQS/DQ/DM line)

				  driver strength. default value is

				  PHY_DRV_ODT_40.



- rockchip,phy_lpddr3_odt : 	  When dram type is LPDDR3, this parameter define

				  the phy side odt strength, default value is

				  PHY_DRV_ODT_240.



- rockchip,lpddr4_odt_disb_freq : When dram type is LPDDR4, this parameter

				  defined the odt disable frequency in

				  MHz (Mega Hz), when ddr frequency less then

				  ddr3_odt_disb_freq, the odt on dram side and

				  controller side are both disabled.



- rockchip,lpddr4_drv :	  When dram type is LPDDR4, this parameter define

				  the dram side driver stength in ohm, default

				  value is LP4_PDDS_60ohm.



- rockchip,lpddr4_dq_odt : 	  When dram type is LPDDR4, this parameter define

				  the dram side ODT on dqs/dq line stength in ohm,

				  default value is LP4_DQ_ODT_40ohm.



- rockchip,lpddr4_ca_odt :	  When dram type is LPDDR4, this parameter define

				  the dram side ODT on ca line stength in ohm,

				  default value is LP4_CA_ODT_40ohm.



- rockchip,phy_lpddr4_ca_drv :	  When dram type is LPDDR4, this parameter define

				  the phy side  CA line(incluing command address

				  line) driver strength. default value is

				  PHY_DRV_ODT_40.



- rockchip,phy_lpddr4_ck_cs_drv : When dram type is LPDDR4, this parameter define

				  the phy side clock line and cs line driver

				  strength. default value is PHY_DRV_ODT_80.



- rockchip,phy_lpddr4_dq_drv :	  When dram type is LPDDR4, this parameter define

				  the phy side DQ line(incluing DQS/DQ/DM line)

				  driver strength. default value is PHY_DRV_ODT_80.



- rockchip,phy_lpddr4_odt :	  When dram type is LPDDR4, this parameter define

				  the phy side odt strength, default value is

				  PHY_DRV_ODT_60.



Example:

	dmc_opp_table: dmc_opp_table {

		compatible = "operating-points-v2";



		opp00 {

			opp-hz = /bits/ 64 <300000000>;

			opp-microvolt = <900000>;

		};

		opp01 {

			opp-hz = /bits/ 64 <666000000>;

			opp-microvolt = <900000>;

		};

	};



	dmc: dmc {

		compatible = "rockchip,rk3399-dmc";

		devfreq-events = <&dfi>;

		interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_DDRCLK>;

		clock-names = "dmc_clk";

		operating-points-v2 = <&dmc_opp_table>;

		center-supply = <&ppvar_centerlogic>;

		upthreshold = <15>;

		downdifferential = <10>;

		rockchip,ddr3_speed_bin = <21>;

		rockchip,pd_idle = <0x40>;

		rockchip,sr_idle = <0x2>;

		rockchip,sr_mc_gate_idle = <0x3>;

		rockchip,srpd_lite_idle	= <0x4>;

		rockchip,standby_idle = <0x2000>;

		rockchip,dram_dll_dis_freq = <300>;

		rockchip,phy_dll_dis_freq = <125>;

		rockchip,auto_pd_dis_freq = <666>;

		rockchip,ddr3_odt_dis_freq = <333>;

		rockchip,ddr3_drv = <DDR3_DS_40ohm>;

		rockchip,ddr3_odt = <DDR3_ODT_120ohm>;

		rockchip,phy_ddr3_ca_drv = <PHY_DRV_ODT_40>;

		rockchip,phy_ddr3_dq_drv = <PHY_DRV_ODT_40>;

		rockchip,phy_ddr3_odt = <PHY_DRV_ODT_240>;

		rockchip,lpddr3_odt_dis_freq = <333>;

		rockchip,lpddr3_drv = <LP3_DS_34ohm>;

		rockchip,lpddr3_odt = <LP3_ODT_240ohm>;

		rockchip,phy_lpddr3_ca_drv = <PHY_DRV_ODT_40>;

		rockchip,phy_lpddr3_dq_drv = <PHY_DRV_ODT_40>;

		rockchip,phy_lpddr3_odt = <PHY_DRV_ODT_240>;

		rockchip,lpddr4_odt_dis_freq = <333>;

		rockchip,lpddr4_drv = <LP4_PDDS_60ohm>;

		rockchip,lpddr4_dq_odt = <LP4_DQ_ODT_40ohm>;

		rockchip,lpddr4_ca_odt = <LP4_CA_ODT_40ohm>;

		rockchip,phy_lpddr4_ca_drv = <PHY_DRV_ODT_40>;

		rockchip,phy_lpddr4_ck_cs_drv = <PHY_DRV_ODT_80>;

		rockchip,phy_lpddr4_dq_drv = <PHY_DRV_ODT_80>;

		rockchip,phy_lpddr4_odt = <PHY_DRV_ODT_60>;

		status = "disabled";

	};

drivers/devfreq/Kconfig

+21 −9
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ comment "DEVFREQ Drivers" 


config ARM_EXYNOS_BUS_DEVFREQ

	tristate "ARM EXYNOS Generic Memory Bus DEVFREQ Driver"

	depends on ARCH_EXYNOS

	depends on ARCH_EXYNOS || COMPILE_TEST

	select DEVFREQ_GOV_SIMPLE_ONDEMAND

	select DEVFREQ_GOV_PASSIVE

	select DEVFREQ_EVENT_EXYNOS_PPMU
@@ -100,6 +100,18 @@ config ARM_TEGRA_DEVFREQ 
	  It reads ACTMON counters of memory controllers and adjusts the

	  operating frequencies and voltages with OPP support.



config ARM_RK3399_DMC_DEVFREQ

	tristate "ARM RK3399 DMC DEVFREQ Driver"

	depends on ARCH_ROCKCHIP

	select DEVFREQ_EVENT_ROCKCHIP_DFI

	select DEVFREQ_GOV_SIMPLE_ONDEMAND

	select PM_DEVFREQ_EVENT

	select PM_OPP

	help

          This adds the DEVFREQ driver for the RK3399 DMC(Dynamic Memory Controller).

          It sets the frequency for the memory controller and reads the usage counts

          from hardware.



source "drivers/devfreq/event/Kconfig"



endif # PM_DEVFREQ

drivers/devfreq/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ obj-$(CONFIG_DEVFREQ_GOV_PASSIVE) += governor_passive.o 


# DEVFREQ Drivers

obj-$(CONFIG_ARM_EXYNOS_BUS_DEVFREQ)	+= exynos-bus.o

obj-$(CONFIG_ARM_RK3399_DMC_DEVFREQ)	+= rk3399_dmc.o

obj-$(CONFIG_ARM_TEGRA_DEVFREQ)		+= tegra-devfreq.o



# DEVFREQ Event Drivers

drivers/devfreq/event/Kconfig

+9 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ if PM_DEVFREQ_EVENT 


config DEVFREQ_EVENT_EXYNOS_NOCP

	tristate "EXYNOS NoC (Network On Chip) Probe DEVFREQ event Driver"

	depends on ARCH_EXYNOS

	depends on ARCH_EXYNOS || COMPILE_TEST

	select PM_OPP

	help

	  This add the devfreq-event driver for Exynos SoC. It provides NoC
@@ -23,11 +23,18 @@ config DEVFREQ_EVENT_EXYNOS_NOCP 


config DEVFREQ_EVENT_EXYNOS_PPMU

	tristate "EXYNOS PPMU (Platform Performance Monitoring Unit) DEVFREQ event Driver"

	depends on ARCH_EXYNOS

	depends on ARCH_EXYNOS || COMPILE_TEST

	select PM_OPP

	help

	  This add the devfreq-event driver for Exynos SoC. It provides PPMU

	  (Platform Performance Monitoring Unit) counters to estimate the

	  utilization of each module.



config DEVFREQ_EVENT_ROCKCHIP_DFI

	tristate "ROCKCHIP DFI DEVFREQ event Driver"

	depends on ARCH_ROCKCHIP

	help

	  This add the devfreq-event driver for Rockchip SoC. It provides DFI

	  (DDR Monitor Module) driver to count ddr load.



endif # PM_DEVFREQ_EVENT