91 files changed, 153 insertions, 160 deletions
diff --git a/arch/arm/mach-u8500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 5ba8328b782..a84e5b6463a 100644..100755
--- a/arch/arm/mach-u8500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -61,7 +61,7 @@ config U8500_PM
 config ARCH_HAS_CPU_IDLE_WAIT
     def_bool y
 
-source "arch/arm/mach-u8500/Kconfig-arch"
+source "arch/arm/mach-ux500/Kconfig-arch"
 
 config FORCE_MAX_ZONEORDER
     int "Maximum zone order"
diff --git a/arch/arm/mach-u8500/Kconfig-arch b/arch/arm/mach-ux500/Kconfig-arch
index 82aeebabd57..82aeebabd57 100644..100755
--- a/arch/arm/mach-u8500/Kconfig-arch
+++ b/arch/arm/mach-ux500/Kconfig-arch
diff --git a/arch/arm/mach-u8500/Makefile b/arch/arm/mach-ux500/Makefile
index adb63af8991..adb63af8991 100644..100755
--- a/arch/arm/mach-u8500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
diff --git a/arch/arm/mach-u8500/Makefile.boot b/arch/arm/mach-ux500/Makefile.boot
index c7e75acfe6c..c7e75acfe6c 100644..100755
--- a/arch/arm/mach-u8500/Makefile.boot
+++ b/arch/arm/mach-ux500/Makefile.boot
diff --git a/arch/arm/mach-u8500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c
index 3dcbde07aba..3dcbde07aba 100644
--- a/arch/arm/mach-u8500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
diff --git a/arch/arm/mach-u8500/clock.c b/arch/arm/mach-ux500/clock.c
index 5f84994e3ab..5f84994e3ab 100644..100755
--- a/arch/arm/mach-u8500/clock.c
+++ b/arch/arm/mach-ux500/clock.c
diff --git a/arch/arm/mach-u8500/clock.h b/arch/arm/mach-ux500/clock.h
index bcf246dcfa4..bcf246dcfa4 100644..100755
--- a/arch/arm/mach-u8500/clock.h
+++ b/arch/arm/mach-ux500/clock.h
diff --git a/arch/arm/mach-u8500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c
index 3c4adac835b..3c4adac835b 100644
--- a/arch/arm/mach-u8500/cpu-db5500.c
+++ b/arch/arm/mach-ux500/cpu-db5500.c
diff --git a/arch/arm/mach-u8500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index fb7def59b22..fb7def59b22 100644
--- a/arch/arm/mach-u8500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
diff --git a/arch/arm/mach-u8500/cpufreq.c b/arch/arm/mach-ux500/cpufreq.c
index 54f37e30c4c..54f37e30c4c 100644..100755
--- a/arch/arm/mach-u8500/cpufreq.c
+++ b/arch/arm/mach-ux500/cpufreq.c
diff --git a/arch/arm/mach-u8500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
index 98409ea1c43..98409ea1c43 100644..100755
--- a/arch/arm/mach-u8500/cpuidle.c
+++ b/arch/arm/mach-ux500/cpuidle.c
diff --git a/arch/arm/mach-u8500/cpuidle.h b/arch/arm/mach-ux500/cpuidle.h
index bfa5221a718..bfa5221a718 100644..100755
--- a/arch/arm/mach-u8500/cpuidle.h
+++ b/arch/arm/mach-ux500/cpuidle.h
diff --git a/arch/arm/mach-u8500/db5500-devices.c b/arch/arm/mach-ux500/db5500-devices.c
index 8ba9fb86cb4..8ba9fb86cb4 100644
--- a/arch/arm/mach-u8500/db5500-devices.c
+++ b/arch/arm/mach-ux500/db5500-devices.c
diff --git a/arch/arm/mach-u8500/db8500-devices.c b/arch/arm/mach-ux500/db8500-devices.c
index 4bba6684bbb..4bba6684bbb 100644
--- a/arch/arm/mach-u8500/db8500-devices.c
+++ b/arch/arm/mach-ux500/db8500-devices.c
diff --git a/arch/arm/mach-u8500/devices.c b/arch/arm/mach-ux500/devices.c
index fe570f779f1..98c906ecd7f 100644
--- a/arch/arm/mach-u8500/devices.c
+++ b/arch/arm/mach-ux500/devices.c
@@ -16,7 +16,6 @@
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/usb/musb.h>
-#include <linux/delay.h>
 #include <linux/regulator/machine.h>
 #include <linux/dma-mapping.h>
 
diff --git a/arch/arm/mach-u8500/dma_40.c b/arch/arm/mach-ux500/dma_40.c
index b1b84a9e25c..b1b84a9e25c 100644..100755
--- a/arch/arm/mach-u8500/dma_40.c
+++ b/arch/arm/mach-ux500/dma_40.c
diff --git a/arch/arm/mach-u8500/headsmp.S b/arch/arm/mach-ux500/headsmp.S
index 1f9aee4675d..1f9aee4675d 100644..100755
--- a/arch/arm/mach-u8500/headsmp.S
+++ b/arch/arm/mach-ux500/headsmp.S
diff --git a/arch/arm/mach-u8500/hotplug.c b/arch/arm/mach-ux500/hotplug.c
index f0c9471519c..f0c9471519c 100644..100755
--- a/arch/arm/mach-u8500/hotplug.c
+++ b/arch/arm/mach-ux500/hotplug.c
diff --git a/arch/arm/mach-u8500/hsi.c b/arch/arm/mach-ux500/hsi.c
index 79d7f04f41a..79d7f04f41a 100644
--- a/arch/arm/mach-u8500/hsi.c
+++ b/arch/arm/mach-ux500/hsi.c
diff --git a/arch/arm/mach-u8500/include/mach/ab8500-dev.h b/arch/arm/mach-ux500/include/mach/ab8500-dev.h
index 8b4d69f5d2e..8b4d69f5d2e 100644..100755
--- a/arch/arm/mach-u8500/include/mach/ab8500-dev.h
+++ b/arch/arm/mach-ux500/include/mach/ab8500-dev.h
diff --git a/arch/arm/mach-u8500/include/mach/ab8500.h b/arch/arm/mach-ux500/include/mach/ab8500.h
index 9dc62278731..9dc62278731 100644..100755
--- a/arch/arm/mach-u8500/include/mach/ab8500.h
+++ b/arch/arm/mach-ux500/include/mach/ab8500.h
diff --git a/arch/arm/mach-u8500/include/mach/ab8500_codec.h b/arch/arm/mach-ux500/include/mach/ab8500_codec.h
index b10f28b1a1d..b10f28b1a1d 100644..100755
--- a/arch/arm/mach-u8500/include/mach/ab8500_codec.h
+++ b/arch/arm/mach-ux500/include/mach/ab8500_codec.h
diff --git a/arch/arm/mach-u8500/include/mach/ab8500_codec_p.h b/arch/arm/mach-ux500/include/mach/ab8500_codec_p.h
index 415d5f73dc0..415d5f73dc0 100644..100755
--- a/arch/arm/mach-u8500/include/mach/ab8500_codec_p.h
+++ b/arch/arm/mach-ux500/include/mach/ab8500_codec_p.h
diff --git a/arch/arm/mach-u8500/include/mach/ab8500_gpadc.h b/arch/arm/mach-ux500/include/mach/ab8500_gpadc.h
index 150ff10173e..150ff10173e 100644
--- a/arch/arm/mach-u8500/include/mach/ab8500_gpadc.h
+++ b/arch/arm/mach-ux500/include/mach/ab8500_gpadc.h
diff --git a/arch/arm/mach-u8500/include/mach/av8100.h b/arch/arm/mach-ux500/include/mach/av8100.h
index a4afebf3c8c..a4afebf3c8c 100644..100755
--- a/arch/arm/mach-u8500/include/mach/av8100.h
+++ b/arch/arm/mach-ux500/include/mach/av8100.h
diff --git a/arch/arm/mach-u8500/include/mach/av8100_fw.h b/arch/arm/mach-ux500/include/mach/av8100_fw.h
index 95a1616804d..94c913dddb5 100644..100755
--- a/arch/arm/mach-u8500/include/mach/av8100_fw.h
+++ b/arch/arm/mach-ux500/include/mach/av8100_fw.h
@@ -1,12 +1,21 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * 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.
- */
+/*---------------------------------------------------------------------------*/
+/* � copyright STEricsson,2009. All rights reserved. For                     */
+/* information, STEricsson reserves the right to license                     */
+/* this software concurrently under separate license conditions.             */
+/*                                                                           */
+/* This program is free software; you can redistribute it and/or modify it   */
+/* under the terms of the GNU Lesser 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 Lesser General Public License for more details.                   */
+/*                                                                           */
+/* You should have received a copy of the GNU Lesser General Public License  */
+/* along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*---------------------------------------------------------------------------*/
 
 /* AV8100 Firmware version : V3.02 */
 #define fw_size 16384
diff --git a/arch/arm/mach-u8500/include/mach/av8100_p.h b/arch/arm/mach-ux500/include/mach/av8100_p.h
index 8900648d3e3..f3254cebbf9 100644..100755
--- a/arch/arm/mach-u8500/include/mach/av8100_p.h
+++ b/arch/arm/mach-ux500/include/mach/av8100_p.h
@@ -1,42 +1,38 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * 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.
- */
+/*---------------------------------------------------------------------------*/
+/* � copyright STEricsson,2009. All rights reserved. For                     */
+/* information, STEricsson reserves the right to license                     */
+/* this software concurrently under separate license conditions.             */
+/*                                                                           */
+/* This program is free software; you can redistribute it and/or modify it   */
+/* under the terms of the GNU Lesser 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 Lesser General Public License for more details.                   */
+/*                                                                           */
+/* You should have received a copy of the GNU Lesser General Public License  */
+/* along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*---------------------------------------------------------------------------*/
 
 #include <mach/av8100.h>
 
 /* defines for av8100_ */
-#define AV8100_COMMAND_OFFSET		0x10
-#define AV8100_COMMAND_MAX_LENGTH	0x81
+#define av8100_command_offset 0x10
+#define AV8100_COMMAND_MAX_LENGTH 0x81
 #define GPIO_AV8100_RSTN 196
 #define GPIO_AV8100_INT 192
 #define AV8100_DRIVER_MINOR_NUMBER 240
 
-/* Standby register */
-#define STANDBY_HPDS_HDMI_PLUGGED		0x04
-#define STANDBY_CVBS_TV_CABLE_PLUGGED	0x08
 
-/* Standby interrupts */
-#define HDMI_HOTPLUG_INTERRUPT 			0x1
-#define HDMI_HOTPLUG_INTERRUPT_MASK		0xFE
-#define CVBS_PLUG_INTERRUPT				0x2
-#define CVBS_PLUG_INTERRUPT_MASK		0xFD
-#define STANDBY_INTERRUPT_MASK_ALL		0xF0
-
-/* General interrupts */
-#define UNDER_OVER_FLOW_INTERRUPT		0x20
-#define UNDER_OVER_FLOW_INTERRUPT_MASK	0xDF
-#define TE_INTERRUPT					0x40
-#define TE_INTERRUPT_MASK				0xCF
-#define GENERAL_INTERRUPT_MASK_ALL		0x00
-
-/* General status */
-#define AV8100_GENERAL_STATUS_UC_READY 0x8
+#define HDMI_HOTPLUG_INTERRUPT 0x1
+#define HDMI_HOTPLUG_INTERRUPT_MASK 0xFE
+#define CVBS_PLUG_INTERRUPT 0x2
+#define CVBS_PLUG_INTERRUPT_MASK 0xFD
+#define TE_INTERRUPT_MASK 0x40
+#define UNDER_OVER_FLOW_INTERRUPT_MASK 0x20
 
 #define REG_16_8_LSB(p)  (unsigned char)(p & 0xFF)
 #define REG_16_8_MSB(p)  (unsigned char)((p & 0xFF00)>>8)
@@ -119,7 +115,6 @@ typedef struct {
     unsigned short                      TE_line_nb;                        /* Tearing effect line number*/
     av8100_te_config           TE_config;
     unsigned long                      master_clock_freq;                  /* Master clock frequency in HZ */
-    unsigned char			ui_x4;
 } av8100_video_input_format_cmd;
 /**
  * struct av8100_video_output_format_cmd - video output format structure
diff --git a/arch/arm/mach-u8500/include/mach/bit_mask.h b/arch/arm/mach-ux500/include/mach/bit_mask.h
index 9487dff5242..9487dff5242 100644..100755
--- a/arch/arm/mach-u8500/include/mach/bit_mask.h
+++ b/arch/arm/mach-ux500/include/mach/bit_mask.h
diff --git a/arch/arm/mach-u8500/include/mach/bits.h b/arch/arm/mach-ux500/include/mach/bits.h
index 0f0e4edd1cc..0f0e4edd1cc 100644..100755
--- a/arch/arm/mach-u8500/include/mach/bits.h
+++ b/arch/arm/mach-ux500/include/mach/bits.h
diff --git a/arch/arm/mach-u8500/include/mach/clkdev.h b/arch/arm/mach-ux500/include/mach/clkdev.h
index 04b37a89801..04b37a89801 100644..100755
--- a/arch/arm/mach-u8500/include/mach/clkdev.h
+++ b/arch/arm/mach-ux500/include/mach/clkdev.h
diff --git a/arch/arm/mach-u8500/include/mach/db5500-regs.h b/arch/arm/mach-ux500/include/mach/db5500-regs.h
index 474f6d3d968..474f6d3d968 100644
--- a/arch/arm/mach-u8500/include/mach/db5500-regs.h
+++ b/arch/arm/mach-ux500/include/mach/db5500-regs.h
diff --git a/arch/arm/mach-u8500/include/mach/db8500-regs.h b/arch/arm/mach-ux500/include/mach/db8500-regs.h
index e3d62b94ffc..e3d62b94ffc 100644
--- a/arch/arm/mach-u8500/include/mach/db8500-regs.h
+++ b/arch/arm/mach-ux500/include/mach/db8500-regs.h
diff --git a/arch/arm/mach-u8500/include/mach/debug-macro.S b/arch/arm/mach-ux500/include/mach/debug-macro.S
index 9cec503ff01..9cec503ff01 100644..100755
--- a/arch/arm/mach-u8500/include/mach/debug-macro.S
+++ b/arch/arm/mach-ux500/include/mach/debug-macro.S
diff --git a/arch/arm/mach-u8500/include/mach/debug.h b/arch/arm/mach-ux500/include/mach/debug.h
index 3567d7f5b38..3567d7f5b38 100644..100755
--- a/arch/arm/mach-u8500/include/mach/debug.h
+++ b/arch/arm/mach-ux500/include/mach/debug.h
diff --git a/arch/arm/mach-u8500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h
index 0ffc1a05c3d..0ffc1a05c3d 100644
--- a/arch/arm/mach-u8500/include/mach/devices.h
+++ b/arch/arm/mach-ux500/include/mach/devices.h
diff --git a/arch/arm/mach-u8500/include/mach/dma.h b/arch/arm/mach-ux500/include/mach/dma.h
index 269dd4c8108..269dd4c8108 100644..100755
--- a/arch/arm/mach-u8500/include/mach/dma.h
+++ b/arch/arm/mach-ux500/include/mach/dma.h
diff --git a/arch/arm/mach-u8500/include/mach/dma_40-8500.h b/arch/arm/mach-ux500/include/mach/dma_40-8500.h
index 7e0c15c7752..7e0c15c7752 100644..100755
--- a/arch/arm/mach-u8500/include/mach/dma_40-8500.h
+++ b/arch/arm/mach-ux500/include/mach/dma_40-8500.h
diff --git a/arch/arm/mach-u8500/include/mach/dsi.h b/arch/arm/mach-ux500/include/mach/dsi.h
index fad90f199d4..553ad998bb1 100644..100755
--- a/arch/arm/mach-u8500/include/mach/dsi.h
+++ b/arch/arm/mach-ux500/include/mach/dsi.h
@@ -1,12 +1,19 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * 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.
- */
+/*---------------------------------------------------------------------------*/
+/* Copyright ST Ericsson 2009. 						     */
+/*                                                                           */
+/* This program is free software; you can redistribute it and/or modify it   */
+/* under the terms of the GNU Lesser 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 Lesser General Public License for more details.                   */
+/*                                                                           */
+/* You should have received a copy of the GNU Lesser General Public License  */
+/* along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*---------------------------------------------------------------------------*/
 
 #ifndef _DSI_H_
 #define _DSI_H_
diff --git a/arch/arm/mach-u8500/include/mach/dsi_reg.h b/arch/arm/mach-ux500/include/mach/dsi_reg.h
index a02691e5960..a5fc8e39ff2 100644..100755
--- a/arch/arm/mach-u8500/include/mach/dsi_reg.h
+++ b/arch/arm/mach-ux500/include/mach/dsi_reg.h
@@ -1,12 +1,19 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * 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.
- */
+/*---------------------------------------------------------------------------*/
+/* Copyright (C) ST Ericsson 2009 					     */
+/*                                                                           */
+/* This program is free software; you can redistribute it and/or modify it   */
+/* under the terms of the GNU Lesser 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 Lesser General Public License for more details.                   */
+/*                                                                           */
+/* You should have received a copy of the GNU Lesser General Public License  */
+/* along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*---------------------------------------------------------------------------*/
 
 #ifndef _DSIREG_H_
 #define _DSIREG_H_
diff --git a/arch/arm/mach-u8500/include/mach/entry-macro.S b/arch/arm/mach-ux500/include/mach/entry-macro.S
index af3998021e2..af3998021e2 100644..100755
--- a/arch/arm/mach-u8500/include/mach/entry-macro.S
+++ b/arch/arm/mach-ux500/include/mach/entry-macro.S
diff --git a/arch/arm/mach-u8500/include/mach/gpio.h b/arch/arm/mach-ux500/include/mach/gpio.h
index b358f71b8cd..b358f71b8cd 100644..100755
--- a/arch/arm/mach-u8500/include/mach/gpio.h
+++ b/arch/arm/mach-ux500/include/mach/gpio.h
diff --git a/arch/arm/mach-u8500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h
index cd37b6bb1ee..cd37b6bb1ee 100644..100755
--- a/arch/arm/mach-u8500/include/mach/hardware.h
+++ b/arch/arm/mach-ux500/include/mach/hardware.h
diff --git a/arch/arm/mach-u8500/include/mach/hcl_defs.h b/arch/arm/mach-ux500/include/mach/hcl_defs.h
index ce8ac33618f..ce8ac33618f 100644..100755
--- a/arch/arm/mach-u8500/include/mach/hcl_defs.h
+++ b/arch/arm/mach-ux500/include/mach/hcl_defs.h
diff --git a/arch/arm/mach-u8500/include/mach/hsi-stm.h b/arch/arm/mach-ux500/include/mach/hsi-stm.h
index 3d1ac521ee1..3d1ac521ee1 100644..100755
--- a/arch/arm/mach-u8500/include/mach/hsi-stm.h
+++ b/arch/arm/mach-ux500/include/mach/hsi-stm.h
diff --git a/arch/arm/mach-u8500/include/mach/i2c-stm.h b/arch/arm/mach-ux500/include/mach/i2c-stm.h
index f211cfe9118..f211cfe9118 100644..100755
--- a/arch/arm/mach-u8500/include/mach/i2c-stm.h
+++ b/arch/arm/mach-ux500/include/mach/i2c-stm.h
diff --git a/arch/arm/mach-u8500/include/mach/io.h b/arch/arm/mach-ux500/include/mach/io.h
index 50553776b39..50553776b39 100644..100755
--- a/arch/arm/mach-u8500/include/mach/io.h
+++ b/arch/arm/mach-ux500/include/mach/io.h
diff --git a/arch/arm/mach-u8500/include/mach/irqs.h b/arch/arm/mach-ux500/include/mach/irqs.h
index 363cd443c18..363cd443c18 100644..100755
--- a/arch/arm/mach-u8500/include/mach/irqs.h
+++ b/arch/arm/mach-ux500/include/mach/irqs.h
diff --git a/arch/arm/mach-u8500/include/mach/isa_ioctl.h b/arch/arm/mach-ux500/include/mach/isa_ioctl.h
index b05726f8c3c..b05726f8c3c 100644..100755
--- a/arch/arm/mach-u8500/include/mach/isa_ioctl.h
+++ b/arch/arm/mach-ux500/include/mach/isa_ioctl.h
diff --git a/arch/arm/mach-u8500/include/mach/kpd.h b/arch/arm/mach-ux500/include/mach/kpd.h
index eae65ea7f94..eae65ea7f94 100644..100755
--- a/arch/arm/mach-u8500/include/mach/kpd.h
+++ b/arch/arm/mach-ux500/include/mach/kpd.h
diff --git a/arch/arm/mach-u8500/include/mach/mcde-base.h b/arch/arm/mach-ux500/include/mach/mcde-base.h
index c785fcac2de..c785fcac2de 100644
--- a/arch/arm/mach-u8500/include/mach/mcde-base.h
+++ b/arch/arm/mach-ux500/include/mach/mcde-base.h
diff --git a/arch/arm/mach-u8500/include/mach/mcde.h b/arch/arm/mach-ux500/include/mach/mcde.h
index 20437af76b9..9da3eab3018 100644..100755
--- a/arch/arm/mach-u8500/include/mach/mcde.h
+++ b/arch/arm/mach-ux500/include/mach/mcde.h
@@ -1,12 +1,19 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * 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.
- */
+/*---------------------------------------------------------------------------*/
+/* Copyright (C)  STEricssoni 2009. 					     */
+/*                                                                           */
+/* This program is free software; you can redistribute it and/or modify it   */
+/* under the terms of the GNU Lesser 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 Lesser General Public License for more details.                   */
+/*                                                                           */
+/* You should have received a copy of the GNU Lesser General Public License  */
+/* along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*---------------------------------------------------------------------------*/
 
 #ifndef _MCDE_H_
 #define _MCDE_H_
@@ -936,7 +943,7 @@ struct mcde_chx_lcd_timing0
   typedef enum
   {
       MCDE_VERTICAL_SYNCHRO_CAPTURE1 = 0x0,
-      MCDE_VERTICAL_SYNCHRO_CHANNELA = 0x1,
+      MCDE_VERTICAL_SYNCHRO_CHANELA = 0x1,
   }mcde_synchro_select;
 
   typedef enum
@@ -947,8 +954,8 @@ struct mcde_chx_lcd_timing0
 
   typedef enum
   {
-      MCDE_CHANNEL_C_DISABLE = 0x0,
-      MCDE_CHANNEL_C_ENABLE = 0x1
+      MCDE_CHANEL_C_DISABLE = 0x0,
+      MCDE_CHANEL_C_ENABLE = 0x1
   }mcde_chc_enable;
 
   typedef enum
@@ -1303,13 +1310,7 @@ int  mcde_set_buffer(struct fb_info *info, u32 buffer_address, mcde_buffer_id bu
 int  mcde_conf_dithering_ctrl(struct mcde_dithering_ctrl_conf dithering_ctrl_conf, struct fb_info *info);
 bool mcde_get_hdmi_flag(void);
 void mcde_configure_hdmi_channel(void);
-#ifdef CONFIG_MCDE_ENABLE_FEATURE_HW_V1_SUPPORT
-/* HW V1 */
-void mcde_hdmi_display_init_command_mode(mcde_video_mode video_mode);
-#else
-/* HW ED */
 void mcde_hdmi_display_init_command_mode(void);
-#endif
 void mcde_hdmi_display_init_video_mode(void);
 void mcde_hdmi_test_directcommand_mode_highspeed(void);
 void mcde_send_hdmi_cmd_data(char* buf,int length, int dsicommand);
@@ -1376,12 +1377,5 @@ mcde_error mcdesetchnlLCDhorizontaltiming(mcde_ch_id chid, struct mcde_chnl_lcd_
 mcde_error mcdesetchnlLCDverticaltiming(mcde_ch_id chid, struct mcde_chnl_lcd_vertical_timing lcd_vertical_timing);
 mcde_error mcdesetditheringctrl(mcde_ch_id chid, mcde_dithering_ctrl dithering_control);
 mcde_error mcdesetscanmode(mcde_ch_id chid, mcde_scan_mode scan_mode);
-
-#ifdef CONFIG_MCDE_ENABLE_FEATURE_HW_V1_SUPPORT
-/* HW V1 */
-mcde_state mcdegetchannelstate(mcde_ch_id chid);
-mcde_error mcdesetchnlCmode(mcde_ch_id chid, mcde_chc_panel panel_id, mcde_chc_enable state);
-#endif /* CONFIG_MCDE_ENABLE_FEATURE_HW_V1_SUPPORT */
-
 #endif
 
diff --git a/arch/arm/mach-u8500/include/mach/mcde_a0.h b/arch/arm/mach-ux500/include/mach/mcde_a0.h
index 8c06a628479..f848b6eaa90 100755
--- a/arch/arm/mach-u8500/include/mach/mcde_a0.h
+++ b/arch/arm/mach-ux500/include/mach/mcde_a0.h
@@ -1,13 +1,3 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * 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.
- */
-
 #define WRITE_FIELD(reg, field, value) \
   (reg = (reg & (~((field##_MASK) << (field##_SHIFT)))) | ((value & (field##_MASK)) << (field##_SHIFT)) )
 
@@ -314,18 +304,11 @@
 #define MCDE_CHNLSTAT_CHNLRD          0x00000001
 
 
-#define MCDE_CHNLSYNCHMOD						(MCDE_BASE + 0x608)
-#define MCDE_CHNLSYNCHMOD_OUT_SYNCH_SRC_SHIFT	2
-#define MCDE_CHNLSYNCHMOD_OUT_SYNCH_SRC_MASK	0x7
-#define MCDE_CHNLSYNCHMOD_SRC_SYNCH_SHIFT		0
-#define MCDE_CHNLSYNCHMOD_SRC_SYNCH_MASK		0x3
-#define MCDE_CHNLSYNCHMOD_OUT_SYNCH_SRC_FROM_SELECTED_FORMATER	0x0
-#define MCDE_CHNLSYNCHMOD_OUT_SYNCH_SRC_FROM_MCDEVSYNC0			0x1
-#define MCDE_CHNLSYNCHMOD_OUT_SYNCH_SRC_FROM_MCDEVSYNC1			0x2
-#define MCDE_CHNLSYNCHMOD_SRC_SYNCH_OUTPUT						0x0
-#define MCDE_CHNLSYNCHMOD_SRC_SYNCH_AUTO						0x1
-#define MCDE_CHNLSYNCHMOD_SRC_SYNCH_SW							0x2
-#define MCDE_CHNLSYNCHMOD_SRC_SYNCH_EXTERNAL					0x3
+#define MCDE_CHNLSYNCHMOD                     (MCDE_BASE + 0x608)
+#define MCDE_CHNLSYNCHMOD_OUT_SYNCH_SRC_SHIFT 2
+#define MCDE_CHNLSYNCHMOD_OUT_SYNCH_SRC_MASK  0x7
+#define MCDE_CHNLSYNCHMOD_SRC_SYNCH_SHIFT     0
+#define MCDE_CHNLSYNCHMOD_SRC_SYNCH_MASK      0x3
 
 
 #define MCDE_CHNLSYNCHSW          (MCDE_BASE + 0x60C)
@@ -368,6 +351,7 @@
 #define MCDE_CR0_POWEREN            0x00000002
 #define MCDE_CR0_FLOEN              0x00000001
 
+
 #define MCDE_CR1                  (MCDE_BASE + 0x804)
 #define MCDE_CR1_TEFFECTEN        0x80000000
 #define MCDE_CR1_CLKTYPE          0x40000000
@@ -483,24 +467,12 @@
 #define MCDE_TVCR_AVRGEN          0x00000100
 #define MCDE_TVCR_SDTVMODE_SHIFT  6
 #define MCDE_TVCR_SDTVMODE_MASK   0x3
-#define MCDE_TVCR_SDTVMODE_YC     0x0
-#define MCDE_TVCR_SDTVMODE_CY     0x1
 #define MCDE_TVCR_TVMODE_SHIFT    3
 #define MCDE_TVCR_TVMODE_MASK     0x7
-#define MCDE_TVCR_TVMODE_SDTV            0x0
-#define MCDE_TVCR_TVMODE_HDTV_480P       0x1
-#define MCDE_TVCR_TVMODE_HDTV_720P       0x2
-#define MCDE_TVCR_TVMODE_SDTV_DDR_LS_1ST 0x3
-#define MCDE_TVCR_TVMODE_SDTV_DDR_MS_1ST 0x4
-#define MCDE_TVCR_IFIELD_SHIFT    2
-#define MCDE_TVCR_IFIELD_MASK     0x1
-#define MCDE_TVCR_IFIELD_ACT_HGH  0x0
-#define MCDE_TVCR_IFIELD_ACT_LOW  0x1
+#define MCDE_TVCR_IFIELD          0x00000004
 #define MCDE_TVCR_INTEREN         0x00000002
-#define MCDE_TVCR_SEL_MOD_SHIFT   0
-#define MCDE_TVCR_SEL_MOD_MASK    0x1
-#define MCDE_TVCR_SEL_MOD_LCD     0x0
-#define MCDE_TVCR_SEL_MOD_TV      0x1
+#define MCDE_TVCR_SEL_MOD         0x00000001
+
 
 #define MCDE_TVBL1                (MCDE_BASE + 0x83C)
 #define MCDE_TVBL1_BSL1_SHIFT     16
@@ -878,8 +850,6 @@
 #define MCDE_DSICMDW_CMDW_START_MASK      0xFFFF
 #define MCDE_DSICMDW_CMDW_CONTINUE_SHIFT  0
 #define MCDE_DSICMDW_CMDW_CONTINUE_MASK   0xFFFF
-#define MCDE_DSICMDW_CMD_START_MEMORY_WRITE		0x2C
-#define MCDE_DSICMDW_CMD_CONTINUE_MEMORY_WRITE	0x3C
 
 
 #define MCDE_DSIDELAY0                  (MCDE_BASE + 0xE14)
diff --git a/arch/arm/mach-u8500/include/mach/mcde_common.h b/arch/arm/mach-ux500/include/mach/mcde_common.h
index b906114c6a4..fb992a6967b 100644..100755
--- a/arch/arm/mach-u8500/include/mach/mcde_common.h
+++ b/arch/arm/mach-ux500/include/mach/mcde_common.h
@@ -1,12 +1,19 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * 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.
- */
+/*---------------------------------------------------------------------------*/
+/* Copyrighti (C) STEricsson 2009. 				  	     */
+/*                                                                           */
+/* This program is free software; you can redistribute it and/or modify it   */
+/* under the terms of the GNU Lesser 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 Lesser General Public License for more details.                   */
+/*                                                                           */
+/* You should have received a copy of the GNU Lesser General Public License  */
+/* along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*---------------------------------------------------------------------------*/
 
 #ifndef _MCDE_COMMON_H_
 #define _MCDE_COMMON_H_
@@ -49,7 +56,7 @@ MODULE_PARM_DESC(mcde_debug,"Debug level for messages");
 
 /** Global data */
 
-#define MAX_LPF 1080
+#define MAX_LPF 1280
 #define MAX_PPL 1920
 #define NUM_MCDE_FLOWS 4
 #ifdef CONFIG_MCDE_ENABLE_FEATURE_HW_V1_SUPPORT
@@ -99,8 +106,6 @@ struct mcdefb_info {
 	u32 vcomp_irq;
 	u32 dsi_formatter;
 	u32 dsi_mode;
-	u32 swap;
-	u32 started;
 
 	/** phy-virtual addresses allocated for framebuffer and overlays */
 	struct mcde_addrmap buffaddr[MCDE_MAX_FRAMEBUFF*2];
diff --git a/arch/arm/mach-u8500/include/mach/mcde_ioctls.h b/arch/arm/mach-ux500/include/mach/mcde_ioctls.h
index 1ba82ea0dbb..605b430c0d9 100644..100755
--- a/arch/arm/mach-u8500/include/mach/mcde_ioctls.h
+++ b/arch/arm/mach-ux500/include/mach/mcde_ioctls.h
@@ -1,12 +1,18 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * 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.
- */
+/*----------------------------------------------------------------------------------*/
+/*  copyright STEricsson, 2009.                                            */
+/*                                                                                  */
+/* 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/>.             */
+/*----------------------------------------------------------------------------------*/
 
 #ifndef _MCDE_IOCTLS_H_
 #define _MCDE_IOCTLS_H_
@@ -416,10 +422,6 @@ typedef enum{
   VMODE_1920_1080_60_I,
   VMODE_1920_1080_60_P,
 #ifdef CONFIG_MCDE_ENABLE_FEATURE_HW_V1_SUPPORT
-  VMODE_1280_720_24_P,
-  VMODE_1280_720_30_P,
-  VMODE_1920_1080_24_P,
-  VMODE_1920_1080_25_P,
   VMODE_1920_1080_30_P,
 #endif
 }mcde_video_mode;
@@ -464,8 +466,6 @@ IOCTLs for access from user space
 #define MCDE_IOCTL_TV_CHANGE_MODE		_IOWR(MCDE_IOC_MAGIC, 0x1E,unsigned long)
 #define MCDE_IOCTL_TV_GET_MODE		_IOR(MCDE_IOC_MAGIC, 0x1F,unsigned long)
 
-#define MCDE_IOCTL_REG_DUMP			_IOR(MCDE_IOC_MAGIC, 0x20,unsigned long)
-
 /**
  * struct mcde_overlay_create - To create overlay
  * @xorig: frame buffer x-offset
diff --git a/arch/arm/mach-u8500/include/mach/mcde_reg.h b/arch/arm/mach-ux500/include/mach/mcde_reg.h
index 7b379cd962c..45a1a935670 100644..100755
--- a/arch/arm/mach-u8500/include/mach/mcde_reg.h
+++ b/arch/arm/mach-ux500/include/mach/mcde_reg.h
@@ -1,12 +1,19 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * 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.
- */
+/*---------------------------------------------------------------------------*/
+/* Copyrighti (C) STEricsson 2009. 				  	     */
+/*                                                                           */
+/* This program is free software; you can redistribute it and/or modify it   */
+/* under the terms of the GNU Lesser 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 Lesser General Public License for more details.                   */
+/*                                                                           */
+/* You should have received a copy of the GNU Lesser General Public License  */
+/* along with this program. If not, see <http://www.gnu.org/licenses/>.      */
+/*---------------------------------------------------------------------------*/
 
 #ifndef _MCDEREG_H_
 #define _MCDEREG_H_
diff --git a/arch/arm/mach-u8500/include/mach/memory.h b/arch/arm/mach-ux500/include/mach/memory.h
index 8a9d1324dec..8a9d1324dec 100644..100755
--- a/arch/arm/mach-u8500/include/mach/memory.h
+++ b/arch/arm/mach-ux500/include/mach/memory.h
diff --git a/arch/arm/mach-u8500/include/mach/mmc.h b/arch/arm/mach-ux500/include/mach/mmc.h
index 3dd72603c7f..3dd72603c7f 100644..100755
--- a/arch/arm/mach-u8500/include/mach/mmc.h
+++ b/arch/arm/mach-ux500/include/mach/mmc.h
diff --git a/arch/arm/mach-u8500/include/mach/msp.h b/arch/arm/mach-ux500/include/mach/msp.h
index af512cd7b09..af512cd7b09 100644..100755
--- a/arch/arm/mach-u8500/include/mach/msp.h
+++ b/arch/arm/mach-ux500/include/mach/msp.h
diff --git a/arch/arm/mach-u8500/include/mach/mtu.h b/arch/arm/mach-ux500/include/mach/mtu.h
index d3725fec7de..d3725fec7de 100644..100755
--- a/arch/arm/mach-u8500/include/mach/mtu.h
+++ b/arch/arm/mach-ux500/include/mach/mtu.h
diff --git a/arch/arm/mach-u8500/include/mach/prcmu-fw-api.h b/arch/arm/mach-ux500/include/mach/prcmu-fw-api.h
index 02dabe166cb..02dabe166cb 100644..100755
--- a/arch/arm/mach-u8500/include/mach/prcmu-fw-api.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu-fw-api.h
diff --git a/arch/arm/mach-u8500/include/mach/prcmu-fw-defs_ed.h b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_ed.h
index 849bacf0f8f..849bacf0f8f 100755
--- a/arch/arm/mach-u8500/include/mach/prcmu-fw-defs_ed.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_ed.h
diff --git a/arch/arm/mach-u8500/include/mach/prcmu-fw-defs_v1.h b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h
index c1442a5c9c2..c1442a5c9c2 100755
--- a/arch/arm/mach-u8500/include/mach/prcmu-fw-defs_v1.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h
diff --git a/arch/arm/mach-u8500/include/mach/prcmu-regs.h b/arch/arm/mach-ux500/include/mach/prcmu-regs.h
index 6f4c36cd7f5..6f4c36cd7f5 100644..100755
--- a/arch/arm/mach-u8500/include/mach/prcmu-regs.h
+++ b/arch/arm/mach-ux500/include/mach/prcmu-regs.h
diff --git a/arch/arm/mach-u8500/include/mach/scu.h b/arch/arm/mach-ux500/include/mach/scu.h
index 492c98c4810..492c98c4810 100644..100755
--- a/arch/arm/mach-u8500/include/mach/scu.h
+++ b/arch/arm/mach-ux500/include/mach/scu.h
diff --git a/arch/arm/mach-u8500/include/mach/setup.h b/arch/arm/mach-ux500/include/mach/setup.h
index 7da8d8d6a92..7da8d8d6a92 100644
--- a/arch/arm/mach-u8500/include/mach/setup.h
+++ b/arch/arm/mach-ux500/include/mach/setup.h
diff --git a/arch/arm/mach-u8500/include/mach/shrm.h b/arch/arm/mach-ux500/include/mach/shrm.h
index 99a5608c865..99a5608c865 100644..100755
--- a/arch/arm/mach-u8500/include/mach/shrm.h
+++ b/arch/arm/mach-ux500/include/mach/shrm.h
diff --git a/arch/arm/mach-u8500/include/mach/smp.h b/arch/arm/mach-ux500/include/mach/smp.h
index 3c1ec85c7dc..3c1ec85c7dc 100644..100755
--- a/arch/arm/mach-u8500/include/mach/smp.h
+++ b/arch/arm/mach-ux500/include/mach/smp.h
diff --git a/arch/arm/mach-u8500/include/mach/ste_conn_devices.h b/arch/arm/mach-ux500/include/mach/ste_conn_devices.h
index 66846fc5276..66846fc5276 100755
--- a/arch/arm/mach-u8500/include/mach/ste_conn_devices.h
+++ b/arch/arm/mach-ux500/include/mach/ste_conn_devices.h
diff --git a/arch/arm/mach-u8500/include/mach/stmpe1601.h b/arch/arm/mach-ux500/include/mach/stmpe1601.h
index c676f00b343..c676f00b343 100644..100755
--- a/arch/arm/mach-u8500/include/mach/stmpe1601.h
+++ b/arch/arm/mach-ux500/include/mach/stmpe1601.h
diff --git a/arch/arm/mach-u8500/include/mach/stmpe2401.h b/arch/arm/mach-ux500/include/mach/stmpe2401.h
index 2a5765d4596..2a5765d4596 100644..100755
--- a/arch/arm/mach-u8500/include/mach/stmpe2401.h
+++ b/arch/arm/mach-ux500/include/mach/stmpe2401.h
diff --git a/arch/arm/mach-u8500/include/mach/system.h b/arch/arm/mach-ux500/include/mach/system.h
index dd2e7277d93..dd2e7277d93 100644..100755
--- a/arch/arm/mach-u8500/include/mach/system.h
+++ b/arch/arm/mach-ux500/include/mach/system.h
diff --git a/arch/arm/mach-u8500/include/mach/tc35892.h b/arch/arm/mach-ux500/include/mach/tc35892.h
index ede0ea47d32..ede0ea47d32 100644..100755
--- a/arch/arm/mach-u8500/include/mach/tc35892.h
+++ b/arch/arm/mach-ux500/include/mach/tc35892.h
diff --git a/arch/arm/mach-u8500/include/mach/timex.h b/arch/arm/mach-ux500/include/mach/timex.h
index d43d0d73fbc..d43d0d73fbc 100644..100755
--- a/arch/arm/mach-u8500/include/mach/timex.h
+++ b/arch/arm/mach-ux500/include/mach/timex.h
diff --git a/arch/arm/mach-u8500/include/mach/u8500_acodec_ab8500.h b/arch/arm/mach-ux500/include/mach/u8500_acodec_ab8500.h
index f92eaff759f..f92eaff759f 100644..100755
--- a/arch/arm/mach-u8500/include/mach/u8500_acodec_ab8500.h
+++ b/arch/arm/mach-ux500/include/mach/u8500_acodec_ab8500.h
diff --git a/arch/arm/mach-u8500/include/mach/u8500_tsc.h b/arch/arm/mach-ux500/include/mach/u8500_tsc.h
index f7ba97992bc..f7ba97992bc 100644..100755
--- a/arch/arm/mach-u8500/include/mach/u8500_tsc.h
+++ b/arch/arm/mach-ux500/include/mach/u8500_tsc.h
diff --git a/arch/arm/mach-u8500/include/mach/uart.h b/arch/arm/mach-ux500/include/mach/uart.h
index a2dc5715bfe..a2dc5715bfe 100644..100755
--- a/arch/arm/mach-u8500/include/mach/uart.h
+++ b/arch/arm/mach-ux500/include/mach/uart.h
diff --git a/arch/arm/mach-u8500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h
index b2c9a5b3d97..b2c9a5b3d97 100644..100755
--- a/arch/arm/mach-u8500/include/mach/uncompress.h
+++ b/arch/arm/mach-ux500/include/mach/uncompress.h
diff --git a/arch/arm/mach-u8500/include/mach/vmalloc.h b/arch/arm/mach-ux500/include/mach/vmalloc.h
index 86cdbbce184..86cdbbce184 100644..100755
--- a/arch/arm/mach-u8500/include/mach/vmalloc.h
+++ b/arch/arm/mach-ux500/include/mach/vmalloc.h
diff --git a/arch/arm/mach-u8500/localtimer.c b/arch/arm/mach-ux500/localtimer.c
index b59e14697ca..b59e14697ca 100644..100755
--- a/arch/arm/mach-u8500/localtimer.c
+++ b/arch/arm/mach-ux500/localtimer.c
diff --git a/arch/arm/mach-u8500/mcde.c b/arch/arm/mach-ux500/mcde.c
index c7746426b43..c7746426b43 100644
--- a/arch/arm/mach-u8500/mcde.c
+++ b/arch/arm/mach-ux500/mcde.c
diff --git a/arch/arm/mach-u8500/mop500-sdi.c b/arch/arm/mach-ux500/mop500-sdi.c
index c1d3d97e046..c1d3d97e046 100644
--- a/arch/arm/mach-u8500/mop500-sdi.c
+++ b/arch/arm/mach-ux500/mop500-sdi.c
diff --git a/arch/arm/mach-u8500/mop500_devices.c b/arch/arm/mach-ux500/mop500_devices.c
index 239f013b140..239f013b140 100644..100755
--- a/arch/arm/mach-u8500/mop500_devices.c
+++ b/arch/arm/mach-ux500/mop500_devices.c
diff --git a/arch/arm/mach-u8500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index 8349b0c87c8..8349b0c87c8 100644..100755
--- a/arch/arm/mach-u8500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
diff --git a/arch/arm/mach-u8500/pm.c b/arch/arm/mach-ux500/pm.c
index f753ef11eea..f753ef11eea 100644..100755
--- a/arch/arm/mach-u8500/pm.c
+++ b/arch/arm/mach-ux500/pm.c
diff --git a/arch/arm/mach-u8500/prcmu-fw.c b/arch/arm/mach-ux500/prcmu-fw.c
index 44208066790..44208066790 100644..100755
--- a/arch/arm/mach-u8500/prcmu-fw.c
+++ b/arch/arm/mach-ux500/prcmu-fw.c
diff --git a/arch/arm/mach-u8500/prcmu-fw_ed.h b/arch/arm/mach-ux500/prcmu-fw_ed.h
index 1a1f8d8fc6b..1a1f8d8fc6b 100755
--- a/arch/arm/mach-u8500/prcmu-fw_ed.h
+++ b/arch/arm/mach-ux500/prcmu-fw_ed.h
diff --git a/arch/arm/mach-u8500/prcmu-fw_v1.h b/arch/arm/mach-ux500/prcmu-fw_v1.h
index 512608bbcf2..512608bbcf2 100755
--- a/arch/arm/mach-u8500/prcmu-fw_v1.h
+++ b/arch/arm/mach-ux500/prcmu-fw_v1.h
diff --git a/arch/arm/mach-u8500/regulator.c b/arch/arm/mach-ux500/regulator.c
index 085af6138c8..085af6138c8 100644
--- a/arch/arm/mach-u8500/regulator.c
+++ b/arch/arm/mach-ux500/regulator.c
diff --git a/arch/arm/mach-u8500/ste_conn_devices.c b/arch/arm/mach-ux500/ste_conn_devices.c
index 219b7057f0f..219b7057f0f 100755
--- a/arch/arm/mach-u8500/ste_conn_devices.c
+++ b/arch/arm/mach-ux500/ste_conn_devices.c
diff --git a/arch/arm/mach-u8500/timer-rtt.c b/arch/arm/mach-ux500/timer-rtt.c
index 1b7f15a381c..1b7f15a381c 100644
--- a/arch/arm/mach-u8500/timer-rtt.c
+++ b/arch/arm/mach-ux500/timer-rtt.c
diff --git a/arch/arm/mach-u8500/timer.c b/arch/arm/mach-ux500/timer.c
index bfe5545bfac..bfe5545bfac 100644..100755
--- a/arch/arm/mach-u8500/timer.c
+++ b/arch/arm/mach-ux500/timer.c