Copyright changes for pack4.

11 files changed, 105 insertions, 94 deletions

diff --git a/sound/ab8500_codec.c b/sound/ab8500_codec.c
index ea572981e4b..6f0a10cc62f 100644
--- a/sound/ab8500_codec.c
+++ b/sound/ab8500_codec.c
@@ -1,15 +1,16 @@
-/*****************************************************************************/
-/**
-*  © ST-Ericsson, 2009 - All rights reserved
-*  Reproduction and Communication of this document is strictly prohibited
-*  unless specifically authorized in writing by ST-Ericsson
-*
-* \brief   This module provides some support routines for the AB8500 CODEC
-* \author  ST-Ericsson
-*/
-/*****************************************************************************/
-
-/*----------------------------------------------------------------------------
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * Author: ST-Ericsson
+ *
+ * License terms:
+ *
+ * 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.
+ */
+
+ /*----------------------------------------------------------------------------
  * Includes
  *---------------------------------------------------------------------------*/
 #include <mach/ab8500_codec.h>
diff --git a/sound/arm/u8500_alsa_ab8500.c b/sound/arm/u8500_alsa_ab8500.c
index 8c71114fab1..8c2fc5e8e96 100644
--- a/sound/arm/u8500_alsa_ab8500.c
+++ b/sound/arm/u8500_alsa_ab8500.c
@@ -1,19 +1,15 @@
-/*----------------------------------------------------------------------------------*/
-/* Author: Deepak Karda                                                             */
-/* Copyright (C) 2009 ST-Ericsson Pvt. Ltd.                                         */
-/*                                                                                  */
-/* This program is free software; you can redistribute it and/or modify it under    */
-/* the terms of the GNU General Public License as published by the Free             */
-/* Software Foundation; either version 2.1 of the License, or (at your option)      */
-/* any later version.                                                               */
-/*                                                                                  */
-/* This program is distributed in the hope that it will be useful, but WITHOUT      */
-/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS    */
-/* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.   */
-/*                                                                                  */
-/* You should have received a copy of the GNU General Public License                */
-/* along with this program. If not, see <http://www.gnu.org/licenses/>.             */
-/*----------------------------------------------------------------------------------*/
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * Author: Deepak Karda
+ *         for ST-Ericsson.
+ *
+ * License terms:
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.1 as published
+ * by the Free Software Foundation.
+ */
 
 /* This include must be defined at this point */
 //#include <sound/driver.h>
diff --git a/sound/arm/u8500_alsa_ab8500.h b/sound/arm/u8500_alsa_ab8500.h
index f0ec035851a..27e656b8a99 100644
--- a/sound/arm/u8500_alsa_ab8500.h
+++ b/sound/arm/u8500_alsa_ab8500.h
@@ -1,23 +1,14 @@
-/* sound/arm/u8500_alsa.c
+/*
+ * Copyright (C) ST-Ericsson SA 2010
  *
- * Source file for u8500 alsa driver
  * Author: Deepak Karda
- * Copyright (C) 2009 ST-Ericsson Pvt. Ltd.
+ *         for ST-Ericsson.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License terms:
  *
+ * 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.
  */
 
 #ifndef _U8500_ALSA_H_
diff --git a/sound/soc/codecs/ab3550.c b/sound/soc/codecs/ab3550.c
index 94f906c3fda..d68adf7dcf9 100755
--- a/sound/soc/codecs/ab3550.c
+++ b/sound/soc/codecs/ab3550.c
@@ -1,13 +1,14 @@
 /*
- * ab3550  --  ST-Ericsson Mixed Signaling ASIC
+ * Copyright (C) ST-Ericsson SA 2010
  *
- * Author:	Xie Xiaolei <xie.xiaolei@etericsson.com>
+ * Author: Xie Xiaolei <xie.xiaolei@etericsson.com>
+ *         for ST-Ericsson.
  *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
+ * License terms:
  *
+ * 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/module.h>
 #include <linux/moduleparam.h>
diff --git a/sound/soc/codecs/ab3550.h b/sound/soc/codecs/ab3550.h
index 754f5422ea6..943d9e4cdcf 100755
--- a/sound/soc/codecs/ab3550.h
+++ b/sound/soc/codecs/ab3550.h
@@ -1,3 +1,15 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * Author: Xie Xiaolei <xie.xiaolei@etericsson.com>
+ *         for ST-Ericsson.
+ *
+ * License terms:
+ *
+ * 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.
+ */
 #ifndef AB3550_CODEC_REGISTERS_H
 #define AB3550_CODEC_REGISTERS_H
 
