Renamed mrst.h to intel-mid.h

BZ: 22780

Change-Id: Iaef116f80a64cc2c0d7c6b7d8a97634fdbb163eb
Signed-off-by: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
Reviewed-on: http://android.intel.com:8080/34377
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Tested-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: Wood, Brian J <brian.j.wood@intel.com>
Tested-by: Wood, Brian J <brian.j.wood@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/intel-mid.h
similarity index 95%
rename from arch/x86/include/asm/mrst.h
rename to arch/x86/include/asm/intel-mid.h
index c5fcc63..5c0bb81 100644 (file)
--- a/arch/x86/include/asm/mrst.h
+++ b/arch/x86/include/asm/intel-mid.h
@@ -1,5 +1,5 @@
 /*
- * mrst.h: Intel Moorestown platform specific setup code
+ * intel-mid.h: Intel MID specific setup code
  *
  * (C) Copyright 2009 Intel Corporation
  *
@@ -8,8 +8,8 @@
  * as published by the Free Software Foundation; version 2
  * of the License.
  */
-#ifndef _ASM_X86_MRST_H
-#define _ASM_X86_MRST_H
+#ifndef _ASM_X86_INTEL_MID_H
+#define _ASM_X86_INTEL_MID_H
 
 #include <linux/sfi.h>
 #include <linux/pci.h>
@@ -135,7 +135,7 @@ enum {
        MFLD_BID_PR3         = 0x35,
        MFLD_BID_PR3_PNP     = 0x18
 };
-extern u32 mfld_board_id (void);
+extern u32 mfld_board_id(void);
 
 
 /*
@@ -168,7 +168,8 @@ extern void *cloverview_usb_otg_get_pdata(void);
 
 extern void intel_mid_rtc_init(void);
 
-extern int mrst_pmu_pci_set_power_state(struct pci_dev *pdev, pci_power_t state);
+extern int mrst_pmu_pci_set_power_state(struct pci_dev *pdev,
+                                       pci_power_t state);
 
 #ifdef CONFIG_X86_MDFLD
 extern int pmu_pci_set_power_state(struct pci_dev *pdev, pci_power_t state);
@@ -196,4 +197,4 @@ extern int get_force_shutdown_occured(void);
 extern const struct atomisp_platform_data *intel_get_v4l2_subdev_table(void);
 
 extern void (*saved_shutdown)(void);
-#endif /* _ASM_X86_MRST_H */
+#endif /* _ASM_X86_INTEL_MID_H */

diff --git a/arch/x86/include/asm/intel_scu_ipc.h b/arch/x86/include/asm/intel_scu_ipc.h
index 1636386..a8d0776 100644 (file)
--- a/arch/x86/include/asm/intel_scu_ipc.h
+++ b/arch/x86/include/asm/intel_scu_ipc.h
@@ -2,7 +2,7 @@
 #define  _ASM_X86_INTEL_SCU_IPC_H_
 
 #include <linux/notifier.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 
 /* IPC defines the following message types */
 #define IPCMSG_BATTERY          0xEF /* Coulomb Counter Accumulator */

diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index 847b7cb..d84f138 100644 (file)
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -43,7 +43,7 @@
 
 #include <asm/fixmap.h>
 #include <asm/apb_timer.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 
 #define APBT_MASK                      CLOCKSOURCE_MASK(32)
 #define APBT_SHIFT                     22

diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index 0dea0dd..69116df 100644 (file)
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -14,7 +14,7 @@
 #include <xen/hvc-console.h>
 #include <asm/pci-direct.h>
 #include <asm/fixmap.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/pgtable.h>
 #include <linux/usb/ehci_def.h>
 

diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index 072163a..2ba401a 100644 (file)
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -14,7 +14,7 @@
 #include <asm/vsyscall.h>
 #include <asm/x86_init.h>
 #include <asm/time.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 
 #ifdef CONFIG_X86_32
 /*

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index b5add0e..83ae1d2 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -68,7 +68,7 @@
 #include <linux/percpu.h>
 #include <linux/crash_dump.h>
 #include <linux/tboot.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 
 #include <video/edid.h>
 

diff --git a/arch/x86/platform/intel-mid.c b/arch/x86/platform/intel-mid.c
index 00a7bf9..631534f 100644 (file)
--- a/arch/x86/platform/intel-mid.c
+++ b/arch/x86/platform/intel-mid.c
@@ -41,7 +41,7 @@
 #include <asm/hw_irq.h>
 #include <asm/apic.h>
 #include <asm/io_apic.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/mrst-vrtc.h>
 #include <asm/io.h>
 #include <asm/i8259.h>

diff --git a/arch/x86/platform/mfld/board-blackbay.c b/arch/x86/platform/mfld/board-blackbay.c
index af26cb8..0f9f320 100644 (file)
--- a/arch/x86/platform/mfld/board-blackbay.c
+++ b/arch/x86/platform/mfld/board-blackbay.c
@@ -62,7 +62,7 @@
 #include <asm/hw_irq.h>
 #include <asm/apic.h>
 #include <asm/io_apic.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/mrst-vrtc.h>
 #include <asm/io.h>
 #include <asm/i8259.h>

diff --git a/arch/x86/platform/mfld/board-redridge.c b/arch/x86/platform/mfld/board-redridge.c
index cb62a0d..2a0c55f 100644 (file)
--- a/arch/x86/platform/mfld/board-redridge.c
+++ b/arch/x86/platform/mfld/board-redridge.c
@@ -62,7 +62,7 @@
 #include <asm/hw_irq.h>
 #include <asm/apic.h>
 #include <asm/io_apic.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/mrst-vrtc.h>
 #include <asm/io.h>
 #include <asm/i8259.h>

diff --git a/arch/x86/platform/mfld/mfld.c b/arch/x86/platform/mfld/mfld.c
index e8694af..180735c 100644 (file)
--- a/arch/x86/platform/mfld/mfld.c
+++ b/arch/x86/platform/mfld/mfld.c
@@ -31,7 +31,7 @@
 #include <asm/hw_irq.h>
 #include <asm/apic.h>
 #include <asm/io_apic.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/mrst-vrtc.h>
 #include <asm/io.h>
 #include <asm/i8259.h>

diff --git a/arch/x86/platform/mfld/pmu.c b/arch/x86/platform/mfld/pmu.c
index e9b3e61..c9bd888 100755 (executable)
--- a/arch/x86/platform/mfld/pmu.c
+++ b/arch/x86/platform/mfld/pmu.c
@@ -33,7 +33,7 @@
 #include <linux/jhash.h>
 #include <linux/suspend.h>
 #include <linux/wakelock.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/apic.h>
 
 #include <linux/intel_mid_pm.h>

diff --git a/arch/x86/platform/mrst/early_printk_mrst.c b/arch/x86/platform/mrst/early_printk_mrst.c
index 52f57c9..7ca6dd1 100644 (file)
--- a/arch/x86/platform/mrst/early_printk_mrst.c
+++ b/arch/x86/platform/mrst/early_printk_mrst.c
@@ -31,7 +31,7 @@
 
 #include <asm/fixmap.h>
 #include <asm/pgtable.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 
 #define MRST_SPI_TIMEOUT               0x200000
 #define MRST_REGBASE_SPI0              0xff128000

diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index db9ee5b..70df7c4 100644 (file)
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -27,7 +27,7 @@
 #include <asm/hw_irq.h>
 #include <asm/apic.h>
 #include <asm/io_apic.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/mrst-vrtc.h>
 #include <asm/io.h>
 #include <asm/i8259.h>

diff --git a/arch/x86/platform/mrst/vrtc.c b/arch/x86/platform/mrst/vrtc.c
index 6b1ffbb..522f7ef 100644 (file)
--- a/arch/x86/platform/mrst/vrtc.c
+++ b/arch/x86/platform/mrst/vrtc.c
@@ -22,7 +22,7 @@
 #include <linux/sfi.h>
 #include <linux/platform_device.h>
 
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/mrst-vrtc.h>
 #include <asm/time.h>
 #include <asm/fixmap.h>

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index a4574b6..8969e39 100644 (file)
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -64,7 +64,7 @@
 #include <asm/mwait.h>
 #include <asm/msr.h>
 #include <asm/atomic.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #ifdef CONFIG_X86_MDFLD
 #include <linux/intel_mid_pm.h>
 #endif

diff --git a/drivers/idle/mrst_s0i3.c b/drivers/idle/mrst_s0i3.c
index 3df063d..864a716 100644 (file)
--- a/drivers/idle/mrst_s0i3.c
+++ b/drivers/idle/mrst_s0i3.c
@@ -37,7 +37,7 @@
 #include <asm/msr.h>
 #include <asm/mtrr.h>
 #include <asm/mwait.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 
 void do_s0i3(void);
 static u64 *wakeup_ptr;

diff --git a/drivers/media/video/atomisp/atomisp_common.h b/drivers/media/video/atomisp/atomisp_common.h
index 6db77ad..e54847f 100644 (file)
--- a/drivers/media/video/atomisp/atomisp_common.h
+++ b/drivers/media/video/atomisp/atomisp_common.h
@@ -52,7 +52,7 @@
 #include <linux/stddef.h>
 #include <linux/firmware.h>
 #include <asm/intel_scu_ipc.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>

diff --git a/drivers/pci/mid_pci.c b/drivers/pci/mid_pci.c
index 91d2b5e..9204d99 100644 (file)
--- a/drivers/pci/mid_pci.c
+++ b/drivers/pci/mid_pci.c
@@ -19,7 +19,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include "pci.h"
 
 static bool mid_pci_power_manageable(struct pci_dev *dev)

diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index c7e46cc..8636c0b 100644 (file)
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -27,7 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/debugfs.h>
 #include <linux/fs.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/intel_scu_ipc.h>
 #include <linux/pm_qos_params.h>
 #include <linux/intel_mid_pm.h>

diff --git a/drivers/platform/x86/intel_scu_ipcutil.c b/drivers/platform/x86/intel_scu_ipcutil.c
index e4ba36b..a798d8e 100644 (file)
--- a/drivers/platform/x86/intel_scu_ipcutil.c
+++ b/drivers/platform/x86/intel_scu_ipcutil.c
@@ -27,7 +27,7 @@
 #include <linux/miscdevice.h>
 #include <linux/io.h>
 #include <asm/intel_scu_ipc.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <linux/pm_runtime.h>
 
 #define MAX_FW_SIZE 264192

diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 6a77b97..0ffc169 100644 (file)
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -39,7 +39,7 @@
 
 #include <asm-generic/rtc.h>
 #include <asm/intel_scu_ipc.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/mrst-vrtc.h>
 
 struct mrst_rtc {

diff --git a/drivers/staging/gma500/mrst_lvds.c b/drivers/staging/gma500/mrst_lvds.c
index 419bf84..f170e6f 100644 (file)
--- a/drivers/staging/gma500/mrst_lvds.c
+++ b/drivers/staging/gma500/mrst_lvds.c
@@ -22,7 +22,7 @@
 
 #include <linux/i2c.h>
 #include <drm/drmP.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 
 #include "psb_intel_bios.h"
 #include "psb_drv.h"

diff --git a/drivers/staging/mrst/drv/mdfld_dsi_output.h b/drivers/staging/mrst/drv/mdfld_dsi_output.h
index e39973c..d989122 100644 (file)
--- a/drivers/staging/mrst/drv/mdfld_dsi_output.h
+++ b/drivers/staging/mrst/drv/mdfld_dsi_output.h
@@ -41,7 +41,7 @@
 #include "psb_powermgmt.h"
 #include "mdfld_output.h"
 
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 
 #define DRM_MODE_ENCODER_MIPI  5
 

diff --git a/drivers/staging/mrst/drv/psb_intel_dsi.c b/drivers/staging/mrst/drv/psb_intel_dsi.c
index 61585e2..8f44f13 100644 (file)
--- a/drivers/staging/mrst/drv/psb_intel_dsi.c
+++ b/drivers/staging/mrst/drv/psb_intel_dsi.c
@@ -29,7 +29,7 @@
 #else
        #include <asm/intel_scu_ipc.h>
 #endif
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <linux/pm_runtime.h>
 
 #include "psb_drv.h"

diff --git a/drivers/tty/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c
index d73aadd..b379716 100644 (file)
--- a/drivers/tty/serial/max3107-aava.c
+++ b/drivers/tty/serial/max3107-aava.c
@@ -36,7 +36,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/sfi.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include "max3107.h"
 
 /* GPIO direction to input function */

diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c
index 58bfed8..d8ad4d6 100644 (file)
--- a/drivers/tty/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
@@ -42,7 +42,7 @@
 #include <linux/debugfs.h>
 #include <linux/gpio.h>
 #include <linux/lnw_gpio.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/processor.h>
 #include <linux/pm_runtime.h>
 

diff --git a/drivers/usb/otg/penwell_otg.c b/drivers/usb/otg/penwell_otg.c
index 744fd6c..20a21ea 100644 (file)
--- a/drivers/usb/otg/penwell_otg.c
+++ b/drivers/usb/otg/penwell_otg.c
@@ -39,7 +39,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/wakelock.h>
 #include <asm/intel_scu_ipc.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include "../core/usb.h"
 
 #include <linux/usb/penwell_otg.h>

diff --git a/include/linux/intel_mid_pm.h b/include/linux/intel_mid_pm.h
index 58ddc08..791b6a0 100644 (file)
--- a/include/linux/intel_mid_pm.h
+++ b/include/linux/intel_mid_pm.h
@@ -21,7 +21,7 @@
 #ifndef INTEL_MID_PM_H
 #define INTEL_MID_PM_H
 
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 

diff --git a/sound/pci/sst/intel_sst.c b/sound/pci/sst/intel_sst.c
index 1b6712d..2d8fe19 100644 (file)
--- a/sound/pci/sst/intel_sst.c
+++ b/sound/pci/sst/intel_sst.c
@@ -38,7 +38,7 @@
 #include <linux/miscdevice.h>
 #include <linux/pm_runtime.h>
 #include <linux/async.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <asm/intel_scu_ipc.h>
 #include <sound/intel_sst.h>
 #include <sound/intel_sst_ioctl.h>

diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index 8cf6e37..393ed1c 100644 (file)
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -31,7 +31,7 @@
 #include <linux/gpio.h>
 #include <asm/intel_scu_ipc.h>
 #include <asm/intel_mid_gpadc.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>

diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c
index 2c01058..1e21447 100644 (file)
--- a/sound/soc/mid-x86/mfld_machine.c
+++ b/sound/soc/mid-x86/mfld_machine.c
@@ -31,7 +31,7 @@
 #include <linux/async.h>
 #include <linux/wakelock.h>
 #include <linux/gpio.h>
-#include <asm/mrst.h>
+#include <asm/intel-mid.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>