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

Merge branch 'pm-cpufreq' 

* pm-cpufreq: (23 commits)
  cpufreq: Register drivers only after CPU devices have been registered
  cpufreq: Add NULL checks to show() and store() methods of cpufreq
  cpufreq: intel_pstate: Fix plain int as pointer warning from sparse
  cpufreq: sun50i: Fix CPU speed bin detection
  cpufreq: powernv: fix stack bloat and hard limit on number of CPUs
  cpufreq: Clarify the comment in cpufreq_set_policy()
  cpufreq: vexpress-spc: find and skip duplicates when merging frequencies
  cpufreq: vexpress-spc: use macros instead of hardcoded values for cluster ids
  cpufreq: s3c64xx: Remove pointless NULL check in s3c64xx_cpufreq_driver_init
  cpufreq: imx-cpufreq-dt: Correct i.MX8MN's default speed grade value
  cpufreq: vexpress-spc: fix some coding style issues
  cpufreq: vexpress-spc: remove lots of debug messages
  cpufreq: vexpress-spc: drop unnessary cpufreq_arm_bL_ops abstraction
  cpufreq: merge arm_big_little and vexpress-spc
  cpufreq: scpi: remove stale/outdated comment about the driver
  ARM: dts: Add OPP-V2 table for AM3517
  cpufreq: ti-cpufreq: Add support for AM3517
  ARM: dts: omap36xx: using OPP1G needs to control the abb_ldo
  cpufreq: ti-cpufreq: omap36xx use "cpu0","vbb" if run in multi_regulator mode
  ARM: dts: omap3: bulk convert compatible to be explicitly ti,omap3430 or ti,omap3630 or ti,am3517
  ...
parents 62214039 46770be0

Documentation/devicetree/bindings/arm/omap/omap.txt

+17 −13
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ SoC Families: 


- OMAP2 generic - defaults to OMAP2420

  compatible = "ti,omap2"

- OMAP3 generic - defaults to OMAP3430

- OMAP3 generic

  compatible = "ti,omap3"

- OMAP4 generic - defaults to OMAP4430

  compatible = "ti,omap4"
@@ -51,6 +51,8 @@ SoC Families: 
  compatible = "ti,omap5"

- DRA7 generic - defaults to DRA742

  compatible = "ti,dra7"

- AM33x generic

  compatible = "ti,am33xx"

- AM43x generic - defaults to AM4372

  compatible = "ti,am43"
@@ -63,12 +65,14 @@ SoCs: 


- OMAP3430

  compatible = "ti,omap3430", "ti,omap3"

  legacy: "ti,omap34xx" - please do not use any more

- AM3517

  compatible = "ti,am3517", "ti,omap3"

- OMAP3630

  compatible = "ti,omap36xx", "ti,omap3"

- AM33xx

  compatible = "ti,am33xx", "ti,omap3"

  compatible = "ti,omap3630", "ti,omap3"

  legacy: "ti,omap36xx" - please do not use any more

- AM335x

  compatible = "ti,am33xx"



- OMAP4430

  compatible = "ti,omap4430", "ti,omap4"
@@ -110,19 +114,19 @@ SoCs: 
- AM4372

  compatible = "ti,am4372", "ti,am43"



Boards:

Boards (incomplete list of examples):



- OMAP3 BeagleBoard : Low cost community board

  compatible = "ti,omap3-beagle", "ti,omap3"

  compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3"



- OMAP3 Tobi with Overo : Commercial expansion board with daughter board

  compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"

  compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"



- OMAP4 SDP : Software Development Board

  compatible = "ti,omap4-sdp", "ti,omap4430"

  compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4"



- OMAP4 PandaBoard : Low cost community board

  compatible = "ti,omap4-panda", "ti,omap4430"

  compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4"



- OMAP4 DuoVero with Parlor : Commercial expansion board with daughter board

  compatible = "gumstix,omap4-duovero-parlor", "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
@@ -134,16 +138,16 @@ Boards: 
  compatible = "variscite,var-dvk-om44", "variscite,var-som-om44", "ti,omap4460", "ti,omap4";



- OMAP3 EVM : Software Development Board for OMAP35x, AM/DM37x

  compatible = "ti,omap3-evm", "ti,omap3"

  compatible = "ti,omap3-evm", "ti,omap3630", "ti,omap3"



