Skip to content

Commit c48b90f

Browse files
rafaeljwrafaeljw
committed
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 ...
2 parents 6221403 + 46770be commit c48b90f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+949
-874
lines changed

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,16 @@ SoC Families:
4343

4444
- OMAP2 generic - defaults to OMAP2420
4545
compatible = "ti,omap2"
46-
- OMAP3 generic - defaults to OMAP3430
46+
- OMAP3 generic
4747
compatible = "ti,omap3"
4848
- OMAP4 generic - defaults to OMAP4430
4949
compatible = "ti,omap4"
5050
- OMAP5 generic - defaults to OMAP5430
5151
compatible = "ti,omap5"
5252
- DRA7 generic - defaults to DRA742
5353
compatible = "ti,dra7"
54+
- AM33x generic
55+
compatible = "ti,am33xx"
5456
- AM43x generic - defaults to AM4372
5557
compatible = "ti,am43"
5658

@@ -63,12 +65,14 @@ SoCs:
6365

6466
- OMAP3430
6567
compatible = "ti,omap3430", "ti,omap3"
68+
legacy: "ti,omap34xx" - please do not use any more
6669
- AM3517
6770
compatible = "ti,am3517", "ti,omap3"
6871
- OMAP3630
69-
compatible = "ti,omap36xx", "ti,omap3"
70-
- AM33xx
71-
compatible = "ti,am33xx", "ti,omap3"
72+
compatible = "ti,omap3630", "ti,omap3"
73+
legacy: "ti,omap36xx" - please do not use any more
74+
- AM335x
75+
compatible = "ti,am33xx"
7276

7377
- OMAP4430
7478
compatible = "ti,omap4430", "ti,omap4"
@@ -110,19 +114,19 @@ SoCs:
110114
- AM4372
111115
compatible = "ti,am4372", "ti,am43"
112116

113-
Boards:
117+
Boards (incomplete list of examples):
114118

115119
- OMAP3 BeagleBoard : Low cost community board
116-
compatible = "ti,omap3-beagle", "ti,omap3"
120+
compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3"
117121

118122
- OMAP3 Tobi with Overo : Commercial expansion board with daughter board
119-
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"
123+
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"
120124

121125
- OMAP4 SDP : Software Development Board
122-
compatible = "ti,omap4-sdp", "ti,omap4430"
126+
compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4"
123127

124128
- OMAP4 PandaBoard : Low cost community board
125-
compatible = "ti,omap4-panda", "ti,omap4430"
129+
compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4"
126130

127131
- OMAP4 DuoVero with Parlor : Commercial expansion board with daughter board
128132
compatible = "gumstix,omap4-duovero-parlor", "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
@@ -134,16 +138,16 @@ Boards:
134138
compatible = "variscite,var-dvk-om44", "variscite,var-som-om44", "ti,omap4460", "ti,omap4";
135139

136140
- OMAP3 EVM : Software Development Board for OMAP35x, AM/DM37x
137-
compatible = "ti,omap3-evm", "ti,omap3"
141+
compatible = "ti,omap3-evm", "ti,omap3630", "ti,omap3"
138142

139143
- AM335X EVM : Software Development Board for AM335x
140-
compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3"
144+
compatible = "ti,am335x-evm", "ti,am33xx"
141145

142146
- AM335X Bone : Low cost community board
143-
compatible = "ti,am335x-bone", "ti,am33xx", "ti,omap3"
147+
compatible = "ti,am335x-bone", "ti,am33xx"
144148

145149
- AM3359 ICEv2 : Low cost Industrial Communication Engine EVM.
146-
compatible = "ti,am3359-icev2", "ti,am33xx", "ti,omap3"
150+
compatible = "ti,am3359-icev2", "ti,am33xx"
147151

148152
- AM335X OrionLXm : Substation Automation Platform
149153
compatible = "novatech,am335x-lxm", "ti,am33xx"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@ In 'cpus' nodes:
1515

1616
In 'operating-points-v2' table:
1717
- compatible: Should be
18-
- 'operating-points-v2-ti-cpu' for am335x, am43xx, and dra7xx/am57xx SoCs
18+
- 'operating-points-v2-ti-cpu' for am335x, am43xx, and dra7xx/am57xx,
19+
omap34xx, omap36xx and am3517 SoCs
1920
- syscon: A phandle pointing to a syscon node representing the control module
2021
register space of the SoC.
2122

2223
Optional properties:
2324
--------------------
25+
- "vdd-supply", "vbb-supply": to define two regulators for dra7xx
26+
- "cpu0-supply", "vbb-supply": to define two regulators for omap36xx
27+
2428
For each opp entry in 'operating-points-v2' table:
2529
- opp-supported-hw: Two bitfields indicating:
2630
1. Which revision of the SoC the OPP is supported by

‎MAINTAINERS

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4269,14 +4269,13 @@ F: include/linux/cpufreq.h
42694269
F: include/linux/sched/cpufreq.h
42704270
F: tools/testing/selftests/cpufreq/
42714271

4272-
CPU FREQUENCY DRIVERS - ARM BIG LITTLE
4272+
CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
42734273
M: Viresh Kumar <[email protected]>
42744274
M: Sudeep Holla <[email protected]>
42754275
L: [email protected]
42764276
W: http://www.arm.com/products/processors/technologies/biglittleprocessing.php
42774277
S: Maintained
4278-
F: drivers/cpufreq/arm_big_little.h
4279-
F: drivers/cpufreq/arm_big_little.c
4278+
F: drivers/cpufreq/vexpress-spc-cpufreq.c
42804279

42814280
CPU POWER MONITORING SUBSYSTEM
42824281
M: Thomas Renninger <[email protected]>

‎arch/arm/boot/dts/am3517.dtsi

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,37 @@
1616
can = &hecc;
1717
};
1818

19+
cpus {
20+
cpu: cpu@0 {
21+
/* Based on OMAP3630 variants OPP50 and OPP100 */
22+
operating-points-v2 = <&cpu0_opp_table>;
23+
24+
clock-latency = <300000>; /* From legacy driver */
25+
};
26+
};
27+
28+
cpu0_opp_table: opp-table {
29+
compatible = "operating-points-v2-ti-cpu";
30+
syscon = <&scm_conf>;
31+
/*
32+
* AM3517 TRM only lists 600MHz @ 1.2V, but omap36xx
33+
* appear to operate at 300MHz as well. Since AM3517 only
34+
* lists one operating voltage, it will remain fixed at 1.2V
35+
*/
36+
opp50-300000000 {
37+
opp-hz = /bits/ 64 <300000000>;
38+
opp-microvolt = <1200000>;
39+
opp-supported-hw = <0xffffffff 0xffffffff>;
40+
opp-suspend;
41+
};
42+
43+
opp100-600000000 {
44+
opp-hz = /bits/ 64 <600000000>;
45+
opp-microvolt = <1200000>;
46+
opp-supported-hw = <0xffffffff 0xffffffff>;
47+
};
48+
};
49+
1950
ocp@68000000 {
2051
am35x_otg_hs: am35x_otg_hs@5c040000 {
2152
compatible = "ti,omap3-musb";

‎arch/arm/boot/dts/am3517_mt_ventoux.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/ {
1010
model = "TeeJet Mt.Ventoux";
11-
compatible = "teejet,mt_ventoux", "ti,omap3";
11+
compatible = "teejet,mt_ventoux", "ti,am3517", "ti,omap3";
1212

1313
memory@80000000 {
1414
device_type = "memory";

‎arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99

1010
/ {
1111
model = "LogicPD Zoom OMAP35xx SOM-LV Development Kit";
12-
compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3";
12+
compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3430", "ti,omap3";
1313
};

‎arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99

1010
/ {
1111
model = "LogicPD Zoom OMAP35xx Torpedo Development Kit";
12-
compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3";
12+
compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3430", "ti,omap3";
1313
};

‎arch/arm/boot/dts/omap3-beagle-xm.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/ {
1010
model = "TI OMAP3 BeagleBoard xM";
11-
compatible = "ti,omap3-beagle-xm", "ti,omap36xx", "ti,omap3";
11+
compatible = "ti,omap3-beagle-xm", "ti,omap3630", "ti,omap36xx", "ti,omap3";
1212

1313
cpus {
1414
cpu@0 {

‎arch/arm/boot/dts/omap3-beagle.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/ {
1010
model = "TI OMAP3 BeagleBoard";
11-
compatible = "ti,omap3-beagle", "ti,omap3";
11+
compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3";
1212

1313
cpus {
1414
cpu@0 {

‎arch/arm/boot/dts/omap3-cm-t3530.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/ {
1111
model = "CompuLab CM-T3530";
12-
compatible = "compulab,omap3-cm-t3530", "ti,omap34xx", "ti,omap3";
12+
compatible = "compulab,omap3-cm-t3530", "ti,omap3430", "ti,omap34xx", "ti,omap3";
1313

1414
/* Regulator to trigger the reset signal of the Wifi module */
1515
mmc2_sdio_reset: regulator-mmc2-sdio-reset {

0 commit comments

Comments
 (0)