Commit c751e17b authored by Thomas Gleixner's avatar Thomas Gleixner

x86: Add CE4100 platform support

Add CE4100 platform support. CE4100 needs early setup like
moorestown.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDirk Brandewie <dirk.brandewie@gmail.com>
LKML-Reference: <94720fd7f5564a12ebf202cf2c4f4c0d619aab35.1289331834.git.dirk.brandewie@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6f207e9b
...@@ -600,6 +600,7 @@ Protocol: 2.07+ ...@@ -600,6 +600,7 @@ Protocol: 2.07+
0x00000001 lguest 0x00000001 lguest
0x00000002 Xen 0x00000002 Xen
0x00000003 Moorestown MID 0x00000003 Moorestown MID
0x00000004 CE4100 TV Platform
Field name: hardware_subarch_data Field name: hardware_subarch_data
Type: write (subarch-dependent) Type: write (subarch-dependent)
......
...@@ -377,6 +377,17 @@ config X86_ELAN ...@@ -377,6 +377,17 @@ config X86_ELAN
If unsure, choose "PC-compatible" instead. If unsure, choose "PC-compatible" instead.
config X86_INTEL_CE
bool "CE4100 TV platform"
depends on PCI
depends on PCI_GODIRECT
depends on X86_32
depends on X86_EXTENDED_PLATFORM
---help---
Select for the Intel CE media processor (CE4100) SOC.
This option compiles in support for the CE4100 SOC for settop
boxes and media devices.
config X86_MRST config X86_MRST
bool "Moorestown MID platform" bool "Moorestown MID platform"
depends on PCI depends on PCI
......
...@@ -124,6 +124,7 @@ enum { ...@@ -124,6 +124,7 @@ enum {
X86_SUBARCH_LGUEST, X86_SUBARCH_LGUEST,
X86_SUBARCH_XEN, X86_SUBARCH_XEN,
X86_SUBARCH_MRST, X86_SUBARCH_MRST,
X86_SUBARCH_CE4100,
X86_NR_SUBARCHS, X86_NR_SUBARCHS,
}; };
......
...@@ -53,6 +53,12 @@ extern void x86_mrst_early_setup(void); ...@@ -53,6 +53,12 @@ extern void x86_mrst_early_setup(void);
static inline void x86_mrst_early_setup(void) { } static inline void x86_mrst_early_setup(void) { }
#endif #endif
#ifdef CONFIG_X86_INTEL_CE
extern void x86_ce4100_early_setup(void);
#else
static inline void x86_ce4100_early_setup(void) { }
#endif
#ifndef _SETUP #ifndef _SETUP
/* /*
......
...@@ -61,6 +61,9 @@ void __init i386_start_kernel(void) ...@@ -61,6 +61,9 @@ void __init i386_start_kernel(void)
case X86_SUBARCH_MRST: case X86_SUBARCH_MRST:
x86_mrst_early_setup(); x86_mrst_early_setup();
break; break;
case X86_SUBARCH_CE4100:
x86_ce4100_early_setup();
break;
default: default:
i386_default_early_setup(); i386_default_early_setup();
break; break;
......
# Platform specific code goes here # Platform specific code goes here
obj-y += ce4100/
obj-y += efi/ obj-y += efi/
obj-y += mrst/ obj-y += mrst/
obj-y += olpc/ obj-y += olpc/
......
obj-$(CONFIG_X86_INTEL_CE) += ce4100.o
/*
* Intel CE4100 platform specific setup code
*
* (C) Copyright 2010 Intel Corporation
*
* 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; version 2
* of the License.
*/
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/irq.h>
#include <linux/module.h>
#include <asm/setup.h>
static int ce4100_i8042_detect(void)
{
return 0;
}
static void __init sdv_arch_setup(void)
{
}
static void __init sdv_find_smp_config(void)
{
}
/*
* CE4100 specific x86_init function overrides and early setup
* calls.
*/
void __init x86_ce4100_early_setup(void)
{
x86_init.oem.arch_setup = sdv_arch_setup;
x86_platform.i8042_detect = ce4100_i8042_detect;
x86_init.resources.probe_roms = x86_init_noop;
x86_init.mpparse.get_smp_config = x86_init_uint_noop;
x86_init.mpparse.find_smp_config = sdv_find_smp_config;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment