aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSundar R Iyer <sundar.iyer@stericsson.com>2010-05-12 15:44:59 +0530
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:27 -0600
commit4d1cb924d3e6065e50e2b14e421aac4e18341dff (patch)
tree990166ccadaddac86a14946ae3db3743de39f161 /arch
parent457fecbf0f8ce3394d5287e43e3229107ac93ba3 (diff)
downloadlinux-2.6.34-ux500-4d1cb924d3e6065e50e2b14e421aac4e18341dff.tar.gz
ux500-cleanup: fix copyrights/authors for power management files
FIDO_IR_ER: 260771 Signed-off-by: Sundar R Iyer <sundar.iyer@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Change-Id: Ia77f8b859f6775e5eab00600be497909e26b97f3 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2363 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/mach-ux500/cpufreq.c10
-rwxr-xr-xarch/arm/mach-ux500/cpuidle.c15
-rwxr-xr-xarch/arm/mach-ux500/cpuidle.h10
-rwxr-xr-xarch/arm/mach-ux500/include/mach/prcmu-fw-api.h11
-rwxr-xr-xarch/arm/mach-ux500/include/mach/prcmu-fw-defs_ed.h13
-rwxr-xr-xarch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h11
-rw-r--r--arch/arm/mach-ux500/mop500-regulators.c12
-rwxr-xr-xarch/arm/mach-ux500/pm.c12
-rwxr-xr-xarch/arm/mach-ux500/prcmu-fw.c14
-rwxr-xr-xarch/arm/mach-ux500/prcmu-fw_ed.h13
-rwxr-xr-xarch/arm/mach-ux500/prcmu-fw_v1.h10
-rw-r--r--arch/arm/mach-ux500/regulator.c10
-rw-r--r--arch/arm/mach-ux500/timer-rtt.c8
13 files changed, 73 insertions, 76 deletions
diff --git a/arch/arm/mach-ux500/cpufreq.c b/arch/arm/mach-ux500/cpufreq.c
index d41e2796613..4454a08348a 100755
--- a/arch/arm/mach-ux500/cpufreq.c
+++ b/arch/arm/mach-ux500/cpufreq.c
@@ -1,12 +1,10 @@
/*
- * CPU frequency module for U8500
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
*
- * Copyright (C) 2009 STMicroelectronics.
- * Copyright (C) 2009 ST-Ericsson SA
+ * License Terms: GNU General Public License v2
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
*/
#include <linux/cpufreq.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
index b5a7c1a25e6..58a031ee93a 100755
--- a/arch/arm/mach-ux500/cpuidle.c
+++ b/arch/arm/mach-ux500/cpuidle.c
@@ -1,16 +1,13 @@
/*
- * CPU idle module for U8500
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
*
- * Copyright (C) 2009 STMicroelectronics.
- * Copyright (C) 2009 ST-Ericsson SA
+ * License Terms: GNU General Public License v2
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
+ * CPUIdle driver for U8500
*/
-/* CPUIdle driver for U8500 */
-
#include <linux/module.h>
#include <linux/hrtimer.h>
#include <linux/sched.h>
@@ -243,4 +240,4 @@ module_exit(u8500_cpuidle_exit);
MODULE_DESCRIPTION("U8500 CPUIdle driver");
MODULE_LICENSE("GPL");
-MODULE_AUTHOR("STMicroelectronics");
+MODULE_AUTHOR("STMicroelectronics/Sundar Iyer, ST-Ericsson");
diff --git a/arch/arm/mach-ux500/cpuidle.h b/arch/arm/mach-ux500/cpuidle.h
index bfa5221a718..b81889acea6 100755
--- a/arch/arm/mach-ux500/cpuidle.h
+++ b/arch/arm/mach-ux500/cpuidle.h
@@ -1,11 +1,11 @@
/*
- * CPU frequency module for U8500
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
*
- * Copyright 2009 STMicroelectronics.
+ * License Terms: GNU General Public License v2
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
+ * CPUIdle header for U8500
*/
#ifndef __U8500_CPUIDLE_H
#define __U8500_CPUIDLE_H
diff --git a/arch/arm/mach-ux500/include/mach/prcmu-fw-api.h b/arch/arm/mach-ux500/include/mach/prcmu-fw-api.h
index 58efab7f85c..3be7c5cfa33 100755
--- a/arch/arm/mach-ux500/include/mach/prcmu-fw-api.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu-fw-api.h
@@ -1,11 +1,12 @@
/*
- * Copyright (c) 2009 ST-Ericsson SA
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
+ * License Terms: GNU General Public License v2
+ * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
+ *
+ * PRCMU f/w APIs
*/
-
#ifndef __MACH_PRCMU_FW_API_H
#define __MACH_PRCMU_FW_API_H
diff --git a/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_ed.h b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_ed.h
index 5f9c5aa7a8e..fb40723a590 100755
--- a/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_ed.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_ed.h
@@ -1,13 +1,12 @@
/*
- * Copyright (c) 2009 ST-Ericsson SA
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
+ * License Terms: GNU General Public License v2
+ * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
+ *
+ * PRCMU definitions for U8500 ED cut
*/
-
-
-
#ifndef __MACH_PRCMU_FW_DEFS_ED_H
#define __MACH_PRCMU_FW_DEFS_ED_H
diff --git a/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h
index 1a171f8173d..8542384a9c0 100755
--- a/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h
@@ -1,11 +1,12 @@
/*
- * Copyright (c) 2009 ST-Ericsson SA
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
+ * License Terms: GNU General Public License v2
+ * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
+ *
+ * PRCMU definitions for U8500 v1.0 cut
*/
-
#ifndef __MACH_PRCMU_FW_DEFS_V1_H
#define __MACH_PRCMU_FW_DEFS_V1_H
diff --git a/arch/arm/mach-ux500/mop500-regulators.c b/arch/arm/mach-ux500/mop500-regulators.c
index c40bf010d7b..4b1cea6a14c 100644
--- a/arch/arm/mach-ux500/mop500-regulators.c
+++ b/arch/arm/mach-ux500/mop500-regulators.c
@@ -1,10 +1,14 @@
/*
- * Copyright (C) 2009 ST-Ericsson SA
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * License Terms: GNU General Public License v2
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
+ *
+ * Board specific file for regulator machine initialization
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
*/
+
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/amba/bus.h>
diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
index 96f040a8eda..096cb675d79 100755
--- a/arch/arm/mach-ux500/pm.c
+++ b/arch/arm/mach-ux500/pm.c
@@ -1,14 +1,12 @@
/*
- * Copyright 2009 STMicroelectronics.
- * Copyright (C) 2009 ST-Ericsson SA
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * License Terms: GNU General Public License v2
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
*/
-/* U8500 platform suspend/resume support */
-
#include "pm.h"
#define U8500_EXT_BACKUPRAM_ADDR (0x80151FDC)
diff --git a/arch/arm/mach-ux500/prcmu-fw.c b/arch/arm/mach-ux500/prcmu-fw.c
index bdce3c9c6af..0c6f50f8b79 100755
--- a/arch/arm/mach-ux500/prcmu-fw.c
+++ b/arch/arm/mach-ux500/prcmu-fw.c
@@ -1,13 +1,13 @@
/*
- * Copyright (C) 2009 ST-Ericsson SA
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
+ * License Terms: GNU General Public License v2
+ * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
+ *
+ * U8500 PRCM Unit interface driver
*/
-
-/* Routines to talk to PRCMU firmware services */
-
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/delay.h>
diff --git a/arch/arm/mach-ux500/prcmu-fw_ed.h b/arch/arm/mach-ux500/prcmu-fw_ed.h
index 7a2d2de436c..1f39996af9e 100755
--- a/arch/arm/mach-ux500/prcmu-fw_ed.h
+++ b/arch/arm/mach-ux500/prcmu-fw_ed.h
@@ -1,13 +1,14 @@
/*
- * Copyright (c) 2009 ST-Ericsson SA
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
+ * License Terms: GNU General Public License v2
+ * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
+ *
+ * U8500 PRCM header definitions for u8500 ED cut
*/
-
-
#ifndef __MACH_PRCMU_FW_ED_H
#define __MACH_PRCMU_FW_ED_H
diff --git a/arch/arm/mach-ux500/prcmu-fw_v1.h b/arch/arm/mach-ux500/prcmu-fw_v1.h
index 05d203298cc..6a88295fa42 100755
--- a/arch/arm/mach-ux500/prcmu-fw_v1.h
+++ b/arch/arm/mach-ux500/prcmu-fw_v1.h
@@ -1,9 +1,11 @@
/*
- * Copyright (C) 2009 ST-Ericsson SA
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
+ * License Terms: GNU General Public License v2
+ * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
+ *
+ * U8500 PRCM header definitions for u8500 v1.0 cut
*/
#ifndef __MACH_PRCMU_FW_V1_H
diff --git a/arch/arm/mach-ux500/regulator.c b/arch/arm/mach-ux500/regulator.c
index c6741e89a1f..97f41f263b1 100644
--- a/arch/arm/mach-ux500/regulator.c
+++ b/arch/arm/mach-ux500/regulator.c
@@ -1,11 +1,10 @@
/*
- * Copyright (C) 2009 ST-Ericsson SA
+ * Copyright (C) ST-Ericsson SA 2010
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
+ * License Terms: GNU General Public License v2
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
*
- * U8500 machine specific regulators
+ * DB8500 specific regulators on AB8500
*
* Supplies on the AB8500 which are dedicated to AB8500 and AB8500 devices
* are included here as machine specific -
@@ -14,7 +13,6 @@
* following points must be noted :
* - VARM,VMODEM and VSAFE wont be accountable to the framework.
* - VAPE cannot be turned off as it is the interconnect supply.
- * - the EPODs for multimedia are modelled as regulators derived from VAPE.
*
*/
diff --git a/arch/arm/mach-ux500/timer-rtt.c b/arch/arm/mach-ux500/timer-rtt.c
index 9de02b18eb6..ddfd7447b92 100644
--- a/arch/arm/mach-ux500/timer-rtt.c
+++ b/arch/arm/mach-ux500/timer-rtt.c
@@ -1,11 +1,9 @@
/*
- * linux/arch/arm/mach-u8500/timer-rtt.c
+ * Copyright (C) ST-Ericsson SA 2010
*
- * Copyright (C) 2009 ST-Ericsson SA
+ * License Terms: GNU General Public License v2
+ * Author: Rabin Vincent <rabin.vincent@stericsson.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
*/
#include <linux/interrupt.h>
#include <linux/irq.h>