redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

intel_mid: Renamed *mrst* to *intel_mid* 

Following files contains code that is common to all intel mid
soc's. So renamed them as below.

mrst/mrst.c              -> intel-mid/intel-mid.c
mrst/vrtc.c              -> intel-mid/intel_mid_vrtc.c
mrst/early_printk_mrst.c -> intel-mid/intel_mid_vrtc.c
pci/mrst.c               -> pci/intel_mid_pci.c

Also, renamed the corresponding header files and made changes
to the driver files that included these header files.

To ensure that there are no functional changes, I have compared
the objdump of renamed files before and after rename and found
that the only difference is file name change.

Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Link: http://lkml.kernel.org/r/1382049336-21316-4-git-send-email-david.a.cohen@linux.intel.com
Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
hifive-unleashed-5.1
Kuppuswamy Sathyanarayanan 2013-10-17 15:35:27 -07:00 committed by H. Peter Anvin
parent d8059302b3
commit 05454c26eb
19 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/include/asm/mrst.h → arch/x86/include/asm/intel-mid.h
View File

@ -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>
@ -78,4 +78,4 @@ extern void intel_scu_devices_destroy(void);
extern void mrst_rtc_init(void);
#endif /* _ASM_X86_MRST_H */
#endif /* _ASM_X86_INTEL_MID_H */

4
arch/x86/include/asm/mrst-vrtc.h → arch/x86/include/asm/intel_mid_vrtc.h
View File

@ -1,5 +1,5 @@
#ifndef _MRST_VRTC_H
#define _MRST_VRTC_H
#ifndef _INTEL_MID_VRTC_H
#define _INTEL_MID_VRTC_H
extern unsigned char vrtc_cmos_read(unsigned char reg);
extern void vrtc_cmos_write(unsigned char val, unsigned char reg);

2
arch/x86/kernel/apb_timer.c
View File

@ -40,7 +40,7 @@
#include <asm/fixmap.h>
#include <asm/apb_timer.h>
#include <asm/mrst.h>
#include <asm/intel-mid.h>
#include <asm/time.h>
#define APBT_CLOCKEVENT_RATING 110

2
arch/x86/kernel/early_printk.c
View File

@ -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>

2
arch/x86/kernel/rtc.c
View File

@ -12,7 +12,7 @@
#include <asm/vsyscall.h>
#include <asm/x86_init.h>
#include <asm/time.h>
#include <asm/mrst.h>
#include <asm/intel-mid.h>
#include <asm/rtc.h>
#ifdef CONFIG_X86_32

2
arch/x86/pci/Makefile
View File

@ -18,7 +18,7 @@ obj-$(CONFIG_X86_VISWS) += visws.o
obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
obj-$(CONFIG_X86_NUMACHIP) += numachip.o
obj-$(CONFIG_X86_INTEL_MID) += mrst.o
obj-$(CONFIG_X86_INTEL_MID) += intel_mid_pci.o
obj-y += common.o early.o
obj-y += bus_numa.o

2
arch/x86/pci/mrst.c → arch/x86/pci/intel_mid_pci.c
View File

@ -1,5 +1,5 @@
/*
* Moorestown PCI support
* Intel MID PCI support
* Copyright (c) 2008 Intel Corporation
* Jesse Barnes <jesse.barnes@intel.com>
*

2
arch/x86/platform/Makefile
View File

@ -4,7 +4,7 @@ obj-y += efi/
obj-y += geode/
obj-y += goldfish/
obj-y += iris/
obj-y += mrst/
obj-y += intel-mid/
obj-y += olpc/
obj-y += scx200/
obj-y += sfi/

3
arch/x86/platform/intel-mid/Makefile 100644
View File

@ -0,0 +1,3 @@
obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o
obj-$(CONFIG_X86_INTEL_MID) += intel_mid_vrtc.o
obj-$(CONFIG_EARLY_PRINTK_INTEL_MID) += early_printk_intel_mid.o

4
arch/x86/platform/mrst/early_printk_mrst.c → arch/x86/platform/intel-mid/early_printk_intel_mid.c
View File

@ -1,5 +1,5 @@
/*
* early_printk_mrst.c - early consoles for Intel MID platforms
* early_printk_intel_mid.c - early consoles for Intel MID platforms
*
* Copyright (c) 2008-2010, Intel Corporation
*
@ -27,7 +27,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

11
arch/x86/platform/mrst/mrst.c → arch/x86/platform/intel-mid/intel-mid.c
View File

@ -1,8 +1,9 @@
/*
* mrst.c: Intel Moorestown platform specific setup code
* intel-mid.c: Intel MID platform setup code
*
* (C) Copyright 2008 Intel Corporation
* (C) Copyright 2008, 2012 Intel Corporation
* Author: Jacob Pan (jacob.jun.pan@intel.com)
* Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -36,8 +37,8 @@
#include <asm/hw_irq.h>
#include <asm/apic.h>
#include <asm/io_apic.h>
#include <asm/mrst.h>
#include <asm/mrst-vrtc.h>
#include <asm/intel-mid.h>
#include <asm/intel_mid_vrtc.h>
#include <asm/io.h>
#include <asm/i8259.h>
#include <asm/intel_scu_ipc.h>
@ -219,7 +220,7 @@ static unsigned long __init mrst_calibrate_tsc(void)
lapic_timer_frequency = fsb * 1000 / HZ;
/* mark tsc clocksource as reliable */
set_cpu_cap(&boot_cpu_data, X86_FEATURE_TSC_RELIABLE);
if (fast_calibrate)
return fast_calibrate;

6
arch/x86/platform/mrst/vrtc.c → arch/x86/platform/intel-mid/intel_mid_vrtc.c
View File

@ -1,5 +1,5 @@
/*
* vrtc.c: Driver for virtual RTC device on Intel MID platform
* intel_mid_vrtc.c: Driver for virtual RTC device on Intel MID platform
*
* (C) Copyright 2009 Intel Corporation
*
@ -23,8 +23,8 @@
#include <linux/sfi.h>
#include <linux/platform_device.h>
#include <asm/mrst.h>
#include <asm/mrst-vrtc.h>
#include <asm/intel-mid.h>
#include <asm/intel_mid_vrtc.h>
#include <asm/time.h>
#include <asm/fixmap.h>

3
arch/x86/platform/mrst/Makefile
View File

@ -1,3 +0,0 @@
obj-$(CONFIG_X86_INTEL_MID) += mrst.o
obj-$(CONFIG_X86_INTEL_MID) += vrtc.o
obj-$(CONFIG_EARLY_PRINTK_INTEL_MID) += early_printk_mrst.o

2
drivers/gpu/drm/gma500/mdfld_dsi_output.h
View File

@ -39,7 +39,7 @@
#include "psb_intel_reg.h"
#include "mdfld_output.h"
#include <asm/mrst.h>
#include <asm/intel-mid.h>
#define FLD_MASK(start, end) (((1 << ((start) - (end) + 1)) - 1) << (end))
#define FLD_VAL(val, start, end) (((val) << (end)) & FLD_MASK(start, end))

2
drivers/gpu/drm/gma500/oaktrail_device.c
View File

@ -26,7 +26,7 @@
#include "psb_drv.h"
#include "psb_reg.h"
#include "psb_intel_reg.h"
#include <asm/mrst.h>
#include <asm/intel-mid.h>
#include <asm/intel_scu_ipc.h>
#include "mid_bios.h"
#include "intel_bios.h"

2
drivers/gpu/drm/gma500/oaktrail_lvds.c
View File

@ -22,7 +22,7 @@
#include <linux/i2c.h>
#include <drm/drmP.h>
#include <asm/mrst.h>
#include <asm/intel-mid.h>
#include "intel_bios.h"
#include "psb_drv.h"

2
drivers/platform/x86/intel_scu_ipc.c
View File

@ -25,7 +25,7 @@
#include <linux/interrupt.h>
#include <linux/sfi.h>
#include <linux/module.h>
#include <asm/mrst.h>
#include <asm/intel-mid.h>
#include <asm/intel_scu_ipc.h>
/* IPC defines the following message types */

4
drivers/rtc/rtc-mrst.c
View File

@ -38,8 +38,8 @@
#include <asm-generic/rtc.h>
#include <asm/intel_scu_ipc.h>
#include <asm/mrst.h>
#include <asm/mrst-vrtc.h>
#include <asm/intel-mid.h>
#include <asm/intel_mid_vrtc.h>
struct mrst_rtc {
struct rtc_device *rtc;

2
drivers/watchdog/intel_scu_watchdog.c
View File

@ -48,7 +48,7 @@
#include <linux/atomic.h>
#include <asm/intel_scu_ipc.h>
#include <asm/apb_timer.h>
#include <asm/mrst.h>
#include <asm/intel-mid.h>
#include "intel_scu_watchdog.h"