forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

intel_mid: Renamed *mrst* to *intel_mid*

Browse source 
mrst is used as common name to represent all intel_mid type
soc's. But moorsetwon is just one of the intel_mid soc. So
renamed them to use intel_mid.

This patch mainly renames the variables and related
functions that uses *mrst* prefix with *intel_mid*.

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

Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Link: http://lkml.kernel.org/r/1382049336-21316-6-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>
This commit is contained in:
Kuppuswamy Sathyanarayanan 2013-10-17 15:35:29 -07:00 • committed by H. Peter Anvin
commit 712b6aa873
13 changed files with 93 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Documentation/kernel-parameters.txt
View file

@ -3471,11 +3471,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
default x2apic cluster mode on platforms default x2apic cluster mode on platforms
supporting x2apic. supporting x2apic.
x86_mrst_timer= [X86-32,APBT] x86_intel_mid_timer= [X86-32,APBT]
Choose timer option for x86 Moorestown MID platform. Choose timer option for x86 Intel MID platform.
Two valid options are apbt timer only and lapic timer Two valid options are apbt timer only and lapic timer
plus one apbt timer for broadcast timer. plus one apbt timer for broadcast timer.
x86_mrst_timer=apbt_only | lapic_and_apbt x86_intel_mid_timer=apbt_only | lapic_and_apbt
xen_emul_unplug= [HW,X86,XEN] xen_emul_unplug= [HW,X86,XEN]
Unplug Xen emulated devices Unplug Xen emulated devices

26
arch/x86/include/asm/intel-mid.h
View file

@ -13,7 +13,7 @@
#include <linux/sfi.h> #include <linux/sfi.h>
extern int pci_mrst_init(void); extern int intel_mid_pci_init(void);
extern int __init sfi_parse_mrtc(struct sfi_table_header *table); extern int __init sfi_parse_mrtc(struct sfi_table_header *table);
extern int sfi_mrtc_num; extern int sfi_mrtc_num;
extern struct sfi_rtc_table_entry sfi_mrtc_array[]; extern struct sfi_rtc_table_entry sfi_mrtc_array[];
@ -25,33 +25,33 @@ extern struct sfi_rtc_table_entry sfi_mrtc_array[];
* we treat Medfield/Penwell as a variant of Moorestown. Penwell can be * we treat Medfield/Penwell as a variant of Moorestown. Penwell can be
* identified via MSRs. * identified via MSRs.
*/ */
enum mrst_cpu_type { enum intel_mid_cpu_type {
/* 1 was Moorestown */ /* 1 was Moorestown */
MRST_CPU_CHIP_PENWELL = 2, INTEL_MID_CPU_CHIP_PENWELL = 2,
}; };
extern enum mrst_cpu_type __mrst_cpu_chip; extern enum intel_mid_cpu_type __intel_mid_cpu_chip;
#ifdef CONFIG_X86_INTEL_MID #ifdef CONFIG_X86_INTEL_MID
static inline enum mrst_cpu_type mrst_identify_cpu(void) static inline enum intel_mid_cpu_type intel_mid_identify_cpu(void)
{ {
return __mrst_cpu_chip; return __intel_mid_cpu_chip;
} }
#else /* !CONFIG_X86_INTEL_MID */ #else /* !CONFIG_X86_INTEL_MID */
#define mrst_identify_cpu() (0) #define intel_mid_identify_cpu() (0)
#endif /* !CONFIG_X86_INTEL_MID */ #endif /* !CONFIG_X86_INTEL_MID */
enum mrst_timer_options { enum intel_mid_timer_options {
MRST_TIMER_DEFAULT, INTEL_MID_TIMER_DEFAULT,
MRST_TIMER_APBT_ONLY, INTEL_MID_TIMER_APBT_ONLY,
MRST_TIMER_LAPIC_APBT, INTEL_MID_TIMER_LAPIC_APBT,
}; };
extern enum mrst_timer_options mrst_timer_options; extern enum intel_mid_timer_options intel_mid_timer_options;
/* /*
* Penwell uses spread spectrum clock, so the freq number is not exactly * Penwell uses spread spectrum clock, so the freq number is not exactly
@ -76,6 +76,6 @@ extern void intel_scu_devices_destroy(void);
#define MRST_VRTC_MAP_SZ (1024) #define MRST_VRTC_MAP_SZ (1024)
/*#define MRST_VRTC_PGOFFSET (0xc00) */ /*#define MRST_VRTC_PGOFFSET (0xc00) */
extern void mrst_rtc_init(void); extern void intel_mid_rtc_init(void);
#endif /* _ASM_X86_INTEL_MID_H */ #endif /* _ASM_X86_INTEL_MID_H */

4
arch/x86/include/asm/setup.h
View file

@ -51,9 +51,9 @@ extern void i386_reserve_resources(void);
extern void setup_default_timer_irq(void); extern void setup_default_timer_irq(void);
#ifdef CONFIG_X86_INTEL_MID #ifdef CONFIG_X86_INTEL_MID
extern void x86_mrst_early_setup(void); extern void x86_intel_mid_early_setup(void);
#else #else
static inline void x86_mrst_early_setup(void) { } static inline void x86_intel_mid_early_setup(void) { }
#endif #endif
#ifdef CONFIG_X86_INTEL_CE #ifdef CONFIG_X86_INTEL_CE

2
arch/x86/include/uapi/asm/bootparam.h
View file

@ -158,7 +158,7 @@ enum {
X86_SUBARCH_PC = 0, X86_SUBARCH_PC = 0,
X86_SUBARCH_LGUEST, X86_SUBARCH_LGUEST,
X86_SUBARCH_XEN, X86_SUBARCH_XEN,
X86_SUBARCH_MRST, X86_SUBARCH_INTEL_MID,
X86_SUBARCH_CE4100, X86_SUBARCH_CE4100,
X86_NR_SUBARCHS, X86_NR_SUBARCHS,
}; };

8
arch/x86/kernel/apb_timer.c
View file

@ -157,13 +157,13 @@ static int __init apbt_clockevent_register(void)
adev->num = smp_processor_id(); adev->num = smp_processor_id();
adev->timer = dw_apb_clockevent_init(smp_processor_id(), "apbt0", adev->timer = dw_apb_clockevent_init(smp_processor_id(), "apbt0",
mrst_timer_options == MRST_TIMER_LAPIC_APBT ? intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT ?
APBT_CLOCKEVENT_RATING - 100 : APBT_CLOCKEVENT_RATING, APBT_CLOCKEVENT_RATING - 100 : APBT_CLOCKEVENT_RATING,
adev_virt_addr(adev), 0, apbt_freq); adev_virt_addr(adev), 0, apbt_freq);
/* Firmware does EOI handling for us. */ /* Firmware does EOI handling for us. */
adev->timer->eoi = NULL; adev->timer->eoi = NULL;
if (mrst_timer_options == MRST_TIMER_LAPIC_APBT) { if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT) {
global_clock_event = &adev->timer->ced; global_clock_event = &adev->timer->ced;
printk(KERN_DEBUG "%s clockevent registered as global\n", printk(KERN_DEBUG "%s clockevent registered as global\n",
global_clock_event->name); global_clock_event->name);
@ -253,7 +253,7 @@ static int apbt_cpuhp_notify(struct notifier_block *n,
static __init int apbt_late_init(void) static __init int apbt_late_init(void)
{ {
if (mrst_timer_options == MRST_TIMER_LAPIC_APBT || if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT ||
!apb_timer_block_enabled) !apb_timer_block_enabled)
return 0; return 0;
/* This notifier should be called after workqueue is ready */ /* This notifier should be called after workqueue is ready */
@ -340,7 +340,7 @@ void __init apbt_time_init(void)
} }
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* kernel cmdline disable apb timer, so we will use lapic timers */ /* kernel cmdline disable apb timer, so we will use lapic timers */
if (mrst_timer_options == MRST_TIMER_LAPIC_APBT) { if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT) {
printk(KERN_INFO "apbt: disabled per cpu timer\n"); printk(KERN_INFO "apbt: disabled per cpu timer\n");
return; return;
} }

4
arch/x86/kernel/head32.c
View file

@ -35,8 +35,8 @@ asmlinkage void __init i386_start_kernel(void)
/* Call the subarch specific early setup function */ /* Call the subarch specific early setup function */
switch (boot_params.hdr.hardware_subarch) { switch (boot_params.hdr.hardware_subarch) {
case X86_SUBARCH_MRST: case X86_SUBARCH_INTEL_MID:
x86_mrst_early_setup(); x86_intel_mid_early_setup();
break; break;
case X86_SUBARCH_CE4100: case X86_SUBARCH_CE4100:
x86_ce4100_early_setup(); x86_ce4100_early_setup();

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

@ -189,7 +189,7 @@ static __init int add_rtc_cmos(void)
return 0; return 0;
/* Intel MID platforms don't have ioport rtc */ /* Intel MID platforms don't have ioport rtc */
if (mrst_identify_cpu()) if (intel_mid_identify_cpu())
return -ENODEV; return -ENODEV;
platform_device_register(&rtc_device); platform_device_register(&rtc_device);

12
arch/x86/pci/intel_mid_pci.c
View file

@ -205,7 +205,7 @@ static int pci_write(struct pci_bus *bus, unsigned int devfn, int where,
where, size, value); where, size, value);
} }
static int mrst_pci_irq_enable(struct pci_dev *dev) static int intel_mid_pci_irq_enable(struct pci_dev *dev)
{ {
u8 pin; u8 pin;
struct io_apic_irq_attr irq_attr; struct io_apic_irq_attr irq_attr;
@ -225,23 +225,23 @@ static int mrst_pci_irq_enable(struct pci_dev *dev)
return 0; return 0;
} }
struct pci_ops pci_mrst_ops = { struct pci_ops intel_mid_pci_ops = {
.read = pci_read, .read = pci_read,
.write = pci_write, .write = pci_write,
}; };
/** /**
* pci_mrst_init - installs pci_mrst_ops * intel_mid_pci_init - installs intel_mid_pci_ops
* *
* Moorestown has an interesting PCI implementation (see above). * Moorestown has an interesting PCI implementation (see above).
* Called when the early platform detection installs it. * Called when the early platform detection installs it.
*/ */
int __init pci_mrst_init(void) int __init intel_mid_pci_init(void)
{ {
pr_info("Intel MID platform detected, using MID PCI ops\n"); pr_info("Intel MID platform detected, using MID PCI ops\n");
pci_mmcfg_late_init(); pci_mmcfg_late_init();
pcibios_enable_irq = mrst_pci_irq_enable; pcibios_enable_irq = intel_mid_pci_irq_enable;
pci_root_ops = pci_mrst_ops; pci_root_ops = intel_mid_pci_ops;
pci_soc_mode = 1; pci_soc_mode = 1;
/* Continue with standard init */ /* Continue with standard init */
return 1; return 1;

2
arch/x86/platform/intel-mid/early_printk_intel_mid.c
View file

@ -152,7 +152,7 @@ void mrst_early_console_init(void)
spi0_cdiv = ((*pclk_spi0) & 0xe00) >> 9; spi0_cdiv = ((*pclk_spi0) & 0xe00) >> 9;
freq = 100000000 / (spi0_cdiv + 1); freq = 100000000 / (spi0_cdiv + 1);
if (mrst_identify_cpu() == MRST_CPU_CHIP_PENWELL) if (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_PENWELL)
mrst_spi_paddr = MRST_REGBASE_SPI1; mrst_spi_paddr = MRST_REGBASE_SPI1;
pspi = (void *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE, pspi = (void *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE,

109
arch/x86/platform/intel-mid/intel-mid.c
View file

@ -11,7 +11,7 @@
* of the License. * of the License.
*/ */
#define pr_fmt(fmt) "mrst: " fmt #define pr_fmt(fmt) "intel_mid: " fmt
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -47,7 +47,7 @@
/* /*
* the clockevent devices on Moorestown/Medfield can be APBT or LAPIC clock, * the clockevent devices on Moorestown/Medfield can be APBT or LAPIC clock,
* cmdline option x86_mrst_timer can be used to override the configuration * cmdline option x86_intel_mid_timer can be used to override the configuration
* to prefer one or the other. * to prefer one or the other.
* at runtime, there are basically three timer configurations: * at runtime, there are basically three timer configurations:
* 1. per cpu apbt clock only * 1. per cpu apbt clock only
@ -66,12 +66,12 @@
* lapic (always-on,ARAT) ------ 150 * lapic (always-on,ARAT) ------ 150
*/ */
enum mrst_timer_options mrst_timer_options; enum intel_mid_timer_options intel_mid_timer_options;
static u32 sfi_mtimer_usage[SFI_MTMR_MAX_NUM]; static u32 sfi_mtimer_usage[SFI_MTMR_MAX_NUM];
static struct sfi_timer_table_entry sfi_mtimer_array[SFI_MTMR_MAX_NUM]; static struct sfi_timer_table_entry sfi_mtimer_array[SFI_MTMR_MAX_NUM];
enum mrst_cpu_type __mrst_cpu_chip; enum intel_mid_cpu_type __intel_mid_cpu_chip;
EXPORT_SYMBOL_GPL(__mrst_cpu_chip); EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
int sfi_mtimer_num; int sfi_mtimer_num;
@ -79,11 +79,11 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
EXPORT_SYMBOL_GPL(sfi_mrtc_array); EXPORT_SYMBOL_GPL(sfi_mrtc_array);
int sfi_mrtc_num; int sfi_mrtc_num;
static void mrst_power_off(void) static void intel_mid_power_off(void)
{ {
} }
static void mrst_reboot(void) static void intel_mid_reboot(void)
{ {
intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0); intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
} }
@ -196,7 +196,7 @@ int __init sfi_parse_mrtc(struct sfi_table_header *table)
return 0; return 0;
} }
static unsigned long __init mrst_calibrate_tsc(void) static unsigned long __init intel_mid_calibrate_tsc(void)
{ {
unsigned long fast_calibrate; unsigned long fast_calibrate;
u32 lo, hi, ratio, fsb; u32 lo, hi, ratio, fsb;
@ -227,13 +227,13 @@ static unsigned long __init mrst_calibrate_tsc(void)
return 0; return 0;
} }
static void __init mrst_time_init(void) static void __init intel_mid_time_init(void)
{ {
sfi_table_parse(SFI_SIG_MTMR, NULL, NULL, sfi_parse_mtmr); sfi_table_parse(SFI_SIG_MTMR, NULL, NULL, sfi_parse_mtmr);
switch (mrst_timer_options) { switch (intel_mid_timer_options) {
case MRST_TIMER_APBT_ONLY: case INTEL_MID_TIMER_APBT_ONLY:
break; break;
case MRST_TIMER_LAPIC_APBT: case INTEL_MID_TIMER_LAPIC_APBT:
x86_init.timers.setup_percpu_clockev = setup_boot_APIC_clock; x86_init.timers.setup_percpu_clockev = setup_boot_APIC_clock;
x86_cpuinit.setup_percpu_clockev = setup_secondary_APIC_clock; x86_cpuinit.setup_percpu_clockev = setup_secondary_APIC_clock;
break; break;
@ -249,19 +249,19 @@ static void __init mrst_time_init(void)
apbt_time_init(); apbt_time_init();
} }
static void mrst_arch_setup(void) static void __cpuinit intel_mid_arch_setup(void)
{ {
if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x27) if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x27)
__mrst_cpu_chip = MRST_CPU_CHIP_PENWELL; __intel_mid_cpu_chip = INTEL_MID_CPU_CHIP_PENWELL;
else { else {
pr_err("Unknown Intel MID CPU (%d:%d), default to Penwell\n", pr_err("Unknown Intel MID CPU (%d:%d), default to Penwell\n",
boot_cpu_data.x86, boot_cpu_data.x86_model); boot_cpu_data.x86, boot_cpu_data.x86_model);
__mrst_cpu_chip = MRST_CPU_CHIP_PENWELL; __intel_mid_cpu_chip = INTEL_MID_CPU_CHIP_PENWELL;
} }
} }
/* MID systems don't have i8042 controller */ /* MID systems don't have i8042 controller */
static int mrst_i8042_detect(void) static int intel_mid_i8042_detect(void)
{ {
return 0; return 0;
} }
@ -272,7 +272,7 @@ static int mrst_i8042_detect(void)
* watchdog or lock debug. Reading io port 0x61 results in 0xff which * watchdog or lock debug. Reading io port 0x61 results in 0xff which
* misled NMI handler. * misled NMI handler.
*/ */
static unsigned char mrst_get_nmi_reason(void) static unsigned char intel_mid_get_nmi_reason(void)
{ {
return 0; return 0;
} }
@ -281,33 +281,32 @@ static unsigned char mrst_get_nmi_reason(void)
* Moorestown specific x86_init function overrides and early setup * Moorestown specific x86_init function overrides and early setup
* calls. * calls.
*/ */
void __init x86_mrst_early_setup(void) void __init x86_intel_mid_early_setup(void)
{ {
x86_init.resources.probe_roms = x86_init_noop; x86_init.resources.probe_roms = x86_init_noop;
x86_init.resources.reserve_resources = x86_init_noop; x86_init.resources.reserve_resources = x86_init_noop;
x86_init.timers.timer_init = mrst_time_init; x86_init.timers.timer_init = intel_mid_time_init;
x86_init.timers.setup_percpu_clockev = x86_init_noop; x86_init.timers.setup_percpu_clockev = x86_init_noop;
x86_init.irqs.pre_vector_init = x86_init_noop; x86_init.irqs.pre_vector_init = x86_init_noop;
x86_init.oem.arch_setup = mrst_arch_setup; x86_init.oem.arch_setup = intel_mid_arch_setup;
x86_cpuinit.setup_percpu_clockev = apbt_setup_secondary_clock; x86_cpuinit.setup_percpu_clockev = apbt_setup_secondary_clock;
x86_platform.calibrate_tsc = mrst_calibrate_tsc; x86_platform.calibrate_tsc = intel_mid_calibrate_tsc;
x86_platform.i8042_detect = mrst_i8042_detect; x86_platform.i8042_detect = intel_mid_i8042_detect;
x86_init.timers.wallclock_init = mrst_rtc_init; x86_init.timers.wallclock_init = intel_mid_rtc_init;
x86_platform.get_nmi_reason = mrst_get_nmi_reason; x86_platform.get_nmi_reason = intel_mid_get_nmi_reason;
x86_init.pci.init = pci_mrst_init; x86_init.pci.init = intel_mid_pci_init;
x86_init.pci.fixup_irqs = x86_init_noop; x86_init.pci.fixup_irqs = x86_init_noop;
legacy_pic = &null_legacy_pic; legacy_pic = &null_legacy_pic;
/* Moorestown specific power_off/restart method */ pm_power_off = intel_mid_power_off;
pm_power_off = mrst_power_off; machine_ops.emergency_restart = intel_mid_reboot;
machine_ops.emergency_restart = mrst_reboot;
/* Avoid searching for BIOS MP tables */ /* Avoid searching for BIOS MP tables */
x86_init.mpparse.find_smp_config = x86_init_noop; x86_init.mpparse.find_smp_config = x86_init_noop;
@ -319,24 +318,24 @@ void __init x86_mrst_early_setup(void)
* if user does not want to use per CPU apb timer, just give it a lower rating * if user does not want to use per CPU apb timer, just give it a lower rating
* than local apic timer and skip the late per cpu timer init. * than local apic timer and skip the late per cpu timer init.
*/ */
static inline int __init setup_x86_mrst_timer(char *arg) static inline int __init setup_x86_intel_mid_timer(char *arg)
{ {
if (!arg) if (!arg)
return -EINVAL; return -EINVAL;
if (strcmp("apbt_only", arg) == 0) if (strcmp("apbt_only", arg) == 0)
mrst_timer_options = MRST_TIMER_APBT_ONLY; intel_mid_timer_options = INTEL_MID_TIMER_APBT_ONLY;
else if (strcmp("lapic_and_apbt", arg) == 0) else if (strcmp("lapic_and_apbt", arg) == 0)
mrst_timer_options = MRST_TIMER_LAPIC_APBT; intel_mid_timer_options = INTEL_MID_TIMER_LAPIC_APBT;
else { else {
pr_warn("X86 MRST timer option %s not recognised" pr_warn("X86 INTEL_MID timer option %s not recognised"
" use x86_mrst_timer=apbt_only or lapic_and_apbt\n", " use x86_intel_mid_timer=apbt_only or lapic_and_apbt\n",
arg); arg);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
} }
__setup("x86_mrst_timer=", setup_x86_mrst_timer); __setup("x86_intel_mid_timer=", setup_x86_intel_mid_timer);
/* /*
* Parsing GPIO table first, since the DEVS table will need this table * Parsing GPIO table first, since the DEVS table will need this table
@ -400,7 +399,7 @@ struct devs_id {
}; };
/* the offset for the mapping of global gpio pin to irq */ /* the offset for the mapping of global gpio pin to irq */
#define MRST_IRQ_OFFSET 0x100 #define INTEL_MID_IRQ_OFFSET 0x100
static void __init *pmic_gpio_platform_data(void *info) static void __init *pmic_gpio_platform_data(void *info)
{ {
@ -410,7 +409,7 @@ static void __init *pmic_gpio_platform_data(void *info)
if (gpio_base == -1) if (gpio_base == -1)
gpio_base = 64; gpio_base = 64;
pmic_gpio_pdata.gpio_base = gpio_base; pmic_gpio_pdata.gpio_base = gpio_base;
pmic_gpio_pdata.irq_base = gpio_base + MRST_IRQ_OFFSET; pmic_gpio_pdata.irq_base = gpio_base + INTEL_MID_IRQ_OFFSET;
pmic_gpio_pdata.gpiointr = 0xffffeff8; pmic_gpio_pdata.gpiointr = 0xffffeff8;
return &pmic_gpio_pdata; return &pmic_gpio_pdata;
@ -424,7 +423,7 @@ static void __init *max3111_platform_data(void *info)
spi_info->mode = SPI_MODE_0; spi_info->mode = SPI_MODE_0;
if (intr == -1) if (intr == -1)
return NULL; return NULL;
spi_info->irq = intr + MRST_IRQ_OFFSET; spi_info->irq = intr + INTEL_MID_IRQ_OFFSET;
return NULL; return NULL;
} }
@ -464,8 +463,8 @@ static void __init *max7315_platform_data(void *info)
return NULL; return NULL;
max7315->gpio_base = gpio_base; max7315->gpio_base = gpio_base;
if (intr != -1) { if (intr != -1) {
i2c_info->irq = intr + MRST_IRQ_OFFSET; i2c_info->irq = intr + INTEL_MID_IRQ_OFFSET;
max7315->irq_base = gpio_base + MRST_IRQ_OFFSET; max7315->irq_base = gpio_base + INTEL_MID_IRQ_OFFSET;
} else { } else {
i2c_info->irq = -1; i2c_info->irq = -1;
max7315->irq_base = -1; max7315->irq_base = -1;
@ -492,8 +491,8 @@ static void *tca6416_platform_data(void *info)
return NULL; return NULL;
tca6416.gpio_base = gpio_base; tca6416.gpio_base = gpio_base;
if (intr != -1) { if (intr != -1) {
i2c_info->irq = intr + MRST_IRQ_OFFSET; i2c_info->irq = intr + INTEL_MID_IRQ_OFFSET;
tca6416.irq_base = gpio_base + MRST_IRQ_OFFSET; tca6416.irq_base = gpio_base + INTEL_MID_IRQ_OFFSET;
} else { } else {
i2c_info->irq = -1; i2c_info->irq = -1;
tca6416.irq_base = -1; tca6416.irq_base = -1;
@ -509,7 +508,7 @@ static void *mpu3050_platform_data(void *info)
if (intr == -1) if (intr == -1)
return NULL; return NULL;
i2c_info->irq = intr + MRST_IRQ_OFFSET; i2c_info->irq = intr + INTEL_MID_IRQ_OFFSET;
return NULL; return NULL;
} }
@ -523,8 +522,8 @@ static void __init *emc1403_platform_data(void *info)
if (intr == -1 || intr2nd == -1) if (intr == -1 || intr2nd == -1)
return NULL; return NULL;
i2c_info->irq = intr + MRST_IRQ_OFFSET; i2c_info->irq = intr + INTEL_MID_IRQ_OFFSET;
intr2nd_pdata = intr2nd + MRST_IRQ_OFFSET; intr2nd_pdata = intr2nd + INTEL_MID_IRQ_OFFSET;
return &intr2nd_pdata; return &intr2nd_pdata;
} }
@ -539,8 +538,8 @@ static void __init *lis331dl_platform_data(void *info)
if (intr == -1 || intr2nd == -1) if (intr == -1 || intr2nd == -1)
return NULL; return NULL;
i2c_info->irq = intr + MRST_IRQ_OFFSET; i2c_info->irq = intr + INTEL_MID_IRQ_OFFSET;
intr2nd_pdata = intr2nd + MRST_IRQ_OFFSET; intr2nd_pdata = intr2nd + INTEL_MID_IRQ_OFFSET;
return &intr2nd_pdata; return &intr2nd_pdata;
} }
@ -570,9 +569,9 @@ static struct platform_device msic_device = {
.resource = msic_resources, .resource = msic_resources,
}; };
static inline bool mrst_has_msic(void) static inline bool intel_mid_has_msic(void)
{ {
return mrst_identify_cpu() == MRST_CPU_CHIP_PENWELL; return intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_PENWELL;
} }
static int msic_scu_status_change(struct notifier_block *nb, static int msic_scu_status_change(struct notifier_block *nb,
@ -596,7 +595,7 @@ static int __init msic_init(void)
* We need to be sure that the SCU IPC is ready before MSIC device * We need to be sure that the SCU IPC is ready before MSIC device
* can be registered. * can be registered.
*/ */
if (mrst_has_msic()) if (intel_mid_has_msic())
intel_scu_notifier_add(&msic_scu_notifier); intel_scu_notifier_add(&msic_scu_notifier);
return 0; return 0;
@ -851,7 +850,7 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *entry)
* On Medfield the platform device creation is handled by the MSIC * On Medfield the platform device creation is handled by the MSIC
* MFD driver so we don't need to do it here. * MFD driver so we don't need to do it here.
*/ */
if (mrst_has_msic()) if (intel_mid_has_msic())
return; return;
pdev = platform_device_alloc(entry->name, 0); pdev = platform_device_alloc(entry->name, 0);
@ -984,13 +983,13 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)
return 0; return 0;
} }
static int __init mrst_platform_init(void) static int __init intel_mid_platform_init(void)
{ {
sfi_table_parse(SFI_SIG_GPIO, NULL, NULL, sfi_parse_gpio); sfi_table_parse(SFI_SIG_GPIO, NULL, NULL, sfi_parse_gpio);
sfi_table_parse(SFI_SIG_DEVS, NULL, NULL, sfi_parse_devs); sfi_table_parse(SFI_SIG_DEVS, NULL, NULL, sfi_parse_devs);
return 0; return 0;
} }
arch_initcall(mrst_platform_init); arch_initcall(intel_mid_platform_init);
/* /*
* we will search these buttons in SFI GPIO table (by name) * we will search these buttons in SFI GPIO table (by name)
@ -1010,7 +1009,7 @@ static struct gpio_keys_button gpio_button[] = {
{SW_KEYPAD_SLIDE, -1, 1, "MagSw2", EV_SW, 0, 20}, {SW_KEYPAD_SLIDE, -1, 1, "MagSw2", EV_SW, 0, 20},
}; };
static struct gpio_keys_platform_data mrst_gpio_keys = { static struct gpio_keys_platform_data intel_mid_gpio_keys = {
.buttons = gpio_button, .buttons = gpio_button,
.rep = 1, .rep = 1,
.nbuttons = -1, /* will fill it after search */ .nbuttons = -1, /* will fill it after search */
@ -1020,7 +1019,7 @@ static struct platform_device pb_device = {
.name = "gpio-keys", .name = "gpio-keys",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &mrst_gpio_keys, .platform_data = &intel_mid_gpio_keys,
}, },
}; };
@ -1047,7 +1046,7 @@ static int __init pb_keys_init(void)
} }
if (good) { if (good) {
mrst_gpio_keys.nbuttons = good; intel_mid_gpio_keys.nbuttons = good;
return platform_device_register(&pb_device); return platform_device_register(&pb_device);
} }
return 0; return 0;

8
arch/x86/platform/intel-mid/intel_mid_vrtc.c
View file

@ -116,7 +116,7 @@ int vrtc_set_mmss(const struct timespec *now)
return retval; return retval;
} }
void __init mrst_rtc_init(void) void __init intel_mid_rtc_init(void)
{ {
unsigned long vrtc_paddr; unsigned long vrtc_paddr;
@ -154,10 +154,10 @@ static struct platform_device vrtc_device = {
}; };
/* Register the RTC device if appropriate */ /* Register the RTC device if appropriate */
static int __init mrst_device_create(void) static int __init intel_mid_device_create(void)
{ {
/* No Moorestown, no device */ /* No Moorestown, no device */
if (!mrst_identify_cpu()) if (!intel_mid_identify_cpu())
return -ENODEV; return -ENODEV;
/* No timer, no device */ /* No timer, no device */
if (!sfi_mrtc_num) if (!sfi_mrtc_num)
@ -174,4 +174,4 @@ static int __init mrst_device_create(void)
return platform_device_register(&vrtc_device); return platform_device_register(&vrtc_device);
} }
module_init(mrst_device_create); module_init(intel_mid_device_create);

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

@ -579,7 +579,7 @@ static struct pci_driver ipc_driver = {
static int __init intel_scu_ipc_init(void) static int __init intel_scu_ipc_init(void)
{ {
platform = mrst_identify_cpu(); platform = intel_mid_identify_cpu();
if (platform == 0) if (platform == 0)
return -ENODEV; return -ENODEV;
return pci_register_driver(&ipc_driver); return pci_register_driver(&ipc_driver);

2
drivers/watchdog/intel_scu_watchdog.c
View file

@ -445,7 +445,7 @@ static int __init intel_scu_watchdog_init(void)
* *
* If it isn't an intel MID device then it doesn't have this watchdog * If it isn't an intel MID device then it doesn't have this watchdog
*/ */
if (!mrst_identify_cpu()) if (!intel_mid_identify_cpu())
return -ENODEV; return -ENODEV;
/* Check boot parameters to verify that their initial values */ /* Check boot parameters to verify that their initial values */