Eric Lee / smarc-ti-linux-kernel

5
Download as
Browse Code ยป

Commit 464ed18ebdb6236fcff59d2a35d4d2e28668435a

Authored by Rafael J. Wysocki
1 parent 71504e519d
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

PM: Eliminate CONFIG_PM_RUNTIME 

Having switched over all of the users of CONFIG_PM_RUNTIME to use
CONFIG_PM directly, turn the latter into a user-selectable option
and drop the former entirely from the tree.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>

Showing 37 changed files with 39 additions and 48 deletions Side-by-side Diff

arch/arm/configs/ape6evm_defconfig
Diff comments   View file @ 464ed18
... ... @@ -33,7 +33,7 @@
33 33 CONFIG_VFP=y
34 34 CONFIG_NEON=y
35 35 CONFIG_BINFMT_MISC=y
36   -CONFIG_PM_RUNTIME=y
  36 +CONFIG_PM=y
37 37 CONFIG_NET=y
38 38 CONFIG_PACKET=y
39 39 CONFIG_UNIX=y
arch/arm/configs/armadillo800eva_defconfig
Diff comments   View file @ 464ed18
... ... @@ -43,7 +43,7 @@
43 43 CONFIG_VFP=y
44 44 CONFIG_NEON=y
45 45 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
46   -CONFIG_PM_RUNTIME=y
  46 +CONFIG_PM=y
47 47 CONFIG_NET=y
48 48 CONFIG_PACKET=y
49 49 CONFIG_UNIX=y
arch/arm/configs/bcm_defconfig
Diff comments   View file @ 464ed18
... ... @@ -39,7 +39,7 @@
39 39 CONFIG_VFP=y
40 40 CONFIG_NEON=y
41 41 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
42   -CONFIG_PM_RUNTIME=y
  42 +CONFIG_PM=y
43 43 CONFIG_NET=y
44 44 CONFIG_PACKET=y
45 45 CONFIG_PACKET_DIAG=y
arch/arm/configs/bockw_defconfig
Diff comments   View file @ 464ed18
... ... @@ -29,7 +29,7 @@
29 29 CONFIG_ARM_APPENDED_DTB=y
30 30 CONFIG_VFP=y
31 31 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
32   -CONFIG_PM_RUNTIME=y
  32 +CONFIG_PM=y
33 33 CONFIG_NET=y
34 34 CONFIG_PACKET=y
35 35 CONFIG_UNIX=y
arch/arm/configs/davinci_all_defconfig
Diff comments   View file @ 464ed18
... ... @@ -49,7 +49,7 @@
49 49 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
50 50 CONFIG_CPU_FREQ_GOV_ONDEMAND=m
51 51 CONFIG_CPU_IDLE=y
52   -CONFIG_PM_RUNTIME=y
  52 +CONFIG_PM=y
53 53 CONFIG_NET=y
54 54 CONFIG_PACKET=y
55 55 CONFIG_UNIX=y
arch/arm/configs/exynos_defconfig
Diff comments   View file @ 464ed18
... ... @@ -27,7 +27,7 @@
27 27 CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
28 28 CONFIG_VFP=y
29 29 CONFIG_NEON=y
30   -CONFIG_PM_RUNTIME=y
  30 +CONFIG_PM=y
31 31 CONFIG_NET=y
32 32 CONFIG_PACKET=y
33 33 CONFIG_UNIX=y
arch/arm/configs/ezx_defconfig
Diff comments   View file @ 464ed18
... ... @@ -39,7 +39,6 @@
39 39 CONFIG_BINFMT_MISC=m
40 40 CONFIG_PM=y
41 41 CONFIG_APM_EMULATION=y
42   -CONFIG_PM_RUNTIME=y
43 42 CONFIG_NET=y
44 43 CONFIG_PACKET=y
45 44 CONFIG_UNIX=y
arch/arm/configs/hisi_defconfig
Diff comments   View file @ 464ed18
... ... @@ -18,7 +18,7 @@
18 18 CONFIG_ARM_ATAG_DTB_COMPAT=y
19 19 CONFIG_NEON=y
20 20 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
21   -CONFIG_PM_RUNTIME=y
  21 +CONFIG_PM=y
