+1 -1

arch/arm/configs/ape6evm_defconfig

reviewed

··· 33 33 CONFIG_VFP=y 34 34 CONFIG_NEON=y 35 35 CONFIG_BINFMT_MISC=y 36 36 - CONFIG_PM_RUNTIME=y 36 36 + CONFIG_PM=y 37 37 CONFIG_NET=y 38 38 CONFIG_PACKET=y 39 39 CONFIG_UNIX=y

+1 -1

arch/arm/configs/armadillo800eva_defconfig

reviewed

··· 43 43 CONFIG_VFP=y 44 44 CONFIG_NEON=y 45 45 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 46 46 - CONFIG_PM_RUNTIME=y 46 46 + CONFIG_PM=y 47 47 CONFIG_NET=y 48 48 CONFIG_PACKET=y 49 49 CONFIG_UNIX=y

+1 -1

arch/arm/configs/bcm_defconfig

reviewed

··· 39 39 CONFIG_VFP=y 40 40 CONFIG_NEON=y 41 41 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 42 42 - CONFIG_PM_RUNTIME=y 42 42 + CONFIG_PM=y 43 43 CONFIG_NET=y 44 44 CONFIG_PACKET=y 45 45 CONFIG_PACKET_DIAG=y

+1 -1

arch/arm/configs/bockw_defconfig

reviewed

··· 29 29 CONFIG_ARM_APPENDED_DTB=y 30 30 CONFIG_VFP=y 31 31 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 32 32 - CONFIG_PM_RUNTIME=y 32 32 + CONFIG_PM=y 33 33 CONFIG_NET=y 34 34 CONFIG_PACKET=y 35 35 CONFIG_UNIX=y

+1 -1

arch/arm/configs/davinci_all_defconfig

reviewed

··· 49 49 CONFIG_CPU_FREQ_GOV_POWERSAVE=m 50 50 CONFIG_CPU_FREQ_GOV_ONDEMAND=m 51 51 CONFIG_CPU_IDLE=y 52 52 - CONFIG_PM_RUNTIME=y 52 52 + CONFIG_PM=y 53 53 CONFIG_NET=y 54 54 CONFIG_PACKET=y 55 55 CONFIG_UNIX=y

+1 -1

arch/arm/configs/exynos_defconfig

reviewed

··· 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 30 - CONFIG_PM_RUNTIME=y 30 30 + CONFIG_PM=y 31 31 CONFIG_NET=y 32 32 CONFIG_PACKET=y 33 33 CONFIG_UNIX=y

-1

arch/arm/configs/ezx_defconfig

reviewed

··· 39 39 CONFIG_BINFMT_MISC=m 40 40 CONFIG_PM=y 41 41 CONFIG_APM_EMULATION=y 42 42 - CONFIG_PM_RUNTIME=y 43 42 CONFIG_NET=y 44 43 CONFIG_PACKET=y 45 44 CONFIG_UNIX=y

+1 -1

arch/arm/configs/hisi_defconfig

reviewed

··· 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 21 - CONFIG_PM_RUNTIME=y 21 21 + CONFIG_PM=y 22 22 CONFIG_NET=y 23 23 CONFIG_PACKET=y 24 24 CONFIG_UNIX=y

-1

arch/arm/configs/imote2_defconfig

reviewed

··· 31 31 CONFIG_BINFMT_MISC=m 32 32 CONFIG_PM=y 33 33 CONFIG_APM_EMULATION=y 34 34 - CONFIG_PM_RUNTIME=y 35 34 CONFIG_NET=y 36 35 CONFIG_PACKET=y 37 36 CONFIG_UNIX=y

+1 -1

arch/arm/configs/imx_v6_v7_defconfig

reviewed

··· 54 54 CONFIG_VFP=y 55 55 CONFIG_NEON=y 56 56 CONFIG_BINFMT_MISC=m 57 57 - CONFIG_PM_RUNTIME=y 57 57 + CONFIG_PM=y 58 58 CONFIG_PM_DEBUG=y 59 59 CONFIG_PM_TEST_SUSPEND=y 60 60 CONFIG_NET=y

+1 -1

arch/arm/configs/keystone_defconfig

reviewed

··· 30 30 CONFIG_VFP=y 31 31 CONFIG_NEON=y 32 32 # CONFIG_SUSPEND is not set 33 33 - CONFIG_PM_RUNTIME=y 33 33 + CONFIG_PM=y 34 34 CONFIG_NET=y 35 35 CONFIG_PACKET=y 36 36 CONFIG_UNIX=y

+1 -1

arch/arm/configs/kzm9g_defconfig

reviewed

··· 43 43 CONFIG_VFP=y 44 44 CONFIG_NEON=y 45 45 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 46 46 - CONFIG_PM_RUNTIME=y 46 46 + CONFIG_PM=y 47 47 CONFIG_NET=y 48 48 CONFIG_PACKET=y 49 49 CONFIG_UNIX=y

+1 -1

arch/arm/configs/lager_defconfig

reviewed

··· 37 37 CONFIG_VFP=y 38 38 CONFIG_NEON=y 39 39 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 40 40 - CONFIG_PM_RUNTIME=y 40 40 + CONFIG_PM=y 41 41 CONFIG_NET=y 42 42 CONFIG_PACKET=y 43 43 CONFIG_UNIX=y

-1

arch/arm/configs/mackerel_defconfig

reviewed

··· 28 28 CONFIG_VFP=y 29 29 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 30 30 CONFIG_PM=y 31 31 - CONFIG_PM_RUNTIME=y 32 31 CONFIG_NET=y 33 32 CONFIG_PACKET=y 34 33 CONFIG_UNIX=y

+1 -1

arch/arm/configs/marzen_defconfig

reviewed

··· 33 33 CONFIG_VFP=y 34 34 CONFIG_KEXEC=y 35 35 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 36 36 - CONFIG_PM_RUNTIME=y 36 36 + CONFIG_PM=y 37 37 CONFIG_NET=y 38 38 CONFIG_PACKET=y 39 39 CONFIG_UNIX=y

-1

arch/arm/configs/omap1_defconfig

reviewed

··· 63 63 CONFIG_BINFMT_MISC=y 64 64 CONFIG_PM=y 65 65 # CONFIG_SUSPEND is not set 66 66 - CONFIG_PM_RUNTIME=y 67 66 CONFIG_NET=y 68 67 CONFIG_PACKET=y 69 68 CONFIG_UNIX=y

+1 -1

arch/arm/configs/prima2_defconfig

reviewed

··· 18 18 CONFIG_AEABI=y 19 19 CONFIG_KEXEC=y 20 20 CONFIG_BINFMT_MISC=y 21 21 - CONFIG_PM_RUNTIME=y 21 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

+1 -1

arch/arm/configs/sama5_defconfig

reviewed

··· 32 32 CONFIG_NEON=y 33 33 CONFIG_KERNEL_MODE_NEON=y 34 34 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 35 35 - CONFIG_PM_RUNTIME=y 35 35 + CONFIG_PM=y 36 36 CONFIG_PM_DEBUG=y 37 37 CONFIG_PM_ADVANCED_DEBUG=y 38 38 CONFIG_NET=y

+1 -1

arch/arm/configs/shmobile_defconfig

reviewed

··· 39 39 CONFIG_VFP=y 40 40 CONFIG_NEON=y 41 41 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 42 42 - CONFIG_PM_RUNTIME=y 42 42 + CONFIG_PM=y 43 43 CONFIG_NET=y 44 44 CONFIG_PACKET=y 45 45 CONFIG_UNIX=y

+1 -1

arch/arm/configs/sunxi_defconfig

reviewed

··· 11 11 CONFIG_ARM_ATAG_DTB_COMPAT=y 12 12 CONFIG_VFP=y 13 13 CONFIG_NEON=y 14 14 - CONFIG_PM_RUNTIME=y 14 14 + CONFIG_PM=y 15 15 CONFIG_NET=y 16 16 CONFIG_PACKET=y 17 17 CONFIG_UNIX=y

+1 -1

arch/arm/configs/tegra_defconfig

