eb3d3ec567
Pull ARM updates from Russell King: - Major clean-up of the L2 cache support code. The existing mess was becoming rather unmaintainable through all the additions that others have done over time. This turns it into a much nicer structure, and implements a few performance improvements as well. - Clean up some of the CP15 control register tweaks for alignment support, moving some code and data into alignment.c - DMA properties for ARM, from Santosh and reviewed by DT people. This adds DT properties to specify bus translations we can't discover automatically, and to indicate whether devices are coherent. - Hibernation support for ARM - Make ftrace work with read-only text in modules - add suspend support for PJ4B CPUs - rework interrupt masking for undefined instruction handling, which allows us to enable interrupts earlier in the handling of these exceptions. - support for big endian page tables - fix stacktrace support to exclude stacktrace functions from the trace, and add save_stack_trace_regs() implementation so that kprobes can record stack traces. - Add support for the Cortex-A17 CPU. - Remove last vestiges of ARM710 support. - Removal of ARM "meminfo" structure, finally converting us solely to memblock to handle the early memory initialisation. * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (142 commits) ARM: ensure C page table setup code follows assembly code (part II) ARM: ensure C page table setup code follows assembly code ARM: consolidate last remaining open-coded alignment trap enable ARM: remove global cr_no_alignment ARM: remove CPU_CP15 conditional from alignment.c ARM: remove unused adjust_cr() function ARM: move "noalign" command line option to alignment.c ARM: provide common method to clear bits in CPU control register ARM: 8025/1: Get rid of meminfo ARM: 8060/1: mm: allow sub-architectures to override PCI I/O memory type ARM: 8066/1: correction for ARM patch 8031/2 ARM: 8049/1: ftrace/add save_stack_trace_regs() implementation ARM: 8065/1: remove last use of CONFIG_CPU_ARM710 ARM: 8062/1: Modify ldrt fixup handler to re-execute the userspace instruction ARM: 8047/1: rwsem: use asm-generic rwsem implementation ARM: l2c: trial at enabling some Cortex-A9 optimisations ARM: l2c: add warnings for stuff modifying aux_ctrl register values ARM: l2c: print a warning with L2C-310 caches if the cache size is modified ARM: l2c: remove old .set_debug method ARM: l2c: kill L2X0_AUX_CTRL_MASK before anyone else makes use of this ...
87 lines
2.6 KiB
C
87 lines
2.6 KiB
C
#ifndef __ARCH_ORION5X_COMMON_H
|
|
#define __ARCH_ORION5X_COMMON_H
|
|
|
|
#include <linux/reboot.h>
|
|
|
|
struct dsa_platform_data;
|
|
struct mv643xx_eth_platform_data;
|
|
struct mv_sata_platform_data;
|
|
|
|
#define ORION_MBUS_PCIE_MEM_TARGET 0x04
|
|
#define ORION_MBUS_PCIE_MEM_ATTR 0x59
|
|
#define ORION_MBUS_PCIE_IO_TARGET 0x04
|
|
#define ORION_MBUS_PCIE_IO_ATTR 0x51
|
|
#define ORION_MBUS_PCIE_WA_TARGET 0x04
|
|
#define ORION_MBUS_PCIE_WA_ATTR 0x79
|
|
#define ORION_MBUS_PCI_MEM_TARGET 0x03
|
|
#define ORION_MBUS_PCI_MEM_ATTR 0x59
|
|
#define ORION_MBUS_PCI_IO_TARGET 0x03
|
|
#define ORION_MBUS_PCI_IO_ATTR 0x51
|
|
#define ORION_MBUS_DEVBUS_BOOT_TARGET 0x01
|
|
#define ORION_MBUS_DEVBUS_BOOT_ATTR 0x0f
|
|
#define ORION_MBUS_DEVBUS_TARGET(cs) 0x01
|
|
#define ORION_MBUS_DEVBUS_ATTR(cs) (~(1 << cs))
|
|
#define ORION_MBUS_SRAM_TARGET 0x09
|
|
#define ORION_MBUS_SRAM_ATTR 0x00
|
|
|
|
/*
|
|
* Basic Orion init functions used early by machine-setup.
|
|
*/
|
|
void orion5x_map_io(void);
|
|
void orion5x_init_early(void);
|
|
void orion5x_init_irq(void);
|
|
void orion5x_init(void);
|
|
void orion5x_id(u32 *dev, u32 *rev, char **dev_name);
|
|
void clk_init(void);
|
|
extern int orion5x_tclk;
|
|
extern void orion5x_timer_init(void);
|
|
|
|
void orion5x_setup_wins(void);
|
|
|
|
void orion5x_ehci0_init(void);
|
|
void orion5x_ehci1_init(void);
|
|
void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data);
|
|
void orion5x_eth_switch_init(struct dsa_platform_data *d, int irq);
|
|
void orion5x_i2c_init(void);
|
|
void orion5x_sata_init(struct mv_sata_platform_data *sata_data);
|
|
void orion5x_spi_init(void);
|
|
void orion5x_uart0_init(void);
|
|
void orion5x_uart1_init(void);
|
|
void orion5x_xor_init(void);
|
|
void orion5x_restart(enum reboot_mode, const char *);
|
|
|
|
/*
|
|
* PCIe/PCI functions.
|
|
*/
|
|
struct pci_bus;
|
|
struct pci_sys_data;
|
|
struct pci_dev;
|
|
|
|
void orion5x_pcie_id(u32 *dev, u32 *rev);
|
|
void orion5x_pci_disable(void);
|
|
void orion5x_pci_set_cardbus_mode(void);
|
|
int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys);
|
|
struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys);
|
|
int orion5x_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);
|
|
|
|
struct tag;
|
|
extern void __init tag_fixup_mem32(struct tag *, char **);
|
|
|
|
#ifdef CONFIG_MACH_MSS2_DT
|
|
extern void mss2_init(void);
|
|
#else
|
|
static inline void mss2_init(void) {}
|
|
#endif
|
|
|
|
/*****************************************************************************
|
|
* Helpers to access Orion registers
|
|
****************************************************************************/
|
|
/*
|
|
* These are not preempt-safe. Locks, if needed, must be taken
|
|
* care of by the caller.
|
|
*/
|
|
#define orion5x_setbits(r, mask) writel(readl(r) | (mask), (r))
|
|
#define orion5x_clrbits(r, mask) writel(readl(r) & ~(mask), (r))
|
|
|
|
#endif
|