22 22 CONFIG_NET=y
23 23 CONFIG_PACKET=y
24 24 CONFIG_UNIX=y
arch/arm/configs/imote2_defconfig
Diff comments   View file @ 464ed18
... ... @@ -31,7 +31,6 @@
31 31 CONFIG_BINFMT_MISC=m
32 32 CONFIG_PM=y
33 33 CONFIG_APM_EMULATION=y
34   -CONFIG_PM_RUNTIME=y
35 34 CONFIG_NET=y
36 35 CONFIG_PACKET=y
37 36 CONFIG_UNIX=y
arch/arm/configs/imx_v6_v7_defconfig
Diff comments   View file @ 464ed18
... ... @@ -54,7 +54,7 @@
54 54 CONFIG_VFP=y
55 55 CONFIG_NEON=y
56 56 CONFIG_BINFMT_MISC=m
57   -CONFIG_PM_RUNTIME=y
  57 +CONFIG_PM=y
58 58 CONFIG_PM_DEBUG=y
59 59 CONFIG_PM_TEST_SUSPEND=y
60 60 CONFIG_NET=y
arch/arm/configs/keystone_defconfig
Diff comments   View file @ 464ed18
... ... @@ -30,7 +30,7 @@
30 30 CONFIG_VFP=y
31 31 CONFIG_NEON=y
32 32 # CONFIG_SUSPEND is not set
33   -CONFIG_PM_RUNTIME=y
  33 +CONFIG_PM=y
34 34 CONFIG_NET=y
35 35 CONFIG_PACKET=y
36 36 CONFIG_UNIX=y
arch/arm/configs/kzm9g_defconfig
Diff comments   View file @ 464ed18
... ... @@ -43,7 +43,7 @@
43 43 CONFIG_VFP=y
44 44 CONFIG_NEON=y
45 45 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
46   -CONFIG_PM_RUNTIME=y
  46 +CONFIG_PM=y
47 47 CONFIG_NET=y
48 48 CONFIG_PACKET=y
49 49 CONFIG_UNIX=y
arch/arm/configs/lager_defconfig
Diff comments   View file @ 464ed18
... ... @@ -37,7 +37,7 @@
37 37 CONFIG_VFP=y
38 38 CONFIG_NEON=y
39 39 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
40   -CONFIG_PM_RUNTIME=y
  40 +CONFIG_PM=y
41 41 CONFIG_NET=y
42 42 CONFIG_PACKET=y
43 43 CONFIG_UNIX=y
arch/arm/configs/mackerel_defconfig
Diff comments   View file @ 464ed18
... ... @@ -28,7 +28,6 @@
28 28 CONFIG_VFP=y
29 29 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
30 30 CONFIG_PM=y
31   -CONFIG_PM_RUNTIME=y
32 31 CONFIG_NET=y
33 32 CONFIG_PACKET=y
34 33 CONFIG_UNIX=y
arch/arm/configs/marzen_defconfig
Diff comments   View file @ 464ed18
... ... @@ -33,7 +33,7 @@
33 33 CONFIG_VFP=y
34 34 CONFIG_KEXEC=y
35 35 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
36   -CONFIG_PM_RUNTIME=y
  36 +CONFIG_PM=y
37 37 CONFIG_NET=y
38 38 CONFIG_PACKET=y
39 39 CONFIG_UNIX=y
arch/arm/configs/omap1_defconfig
Diff comments   View file @ 464ed18
... ... @@ -63,7 +63,6 @@
63 63 CONFIG_BINFMT_MISC=y
64 64 CONFIG_PM=y
65 65 # CONFIG_SUSPEND is not set
66   -CONFIG_PM_RUNTIME=y
67 66 CONFIG_NET=y
68 67 CONFIG_PACKET=y
69 68 CONFIG_UNIX=y
arch/arm/configs/prima2_defconfig
Diff comments   View file @ 464ed18
... ... @@ -18,7 +18,7 @@
18 18 CONFIG_AEABI=y
19 19 CONFIG_KEXEC=y
20 20 CONFIG_BINFMT_MISC=y
21   -CONFIG_PM_RUNTIME=y
  21 +CONFIG_PM=y
