aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2013-04-26 07:05:44 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-04-26 16:30:25 -0400
commita8e39c35b5d09598e129aa9b5e6f35aa3a1915d9 (patch)
treee5d3a77b0e713e6935badff34c3a789b3ed20be9
parent9fe3d35a32a9be259435e30fdca680cb78bd6d6f (diff)
cpuidle: add maintainer entry
Currently cpuidle drivers are spread across different archs. As a result, there are several different paths for cpuidle patch submissions: cpuidle core changes go through linux-pm, ARM driver changes go to the arm-soc or SoC-specific trees, sh changes go through the sh arch tree, pseries changes go through the PowerPC tree and finally intel changes go through the Len's tree while ACPI idle changes go through linux-pm. That makes it difficult to consolidate code and to propagate modifications from the cpuidle core to the different drivers. Hopefully, a movement has started to put the majority of cpuidle drivers under drivers/cpuidle like cpuidle-calxeda.c and cpuidle-kirkwood.c. Add a maintainer entry for cpuidle to MAINTAINERS to clarify the situation and to indicate to new cpuidle driver authors that those drivers should not go into arch-specific directories. The upstreaming process is unchanged: Rafael takes patches for merging into his tree, but with an Acked-by: tag from the driver's maintainer, so indicate in the drivers' headers who maintains them. The arrangement will be the same as for cpufreq. [rjw: Changelog] Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Andrew Lunn <andrew@lunn.ch> #for kirkwood Acked-by: Jason Cooper <jason@lakedaemon.net> #for kirkwood Acked-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--MAINTAINERS9
-rw-r--r--drivers/cpuidle/cpuidle-calxeda.c4
-rw-r--r--drivers/cpuidle/cpuidle-kirkwood.c5
3 files changed, 15 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 836a6183c37f..2f20dc44bbb6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2206,6 +2206,15 @@ S: Maintained
2206F: drivers/cpufreq/ 2206F: drivers/cpufreq/
2207F: include/linux/cpufreq.h 2207F: include/linux/cpufreq.h
2208 2208
2209CPUIDLE DRIVERS
2210M: Rafael J. Wysocki <rjw@sisk.pl>
2211M: Daniel Lezcano <daniel.lezcano@linaro.org>
2212L: linux-pm@vger.kernel.org
2213S: Maintained
2214T: git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
2215F: drivers/cpuidle/*
2216F: include/linux/cpuidle.h
2217
2209CPUID/MSR DRIVER 2218CPUID/MSR DRIVER
2210M: "H. Peter Anvin" <hpa@zytor.com> 2219M: "H. Peter Anvin" <hpa@zytor.com>
2211S: Maintained 2220S: Maintained
diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c
index e344b560d75d..223379169cb0 100644
--- a/drivers/cpuidle/cpuidle-calxeda.c
+++ b/drivers/cpuidle/cpuidle-calxeda.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Copyright 2012 Calxeda, Inc. 2 * Copyright 2012 Calxeda, Inc.
3 * 3 *
4 * Based on arch/arm/plat-mxc/cpuidle.c: 4 * Based on arch/arm/plat-mxc/cpuidle.c: #v3.7
5 * Copyright 2012 Freescale Semiconductor, Inc. 5 * Copyright 2012 Freescale Semiconductor, Inc.
6 * Copyright 2012 Linaro Ltd. 6 * Copyright 2012 Linaro Ltd.
7 * 7 *
@@ -16,6 +16,8 @@
16 * 16 *
17 * You should have received a copy of the GNU General Public License along with 17 * You should have received a copy of the GNU General Public License along with
18 * this program. If not, see <http://www.gnu.org/licenses/>. 18 * this program. If not, see <http://www.gnu.org/licenses/>.
19 *
20 * Maintainer: Rob Herring <rob.herring@calxeda.com>
19 */ 21 */
20 22
21#include <linux/cpuidle.h> 23#include <linux/cpuidle.h>
diff --git a/drivers/cpuidle/cpuidle-kirkwood.c b/drivers/cpuidle/cpuidle-kirkwood.c
index 53290e1f86c7..521b0a7fdd89 100644
--- a/drivers/cpuidle/cpuidle-kirkwood.c
+++ b/drivers/cpuidle/cpuidle-kirkwood.c
@@ -1,6 +1,4 @@
1/* 1/*
2 * arch/arm/mach-kirkwood/cpuidle.c
3 *
4 * CPU idle Marvell Kirkwood SoCs 2 * CPU idle Marvell Kirkwood SoCs
5 * 3 *
6 * This file is licensed under the terms of the GNU General Public 4 * This file is licensed under the terms of the GNU General Public
@@ -11,6 +9,9 @@
11 * to implement two idle states - 9 * to implement two idle states -
12 * #1 wait-for-interrupt 10 * #1 wait-for-interrupt
13 * #2 wait-for-interrupt and DDR self refresh 11 * #2 wait-for-interrupt and DDR self refresh
12 *
13 * Maintainer: Jason Cooper <jason@lakedaemon.net>
14 * Maintainer: Andrew Lunn <andrew@lunn.ch>
14 */ 15 */
15 16
16#include <linux/kernel.h> 17#include <linux/kernel.h>