diff --git a/sound/soc/u8500/mop500_ab3550.c b/sound/soc/u8500/mop500_ab3550.c
index 6eec2191350..743206ab72d 100755
--- a/sound/soc/u8500/mop500_ab3550.c
+++ b/sound/soc/u8500/mop500_ab3550.c
@@ -1,14 +1,16 @@
 /*
+ * Copyright (C) ST-Ericsson SA 2010
  *
- * sound/soc/u8500/u8500_ab3550.c
+ * Author: Ola Lilja ola.o.lilja@stericsson.com,
+ *         Roger Nilsson 	roger.xr.nilsson@stericsson.com
+ *         for ST-Ericsson.
  *
+ * License terms:
  *
- * Copyright (C) 2010 Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
- * ALSA SoC core support for the ab3550 chip.
- * Author:
+ * 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/module.h>
 #include <linux/moduleparam.h>
 #include <linux/device.h>
diff --git a/sound/soc/u8500/u8500_msp_dai.c b/sound/soc/u8500/u8500_msp_dai.c
index 585ecc825d5..bea67dd3934 100755
--- a/sound/soc/u8500/u8500_msp_dai.c
+++ b/sound/soc/u8500/u8500_msp_dai.c
@@ -1,13 +1,16 @@
 /*
+ * Copyright (C) ST-Ericsson SA 2010
  *
- * sound/soc/u8500/u8500_msp_dai.c
+ * Author: Ola Lilja ola.o.lilja@stericsson.com,
+ *         Roger Nilsson 	roger.xr.nilsson@stericsson.com
+ *         for ST-Ericsson.
  *
+ * License terms:
  *
- * Copyright (C) 2007 Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
- * ALSA SoC I2S driver for the u8500 platforms.
+ * 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 <sound/soc.h>
 #include <sound/soc-dai.h>
 #include <asm/dma.h>
diff --git a/sound/soc/u8500/u8500_msp_dai.h b/sound/soc/u8500/u8500_msp_dai.h
index ab821924ffc..077f1c98432 100755
--- a/sound/soc/u8500/u8500_msp_dai.h
+++ b/sound/soc/u8500/u8500_msp_dai.h
@@ -1,15 +1,18 @@
-#ifndef U8500_msp_dai_H
-#define U8500_msp_dai_H
-
 /*
+ * Copyright (C) ST-Ericsson SA 2010
  *
- * sound/soc/u8500/u8500_msp_dai.h
+ * Author: Ola Lilja ola.o.lilja@stericsson.com,
+ *         Roger Nilsson 	roger.xr.nilsson@stericsson.com
+ *         for ST-Ericsson.
  *
+ * License terms:
  *
- * Copyright (C) 2007 Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
- * ALSA SoC I2S driver for the U8500 platforms.
+ * 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.
  */
+#ifndef U8500_msp_dai_H
+#define U8500_msp_dai_H
 
 #include <linux/types.h>
 #include <linux/spinlock.h>
diff --git a/sound/soc/u8500/u8500_pcm.c b/sound/soc/u8500/u8500_pcm.c
index dc44eb29f76..edd22bec215 100755
--- a/sound/soc/u8500/u8500_pcm.c
+++ b/sound/soc/u8500/u8500_pcm.c
@@ -1,13 +1,16 @@
 /*
+ * Copyright (C) ST-Ericsson SA 2010
  *
- * sound/soc/u8500/u8500_pcm.c
+ * Author: Ola Lilja ola.o.lilja@stericsson.com,
+ *         Roger Nilsson 	roger.xr.nilsson@stericsson.com
+ *         for ST-Ericsson.
  *
+ * License terms:
  *
- * Copyright (C) 2010 ST-Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
- * ALSA SoC PCM driver for the u8500 platforms.
+ * 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 <asm/page.h>
 
 #include <linux/dma-mapping.h>
diff --git a/sound/soc/u8500/u8500_pcm.h b/sound/soc/u8500/u8500_pcm.h
index b5423af1cbb..59578718d09 100755
--- a/sound/soc/u8500/u8500_pcm.h
+++ b/sound/soc/u8500/u8500_pcm.h
@@ -1,13 +1,16 @@
 /*
+ * Copyright (C) ST-Ericsson SA 2010
  *
- * sound/soc/u8500/u8500_pcm.h
+ * Author: Ola Lilja ola.o.lilja@stericsson.com,
+ *         Roger Nilsson 	roger.xr.nilsson@stericsson.com
+ *         for ST-Ericsson.
  *
+ * License terms:
  *
- * Copyright (C) 2010 ST-Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
- * ALSA SoC core support for the stw4500 chip.
+ * 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.
  */
-
 #ifndef U8500_PCM_H
 #define U8500_PCM_H
 
diff --git a/sound/u8500_acodec_ab8500.c b/sound/u8500_acodec_ab8500.c
index 413ec194cc6..b4162e7c89b 100644
--- a/sound/u8500_acodec_ab8500.c
+++ b/sound/u8500_acodec_ab8500.c
@@ -1,19 +1,15 @@
-/*----------------------------------------------------------------------------------*/
-/* Author: Deepak Karda                                                             */
-/* Copyright (C) 2009 ST-Ericsson Pvt. Ltd.                                         */
-/*                                                                                  */
-/* This program is free software; you can redistribute it and/or modify it under    */
-/* the terms of the GNU General Public License as published by the Free             */
-/* Software Foundation; either version 2.1 of the License, or (at your option)      */
-/* any later version.                                                               */
-/*                                                                                  */
-/* This program is distributed in the hope that it will be useful, but WITHOUT      */
-/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS    */
-/* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.   */
-/*                                                                                  */
-/* You should have received a copy of the GNU General Public License                */
-/* along with this program. If not, see <http://www.gnu.org/licenses/>.             */
-/*----------------------------------------------------------------------------------*/
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * Author: Deepak Karda
+ *         for ST-Ericsson.
+ *
+ * License terms:
+ *
+ * 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.
+ */
 
 /*-----------------------------------------------------------------------------
 * Common Includes