22 22 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
23 23 CONFIG_BLK_DEV_LOOP=y
24 24 CONFIG_BLK_DEV_RAM=y
arch/arm/configs/sama5_defconfig
Diff comments   View file @ 464ed18
... ... @@ -32,7 +32,7 @@
32 32 CONFIG_NEON=y
33 33 CONFIG_KERNEL_MODE_NEON=y
34 34 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
35   -CONFIG_PM_RUNTIME=y
  35 +CONFIG_PM=y
36 36 CONFIG_PM_DEBUG=y
37 37 CONFIG_PM_ADVANCED_DEBUG=y
38 38 CONFIG_NET=y
arch/arm/configs/shmobile_defconfig
Diff comments   View file @ 464ed18
... ... @@ -39,7 +39,7 @@
39 39 CONFIG_VFP=y
40 40 CONFIG_NEON=y
41 41 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
42   -CONFIG_PM_RUNTIME=y
  42 +CONFIG_PM=y
43 43 CONFIG_NET=y
44 44 CONFIG_PACKET=y
45 45 CONFIG_UNIX=y
arch/arm/configs/sunxi_defconfig
Diff comments   View file @ 464ed18
... ... @@ -11,7 +11,7 @@
11 11 CONFIG_ARM_ATAG_DTB_COMPAT=y
12 12 CONFIG_VFP=y
13 13 CONFIG_NEON=y
14   -CONFIG_PM_RUNTIME=y
  14 +CONFIG_PM=y
15 15 CONFIG_NET=y
16 16 CONFIG_PACKET=y
17 17 CONFIG_UNIX=y
arch/arm/configs/tegra_defconfig
Diff comments   View file @ 464ed18
... ... @@ -46,7 +46,7 @@
46 46 CONFIG_CPU_IDLE=y
47 47 CONFIG_VFP=y
48 48 CONFIG_NEON=y
49   -CONFIG_PM_RUNTIME=y
  49 +CONFIG_PM=y
50 50 CONFIG_NET=y
51 51 CONFIG_PACKET=y
52 52 CONFIG_UNIX=y
arch/arm/configs/u8500_defconfig
Diff comments   View file @ 464ed18
... ... @@ -25,7 +25,7 @@
25 25 CONFIG_ARM_U8500_CPUIDLE=y
26 26 CONFIG_VFP=y
27 27 CONFIG_NEON=y
28   -CONFIG_PM_RUNTIME=y
  28 +CONFIG_PM=y
29 29 CONFIG_NET=y
30 30 CONFIG_PACKET=y
31 31 CONFIG_UNIX=y
arch/arm/configs/vt8500_v6_v7_defconfig
Diff comments   View file @ 464ed18
... ... @@ -16,7 +16,7 @@
16 16 CONFIG_ARM_ATAG_DTB_COMPAT=y
17 17 CONFIG_VFP=y
18 18 CONFIG_NEON=y
19   -CONFIG_PM_RUNTIME=y
  19 +CONFIG_PM=y
20 20 CONFIG_NET=y
21 21 CONFIG_UNIX=y
22 22 CONFIG_INET=y
arch/arm/mach-omap2/Kconfig
Diff comments   View file @ 464ed18
... ... @@ -15,7 +15,7 @@
15 15 select ARM_CPU_SUSPEND if PM
16 16 select OMAP_INTERCONNECT
17 17 select PM_OPP if PM
18   - select PM_RUNTIME if CPU_IDLE
  18 + select PM if CPU_IDLE
19 19 select SOC_HAS_OMAP2_SDRC
20 20  
21 21 config ARCH_OMAP4
... ... @@ -32,7 +32,7 @@
32 32 select PL310_ERRATA_588369 if CACHE_L2X0
33 33 select PL310_ERRATA_727915 if CACHE_L2X0
34 34 select PM_OPP if PM
35   - select PM_RUNTIME if CPU_IDLE
  35 + select PM if CPU_IDLE
36 36 select ARM_ERRATA_754322
37 37 select ARM_ERRATA_775420
38 38  
... ... @@ -103,7 +103,7 @@
103 103 select I2C_OMAP
104 104 select MENELAUS if ARCH_OMAP2
105 105 select NEON if CPU_V7
106   - select PM_RUNTIME
  106 + select PM
107 107 select REGULATOR
108 108 select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
109 109 select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
arch/mips/configs/db1xxx_defconfig
Diff comments   View file @ 464ed18
... ... @@ -36,7 +36,7 @@
36 36 CONFIG_PCI_REALLOC_ENABLE_AUTO=y
37 37 CONFIG_PCCARD=y
38 38 CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
39   -CONFIG_PM_RUNTIME=y
  39 +CONFIG_PM=y
40 40 CONFIG_NET=y
41 41 CONFIG_PACKET=y
42 42 CONFIG_PACKET_DIAG=y
arch/mips/configs/lemote2f_defconfig
Diff comments   View file @ 464ed18
... ... @@ -37,7 +37,6 @@
37 37 CONFIG_PM=y
38 38 CONFIG_HIBERNATION=y
39 39 CONFIG_PM_STD_PARTITION="/dev/hda3"
40   -CONFIG_PM_RUNTIME=y
41 40 CONFIG_CPU_FREQ=y
42 41 CONFIG_CPU_FREQ_DEBUG=y
43 42 CONFIG_CPU_FREQ_STAT=m
arch/mips/configs/loongson3_defconfig
Diff comments   View file @ 464ed18
... ... @@ -58,7 +58,7 @@
58 58 CONFIG_MIPS32_COMPAT=y
59 59 CONFIG_MIPS32_O32=y
60 60 CONFIG_MIPS32_N32=y
61   -CONFIG_PM_RUNTIME=y
  61 +CONFIG_PM=y
62 62 CONFIG_NET=y
63 63 CONFIG_PACKET=y
64 64 CONFIG_UNIX=y
arch/mips/configs/nlm_xlp_defconfig
Diff comments   View file @ 464ed18
... ... @@ -61,7 +61,7 @@
61 61 CONFIG_MIPS32_COMPAT=y
62 62 CONFIG_MIPS32_O32=y
63 63 CONFIG_MIPS32_N32=y
64   -CONFIG_PM_RUNTIME=y
  64 +CONFIG_PM=y
65 65 CONFIG_PM_DEBUG=y
66 66 CONFIG_NET=y
67 67 CONFIG_PACKET=y
arch/mips/configs/nlm_xlr_defconfig
Diff comments   View file @ 464ed18
... ... @@ -41,7 +41,7 @@
41 41 CONFIG_PCI_MSI=y
42 42 CONFIG_PCI_DEBUG=y
43 43 CONFIG_BINFMT_MISC=m
44   -CONFIG_PM_RUNTIME=y
  44 +CONFIG_PM=y
45 45 CONFIG_PM_DEBUG=y
46 46 CONFIG_NET=y
47 47 CONFIG_PACKET=y
arch/powerpc/configs/ps3_defconfig
Diff comments   View file @ 464ed18
... ... @@ -36,7 +36,7 @@
36 36 CONFIG_SCHED_SMT=y
37 37 CONFIG_CMDLINE_BOOL=y
38 38 CONFIG_CMDLINE=""
39   -CONFIG_PM_RUNTIME=y
  39 +CONFIG_PM=y
40 40 CONFIG_PM_DEBUG=y
41 41 # CONFIG_SECCOMP is not set
42 42 # CONFIG_PCI is not set
... ... @@ -223,7 +223,7 @@
223 223 config ARCH_SHMOBILE
224 224 bool
225 225 select ARCH_SUSPEND_POSSIBLE
226   - select PM_RUNTIME
  226 + select PM
