diff options
| author | Deepak Saxena <dsaxena@net.rmk.(none)> | 2005-01-07 22:07:15 +0000 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2005-01-07 22:07:15 +0000 |
| commit | caef95d464c895b1ae81cf7c03632d14afe6ce84 (patch) | |
| tree | 03b591049dba07f6d0e769b1a532e29c4b5fd189 /include | |
| parent | eb25b5b24b977f108c5a08b98d57357af0612cbb (diff) | |
[ARM PATCH] 2358/1: Add IXP46x I2C platform device
Patch from Deepak Saxena
The IXP46x chips from Intel include the same I2C controller as found
on the IOP3xx. This patch adds a hook to the platform-level init code
to add that device to the device tree if running on a 46x CPU. A
separate patch has been sent upstream via Greg KH for the changes to the
I2C driver to support both IOP and IXP systems.
While at it, we fix a minor issue with the code where we were sending
the wrong ptr to platform_add_devices(). I am not sure how it ever
worked...
Signed-off-by: Deepak Saxena
Signed-off-by: Russell King
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-ixp4xx/irqs.h | 14 | ||||
| -rw-r--r-- | include/asm-arm/arch-ixp4xx/platform.h | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/include/asm-arm/arch-ixp4xx/irqs.h b/include/asm-arm/arch-ixp4xx/irqs.h index ca6de70b7ba3..ca808281c7f9 100644 --- a/include/asm-arm/arch-ixp4xx/irqs.h +++ b/include/asm-arm/arch-ixp4xx/irqs.h @@ -48,14 +48,6 @@ #define IRQ_IXP4XX_GPIO12 29 #define IRQ_IXP4XX_SW_INT1 30 #define IRQ_IXP4XX_SW_INT2 31 - -#ifndef CONFIG_CPU_IXP46X -#define NR_IRQS 32 -#else - -/* - * IXP465 adds new sources - */ #define IRQ_IXP4XX_USB_HOST 32 #define IRQ_IXP4XX_I2C 33 #define IRQ_IXP4XX_SSP 34 @@ -67,6 +59,12 @@ #define IRQ_IXP4XX_MCU_ECC 61 #define IRQ_IXP4XX_EXP_PE 62 +/* + * Only first 32 sources are valid if running on IXP42x systems + */ +#ifndef CONFIG_CPU_IXP46X +#define NR_IRQS 32 +#else #define NR_IRQS 64 #endif diff --git a/include/asm-arm/arch-ixp4xx/platform.h b/include/asm-arm/arch-ixp4xx/platform.h index fc9d710184f3..d0e195b32953 100644 --- a/include/asm-arm/arch-ixp4xx/platform.h +++ b/include/asm-arm/arch-ixp4xx/platform.h @@ -60,6 +60,7 @@ struct sys_timer; */ extern void ixp4xx_map_io(void); extern void ixp4xx_init_irq(void); +extern void ixp4xx_sys_init(void); extern struct sys_timer ixp4xx_timer; extern void ixp4xx_pci_preinit(void); struct pci_sys_data; |