-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/lin…
…ux/kernel/git/tip/linux-2.6-tip * 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits) x86, mrst: Fix whitespace breakage in apb_timer.c x86, mrst: Fix APB timer per cpu clockevent x86, mrst: Remove X86_MRST dependency on PCI_IOAPIC x86, olpc: Use pci subarch init for OLPC x86, pci: Add arch_init to x86_init abstraction x86, mrst: Add Kconfig dependencies for Moorestown x86, pci: Exclude Moorestown PCI code if CONFIG_X86_MRST=n x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI x86, pci: Add sanity check for PCI fixed bar probing x86, legacy_irq: Remove duplicate vector assigment x86, legacy_irq: Remove left over nr_legacy_irqs x86, mrst: Platform clock setup code x86, apbt: Moorestown APB system timer driver x86, mrst: Add vrtc platform data setup code x86, mrst: Add platform timer info parsing code x86, mrst: Fill in PCI functions in x86_init layer x86, mrst: Add dummy legacy pic to platform setup x86/PCI: Moorestown PCI support x86, ioapic: Add dummy ioapic functions x86, ioapic: Early enable ioapic for timer irq ... Fixed up semantic conflict of new clocksources due to commit 1762233 ("clocksource: add argument to resume callback").
- Loading branch information
Showing
42 changed files
with
1,662 additions
and
162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
/* | ||
* apb_timer.h: Driver for Langwell APB timer based on Synopsis DesignWare | ||
* | ||
* (C) Copyright 2009 Intel Corporation | ||
* Author: Jacob Pan (jacob.jun.pan@intel.com) | ||
* | ||
* 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. | ||
* | ||
* Note: | ||
*/ | ||
|
||
#ifndef ASM_X86_APBT_H | ||
#define ASM_X86_APBT_H | ||
#include <linux/sfi.h> | ||
|
||
#ifdef CONFIG_APB_TIMER | ||
|
||
/* Langwell DW APB timer registers */ | ||
#define APBTMR_N_LOAD_COUNT 0x00 | ||
#define APBTMR_N_CURRENT_VALUE 0x04 | ||
#define APBTMR_N_CONTROL 0x08 | ||
#define APBTMR_N_EOI 0x0c | ||
#define APBTMR_N_INT_STATUS 0x10 | ||
|
||
#define APBTMRS_INT_STATUS 0xa0 | ||
#define APBTMRS_EOI 0xa4 | ||
#define APBTMRS_RAW_INT_STATUS 0xa8 | ||
#define APBTMRS_COMP_VERSION 0xac | ||
#define APBTMRS_REG_SIZE 0x14 | ||
|
||
/* register bits */ | ||
#define APBTMR_CONTROL_ENABLE (1<<0) | ||
#define APBTMR_CONTROL_MODE_PERIODIC (1<<1) /*1: periodic 0:free running */ | ||
#define APBTMR_CONTROL_INT (1<<2) | ||
|
||
/* default memory mapped register base */ | ||
#define LNW_SCU_ADDR 0xFF100000 | ||
#define LNW_EXT_TIMER_OFFSET 0x1B800 | ||
#define APBT_DEFAULT_BASE (LNW_SCU_ADDR+LNW_EXT_TIMER_OFFSET) | ||
#define LNW_EXT_TIMER_PGOFFSET 0x800 | ||
|
||
/* APBT clock speed range from PCLK to fabric base, 25-100MHz */ | ||
#define APBT_MAX_FREQ 50 | ||
#define APBT_MIN_FREQ 1 | ||
#define APBT_MMAP_SIZE 1024 | ||
|
||
#define APBT_DEV_USED 1 | ||
|
||
extern void apbt_time_init(void); | ||
extern struct clock_event_device *global_clock_event; | ||
extern unsigned long apbt_quick_calibrate(void); | ||
extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu); | ||
extern void apbt_setup_secondary_clock(void); | ||
extern unsigned int boot_cpu_id; | ||
extern int disable_apbt_percpu; | ||
|
||
extern struct sfi_timer_table_entry *sfi_get_mtmr(int hint); | ||
extern void sfi_free_mtmr(struct sfi_timer_table_entry *mtmr); | ||
extern int sfi_mtimer_num; | ||
|
||
#else /* CONFIG_APB_TIMER */ | ||
|
||
static inline unsigned long apbt_quick_calibrate(void) {return 0; } | ||
static inline void apbt_time_init(void) {return 0; } | ||
|
||
#endif | ||
#endif /* ASM_X86_APBT_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
/* | ||
* mrst.h: Intel Moorestown platform specific setup code | ||
* | ||
* (C) Copyright 2009 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. | ||
*/ | ||
#ifndef _ASM_X86_MRST_H | ||
#define _ASM_X86_MRST_H | ||
extern int pci_mrst_init(void); | ||
int __init sfi_parse_mrtc(struct sfi_table_header *table); | ||
|
||
#define SFI_MTMR_MAX_NUM 8 | ||
#define SFI_MRTC_MAX 8 | ||
|
||
#endif /* _ASM_X86_MRST_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.