227 227  
228 228 config CPU_HAS_PMU
229 229 depends on CPU_SH4 || CPU_SH4A
arch/sh/configs/apsh4ad0a_defconfig
Diff comments   View file @ 464ed18
... ... @@ -47,7 +47,7 @@
47 47 CONFIG_BINFMT_MISC=y
48 48 CONFIG_PM=y
49 49 CONFIG_PM_DEBUG=y
50   -CONFIG_PM_RUNTIME=y
  50 +CONFIG_PM=y
51 51 CONFIG_CPU_IDLE=y
52 52 CONFIG_NET=y
53 53 CONFIG_PACKET=y
arch/sh/configs/sdk7786_defconfig
Diff comments   View file @ 464ed18
... ... @@ -82,7 +82,7 @@
82 82 CONFIG_BINFMT_MISC=y
83 83 CONFIG_PM=y
84 84 CONFIG_PM_DEBUG=y
85   -CONFIG_PM_RUNTIME=y
  85 +CONFIG_PM=y
86 86 CONFIG_CPU_IDLE=y
87 87 CONFIG_NET=y
88 88 CONFIG_PACKET=y
drivers/usb/host/isp1760-hcd.c
Diff comments   View file @ 464ed18
... ... @@ -1739,7 +1739,7 @@
1739 1739 int retval = 1;
1740 1740 unsigned long flags;
1741 1741  
1742   - /* if !PM_RUNTIME, root hub timers won't get shut down ... */
  1742 + /* if !PM, root hub timers won't get shut down ... */
1743 1743 if (!HC_IS_RUNNING(hcd->state))
1744 1744 return 0;
1745 1745  
drivers/usb/host/oxu210hp-hcd.c
Diff comments   View file @ 464ed18
... ... @@ -3087,7 +3087,7 @@
3087 3087 int ports, i, retval = 1;
3088 3088 unsigned long flags;
3089 3089  
3090   - /* if !PM_RUNTIME, root hub timers won't get shut down ... */
  3090 + /* if !PM, root hub timers won't get shut down ... */
3091 3091 if (!HC_IS_RUNNING(hcd->state))
3092 3092 return 0;
3093 3093  
include/linux/devfreq.h
Diff comments   View file @ 464ed18
... ... @@ -188,7 +188,7 @@
188 188 extern void devm_devfreq_remove_device(struct device *dev,
189 189 struct devfreq *devfreq);
190 190  
191   -/* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */
  191 +/* Supposed to be called by PM callbacks */
192 192 extern int devfreq_suspend_device(struct devfreq *devfreq);
193 193 extern int devfreq_resume_device(struct devfreq *devfreq);
194 194  
kernel/power/Kconfig
Diff comments   View file @ 464ed18
... ... @@ -94,7 +94,7 @@
94 94 config PM_SLEEP
95 95 def_bool y
96 96 depends on SUSPEND || HIBERNATE_CALLBACKS
97   - select PM_RUNTIME
  97 + select PM
98 98  
99 99 config PM_SLEEP_SMP
100 100 def_bool y
101 101  
102 102  
103 103  
... ... @@ -130,22 +130,18 @@
130 130 depends on PM_WAKELOCKS
131 131 default y
132 132  
133   -config PM_RUNTIME
134   - bool "Run-time PM core functionality"
  133 +config PM
  134 + bool "Device power management core functionality"
135 135 ---help---
136 136 Enable functionality allowing I/O devices to be put into energy-saving
137   - (low power) states at run time (or autosuspended) after a specified
138   - period of inactivity and woken up in response to a hardware-generated
  137 + (low power) states, for example after a specified period of inactivity
  138 + (autosuspended), and woken up in response to a hardware-generated
139 139 wake-up event or a driver's request.
140 140  
141 141 Hardware support is generally required for this functionality to work
142 142 and the bus type drivers of the buses the devices are on are
143   - responsible for the actual handling of the autosuspend requests and
  143 + responsible for the actual handling of device suspend requests and
144 144 wake-up events.
145   -
146   -config PM
147   - def_bool y
148   - depends on PM_SLEEP || PM_RUNTIME
149 145  
150 146 config PM_DEBUG
151 147 bool "Power Management Debug Support"