reviewed

··· 46 46 CONFIG_CPU_IDLE=y 47 47 CONFIG_VFP=y 48 48 CONFIG_NEON=y 49 49 - CONFIG_PM_RUNTIME=y 49 49 + CONFIG_PM=y 50 50 CONFIG_NET=y 51 51 CONFIG_PACKET=y 52 52 CONFIG_UNIX=y

+1 -1

arch/arm/configs/u8500_defconfig

reviewed

··· 25 25 CONFIG_ARM_U8500_CPUIDLE=y 26 26 CONFIG_VFP=y 27 27 CONFIG_NEON=y 28 28 - CONFIG_PM_RUNTIME=y 28 28 + CONFIG_PM=y 29 29 CONFIG_NET=y 30 30 CONFIG_PACKET=y 31 31 CONFIG_UNIX=y

+1 -1

arch/arm/configs/vt8500_v6_v7_defconfig

reviewed

··· 16 16 CONFIG_ARM_ATAG_DTB_COMPAT=y 17 17 CONFIG_VFP=y 18 18 CONFIG_NEON=y 19 19 - CONFIG_PM_RUNTIME=y 19 19 + CONFIG_PM=y 20 20 CONFIG_NET=y 21 21 CONFIG_UNIX=y 22 22 CONFIG_INET=y

+3 -3

arch/arm/mach-omap2/Kconfig

reviewed

··· 15 15 select ARM_CPU_SUSPEND if PM 16 16 select OMAP_INTERCONNECT 17 17 select PM_OPP if PM 18 18 - select PM_RUNTIME if CPU_IDLE 18 18 + select PM if CPU_IDLE 19 19 select SOC_HAS_OMAP2_SDRC 20 20 21 21 config ARCH_OMAP4 ··· 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 35 - select PM_RUNTIME if CPU_IDLE 35 35 + select PM if CPU_IDLE 36 36 select ARM_ERRATA_754322 37 37 select ARM_ERRATA_775420 38 38 ··· 103 103 select I2C_OMAP 104 104 select MENELAUS if ARCH_OMAP2 105 105 select NEON if CPU_V7 106 106 - select PM_RUNTIME 106 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

+1 -1

arch/mips/configs/db1xxx_defconfig

reviewed

··· 36 36 CONFIG_PCI_REALLOC_ENABLE_AUTO=y 37 37 CONFIG_PCCARD=y 38 38 CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y 39 39 - CONFIG_PM_RUNTIME=y 39 39 + CONFIG_PM=y 40 40 CONFIG_NET=y 41 41 CONFIG_PACKET=y 42 42 CONFIG_PACKET_DIAG=y

-1

arch/mips/configs/lemote2f_defconfig

reviewed

··· 37 37 CONFIG_PM=y 38 38 CONFIG_HIBERNATION=y 39 39 CONFIG_PM_STD_PARTITION="/dev/hda3" 40 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

+1 -1

arch/mips/configs/loongson3_defconfig

reviewed

··· 58 58 CONFIG_MIPS32_COMPAT=y 59 59 CONFIG_MIPS32_O32=y 60 60 CONFIG_MIPS32_N32=y 61 61 - CONFIG_PM_RUNTIME=y 61 61 + CONFIG_PM=y 62 62 CONFIG_NET=y 63 63 CONFIG_PACKET=y 64 64 CONFIG_UNIX=y

+1 -1

arch/mips/configs/nlm_xlp_defconfig

reviewed

··· 61 61 CONFIG_MIPS32_COMPAT=y 62 62 CONFIG_MIPS32_O32=y 63 63 CONFIG_MIPS32_N32=y 64 64 - CONFIG_PM_RUNTIME=y 64 64 + CONFIG_PM=y 65 65 CONFIG_PM_DEBUG=y 66 66 CONFIG_NET=y 67 67 CONFIG_PACKET=y

+1 -1

arch/mips/configs/nlm_xlr_defconfig

reviewed

··· 41 41 CONFIG_PCI_MSI=y 42 42 CONFIG_PCI_DEBUG=y 43 43 CONFIG_BINFMT_MISC=m 44 44 - CONFIG_PM_RUNTIME=y 44 44 + CONFIG_PM=y 45 45 CONFIG_PM_DEBUG=y 46 46 CONFIG_NET=y 47 47 CONFIG_PACKET=y

+1 -1

arch/powerpc/configs/ps3_defconfig

reviewed

··· 36 36 CONFIG_SCHED_SMT=y 37 37 CONFIG_CMDLINE_BOOL=y 38 38 CONFIG_CMDLINE="" 39 39 - CONFIG_PM_RUNTIME=y 39 39 + CONFIG_PM=y 40 40 CONFIG_PM_DEBUG=y 41 41 # CONFIG_SECCOMP is not set 42 42 # CONFIG_PCI is not set

+1 -1

arch/sh/Kconfig

reviewed

··· 223 223 config ARCH_SHMOBILE 224 224 bool 225 225 select ARCH_SUSPEND_POSSIBLE 226 226 - select PM_RUNTIME 226 226 + select PM 227 227 228 228 config CPU_HAS_PMU 229 229 depends on CPU_SH4 || CPU_SH4A

+1 -1

arch/sh/configs/apsh4ad0a_defconfig

reviewed

··· 47 47 CONFIG_BINFMT_MISC=y 48 48 CONFIG_PM=y 49 49 CONFIG_PM_DEBUG=y 50 50 - CONFIG_PM_RUNTIME=y 50 50 + CONFIG_PM=y 51 51 CONFIG_CPU_IDLE=y 52 52 CONFIG_NET=y 53 53 CONFIG_PACKET=y

+1 -1

arch/sh/configs/sdk7786_defconfig

reviewed

··· 82 82 CONFIG_BINFMT_MISC=y 83 83 CONFIG_PM=y 84 84 CONFIG_PM_DEBUG=y 85 85 - CONFIG_PM_RUNTIME=y 85 85 + CONFIG_PM=y 86 86 CONFIG_CPU_IDLE=y 87 87 CONFIG_NET=y 88 88 CONFIG_PACKET=y

+2 -2

drivers/spi/spi-img-spfi.c

reviewed

··· 663 663 return 0; 664 664 } 665 665 666 666 - #ifdef CONFIG_PM_RUNTIME 666 666 + #ifdef CONFIG_PM 667 667 static int img_spfi_runtime_suspend(struct device *dev) 668 668 { 669 669 struct spi_master *master = dev_get_drvdata(dev); ··· 692 692 693 693 return 0; 694 694 } 695 695 - #endif /* CONFIG_PM_RUNTIME */ 695 695 + #endif /* CONFIG_PM */ 696 696 697 697 #ifdef CONFIG_PM_SLEEP 698 698 static int img_spfi_suspend(struct device *dev)

+2 -2

drivers/spi/spi-meson-spifc.c

reviewed

··· 413 413 } 414 414 #endif /* CONFIG_PM_SLEEP */ 415 415 416 416 - #ifdef CONFIG_PM_RUNTIME 416 416 + #ifdef CONFIG_PM 417 417 static int meson_spifc_runtime_suspend(struct device *dev) 418 418 { 419 419 struct spi_master *master = dev_get_drvdata(dev); ··· 431 431 432 432 return clk_prepare_enable(spifc->clk); 433 433 } 434 434 - #endif /* CONFIG_PM_RUNTIME */ 434 434 + #endif /* CONFIG_PM */ 435 435 436 436 static const struct dev_pm_ops meson_spifc_pm_ops = { 437 437 SET_SYSTEM_SLEEP_PM_OPS(meson_spifc_suspend, meson_spifc_resume)

+7 -7

drivers/tty/serial/8250/8250_omap.c

reviewed

··· 561 561 if (ret) 562 562 goto err; 563 563 564 564 - #ifdef CONFIG_PM_RUNTIME 564 564 + #ifdef CONFIG_PM 565 565 up->capabilities |= UART_CAP_RPM; 566 566 #endif 567 567 ··· 997 997 up.port.fifosize = 64; 998 998 up.tx_loadsz = 64; 999 999 up.capabilities = UART_CAP_FIFO; 1000 1000 - #ifdef CONFIG_PM_RUNTIME 1000 1000 + #ifdef CONFIG_PM 1001 1001 /* 1002 1002 - * PM_RUNTIME is mostly transparent. However to do it right we need to a 1002 1002 + * Runtime PM is mostly transparent. However to do it right we need to a 1003 1003 * TX empty interrupt before we can put the device to auto idle. So if 1004 1004 - * PM_RUNTIME is not enabled we don't add that flag and can spare that 1005 1005 - * one extra interrupt in the TX path. 1004 1004 + * PM is not enabled we don't add that flag and can spare that one extra 1005 1005 + * interrupt in the TX path. 1006 1006 */ 1007 1007 up.capabilities |= UART_CAP_RPM; 1008 1008 #endif ··· 1105 1105 return 0; 1106 1106 } 1107 1107 1108 1108 - #if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME) 1108 1108 + #ifdef CONFIG_PM 1109 1109 1110 1110 static inline void omap8250_enable_wakeirq(struct omap8250_priv *priv, 1111 1111 bool enable) ··· 1179 1179 #define omap8250_complete NULL 1180 1180 #endif 1181 1181 1182 1182 - #ifdef CONFIG_PM_RUNTIME 1182 1182 + #ifdef CONFIG_PM 1183 1183 static int omap8250_lost_context(struct uart_8250_port *up) 1184 1184 { 1185 1185 u32 val;

+1 -1

drivers/usb/host/isp1760-hcd.c

reviewed

··· 1739 1739 int retval = 1; 1740 1740 unsigned long flags; 1741 1741 1742 1742 - /* if !PM_RUNTIME, root hub timers won't get shut down ... */ 1742 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

+1 -1

drivers/usb/host/oxu210hp-hcd.c

reviewed

··· 3087 3087 int ports, i, retval = 1; 3088 3088 unsigned long flags; 3089 3089 3090 3090 - /* if !PM_RUNTIME, root hub timers won't get shut down ... */ 3090 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

+1 -1

include/linux/devfreq.h

reviewed

··· 188 188 extern void devm_devfreq_remove_device(struct device *dev, 189 189 struct devfreq *devfreq); 190 190 191 191 - /* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */ 191 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

+6 -10

kernel/power/Kconfig

reviewed

··· 94 94 config PM_SLEEP 95 95 def_bool y 96 96 depends on SUSPEND || HIBERNATE_CALLBACKS 97 97 - select PM_RUNTIME 97 97 + select PM 98 98 99 99 config PM_SLEEP_SMP 100 100 def_bool y ··· 130 130 depends on PM_WAKELOCKS 131 131 default y 132 132 133 133 - config PM_RUNTIME 134 134 - bool "Run-time PM core functionality" 133 133 + config PM 134 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 137 - (low power) states at run time (or autosuspended) after a specified 138 138 - period of inactivity and woken up in response to a hardware-generated 137 137 + (low power) states, for example after a specified period of inactivity 138 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 143 - responsible for the actual handling of the autosuspend requests and 143 143 + responsible for the actual handling of device suspend requests and 144 144 wake-up events. 145 145 - 146 146 - config PM 147 147 - def_bool y 148 148 - depends on PM_SLEEP || PM_RUNTIME 149 145 150 146 config PM_DEBUG 151 147 bool "Power Management Debug Support"

+2 -2

sound/soc/intel/sst-haswell-pcm.c

reviewed

··· 998 998 return 0; 999 999 } 1000 1000 1001 1001 - #ifdef CONFIG_PM_RUNTIME 1001 1001 + #ifdef CONFIG_PM 1002 1002 1003 1003 static int hsw_pcm_runtime_idle(struct device *dev) 1004 1004 { ··· 1057 1057 #define hsw_pcm_runtime_resume NULL 1058 1058 #endif 1059 1059 1060 1060 - #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_RUNTIME) 1060 1060 + #ifdef CONFIG_PM 1061 1061 1062 1062 static void hsw_pcm_complete(struct device *dev) 1063 1063 {