Commit 3c9c65e8 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Deepak Saxena

[ARM] Various IXP2000 fixes

- Fix IXP2000_MSF_CLK_CNTRL typo
- Use unsigned long instead of int for local_irq_save() flags variable
- Fix "pci=firmware" handling
- Remove redundant IXP2000 zreladdr
- Fix IXP2000 def-configs
Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
parent 40ba07c2
......@@ -53,7 +53,6 @@ params_phys-$(CONFIG_ARCH_IOP3XX) := 0xa0000100
params-phys-$(CONFIG_ARCH_IXP4XX) := 0x00000100
zreladdr-$(CONFIG_ARCH_IXP2000) := 0x00008000
params-phys-$(CONFIG_ARCH_IXP2000) := 0x00000100
zreladdr-$(CONFIG_ARCH_IXP2000) := 0x00008000
zreladdr-$(CONFIG_ARCH_OMAP) := 0x10008000
params_phys-$(CONFIG_ARCH_OMAP) := 0x10000100
initrd_phys-$(CONFIG_ARCH_OMAP) := 0x10800000
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -596,7 +596,7 @@ char * __init pcibios_setup(char *str)
if (!strcmp(str, "debug")) {
debug_pci = 1;
return NULL;
} else if (!strcmp, "firmware") {
} else if (!strcmp(str, "firmware")) {
use_firmware = 1;
return NULL;
}
......
......@@ -265,7 +265,7 @@ static unsigned long GPIO_IRQ_level_high;
void gpio_line_config(int line, int style)
{
int flags;
unsigned long flags;
local_irq_save(flags);
......
......@@ -91,7 +91,7 @@
/*
* This allows for all the on-chip sources plus up to 32 CPLD based
* IRQs. Should be more then enough.
* IRQs. Should be more than enough.
*/
#define IXP2000_BOARD_IRQS 32
#define NR_IRQS (NR_IXP2000_IRQS + IXP2000_BOARD_IRQS)
......
/*
* inclue/asm-arm/arch-ixp2000/ixmb2x00.h
* include/asm-arm/arch-ixp2000/ixdp2x00.h
*
* Register and other defines for IXDP2[48]00 platforms
*
......
......@@ -324,7 +324,7 @@
#define IXP2000_PROD_ID_MASK 0xFFFFFFFF
#define IXP2000_MISC_CONTROL GLOBAL_REG(0x04)
#define IXP2000_MSF_ClK_CNTRL GLOBAL_REG(0x08)
#define IXP2000_MSF_CLK_CNTRL GLOBAL_REG(0x08)
#define IXP2000_RESET0 GLOBAL_REG(0x0c)
#define IXP2000_RESET1 GLOBAL_REG(0x10)
#define IXP2000_CCR GLOBAL_REG(0x14)
......
/*
* linux/include/asm-arm/arch-ixp2000/param.h
*/
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