- AM335X EVM : Software Development Board for AM335x

  compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3"

  compatible = "ti,am335x-evm", "ti,am33xx"



- AM335X Bone : Low cost community board

  compatible = "ti,am335x-bone", "ti,am33xx", "ti,omap3"

  compatible = "ti,am335x-bone", "ti,am33xx"



- AM3359 ICEv2 : Low cost Industrial Communication Engine EVM.

  compatible = "ti,am3359-icev2", "ti,am33xx", "ti,omap3"

  compatible = "ti,am3359-icev2", "ti,am33xx"



- AM335X OrionLXm : Substation Automation Platform

  compatible = "novatech,am335x-lxm", "ti,am33xx"

Documentation/devicetree/bindings/cpufreq/ti-cpufreq.txt

+5 −1
Original line number Diff line number Diff line
@@ -15,12 +15,16 @@ In 'cpus' nodes: 


In 'operating-points-v2' table:

- compatible: Should be

	- 'operating-points-v2-ti-cpu' for am335x, am43xx, and dra7xx/am57xx SoCs

	- 'operating-points-v2-ti-cpu' for am335x, am43xx, and dra7xx/am57xx,

	  omap34xx, omap36xx and am3517 SoCs

- syscon: A phandle pointing to a syscon node representing the control module

	  register space of the SoC.



Optional properties:

--------------------

- "vdd-supply", "vbb-supply": to define two regulators for dra7xx

- "cpu0-supply", "vbb-supply": to define two regulators for omap36xx



For each opp entry in 'operating-points-v2' table:

- opp-supported-hw: Two bitfields indicating:

	1. Which revision of the SoC the OPP is supported by

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -4269,14 +4269,13 @@ F: include/linux/cpufreq.h 
F:	include/linux/sched/cpufreq.h

F:	tools/testing/selftests/cpufreq/













CPU FREQUENCY DRIVERS - ARM BIG LITTLE













CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE















M:	Viresh Kumar <viresh.kumar@linaro.org>















M:	Sudeep Holla <sudeep.holla@arm.com>















L:	linux-pm@vger.kernel.org















W:	http://www.arm.com/products/processors/technologies/biglittleprocessing.php















S:	Maintained













F:	drivers/cpufreq/arm_big_little.h













F:	drivers/cpufreq/arm_big_little.c













F:	drivers/cpufreq/vexpress-spc-cpufreq.c





























CPU POWER MONITORING SUBSYSTEM















M:	Thomas Renninger <trenn@suse.com>

































arch/arm/boot/dts/am3517.dtsi



+31
−0






























Original line number
Diff line number
Diff line








@@ -16,6 +16,37 @@













		can = &hecc;















	};





























	cpus {













		cpu: cpu@0 {













			/* Based on OMAP3630 variants OPP50 and OPP100 */













			operating-points-v2 = <&cpu0_opp_table>;



























			clock-latency = <300000>; /* From legacy driver */













		};













	};



























	cpu0_opp_table: opp-table {













		compatible = "operating-points-v2-ti-cpu";













		syscon = <&scm_conf>;













		/*













		 * AM3517 TRM only lists 600MHz @ 1.2V, but omap36xx













		 * appear to operate at 300MHz as well. Since AM3517 only













		 * lists one operating voltage, it will remain fixed at 1.2V













		 */













		opp50-300000000 {













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













			opp-microvolt = <1200000>;













			opp-supported-hw = <0xffffffff 0xffffffff>;













			opp-suspend;













		};



























		opp100-600000000 {













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













			opp-microvolt = <1200000>;













			opp-supported-hw = <0xffffffff 0xffffffff>;













		};













	};





























	ocp@68000000 {















		am35x_otg_hs: am35x_otg_hs@5c040000 {















			compatible = "ti,omap3-musb";

































arch/arm/boot/dts/am3517_mt_ventoux.dts



+1
−1






























Original line number
Diff line number
Diff line








@@ -8,7 +8,7 @@





























/ {















	model = "TeeJet Mt.Ventoux";













	compatible = "teejet,mt_ventoux", "ti,omap3";













	compatible = "teejet,mt_ventoux", "ti,am3517", "ti,omap3";































	memory@80000000 {















		device_type = "memory";









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE