← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/x86/platform/ce4100/ce4100.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/platform/ce4100/ce4100.c
16
16
#include <linux/serial_8250.h>
17
17
 
18
18
#include <asm/ce4100.h>
 
19
#include <asm/prom.h>
19
20
#include <asm/setup.h>
 
21
#include <asm/i8259.h>
20
22
#include <asm/io.h>
 
23
#include <asm/io_apic.h>
21
24
 
22
25
static int ce4100_i8042_detect(void)
23
26
{
24
27
        return 0;
25
28
}
26
29
 
27
 
static void __init sdv_find_smp_config(void)
28
 
{
29
 
}
30
 
 
31
30
#ifdef CONFIG_SERIAL_8250
32
31
 
33
 
 
34
32
static unsigned int mem_serial_in(struct uart_port *p, int offset)
35
33
{
36
34
        offset = offset << p->regshift;
119
117
        sdv_serial_fixup();
120
118
}
121
119
 
 
120
#ifdef CONFIG_X86_IO_APIC
 
121
static void __cpuinit sdv_pci_init(void)
 
122
{
 
123
        x86_of_pci_init();
 
124
        /* We can't set this earlier, because we need to calibrate the timer */
 
125
        legacy_pic = &null_legacy_pic;
 
126
}
 
127
#endif
 
128
 
122
129
/*
123
130
 * CE4100 specific x86_init function overrides and early setup
124
131
 * calls.
129
136
        x86_platform.i8042_detect = ce4100_i8042_detect;
130
137
        x86_init.resources.probe_roms = x86_init_noop;
131
138
        x86_init.mpparse.get_smp_config = x86_init_uint_noop;
132
 
        x86_init.mpparse.find_smp_config = sdv_find_smp_config;
 
139
        x86_init.mpparse.find_smp_config = x86_init_noop;
133
140
        x86_init.pci.init = ce4100_pci_init;
 
141
 
 
142
#ifdef CONFIG_X86_IO_APIC
 
143
        x86_init.pci.init_irq = sdv_pci_init;
 
144
        x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc_nocheck;
 
145
#endif
134
146
}