136 lines
5.3 KiB
Diff
136 lines
5.3 KiB
Diff
|
--- a/arch/arm/mach-ixp4xx/ap1000-setup.c
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
|
||
|
|
@@ -167,8 +167,6 @@ static void __init ap1000_init(void)
|
||
|
|
#ifdef CONFIG_MACH_AP1000
|
||
|
|
MACHINE_START(AP1000, "Lanready AP-1000")
|
||
|
|
/* Maintainer: Imre Kaloz <Kaloz@openwrt.org> */
|
||
|
|
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.fixup = ap1000_fixup,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
--- a/arch/arm/mach-ixp4xx/cambria-setup.c
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/cambria-setup.c
|
||
|
|
@@ -563,8 +563,6 @@ late_initcall(cambria_model_setup);
|
||
|
|
|
||
|
|
MACHINE_START(CAMBRIA, "Gateworks Cambria series")
|
||
|
|
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||
|
|
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
.timer = &ixp4xx_timer,
|
||
|
|
--- a/arch/arm/mach-ixp4xx/compex-setup.c
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/compex-setup.c
|
||
|
|
@@ -126,8 +126,6 @@ static void __init compex_init(void)
|
||
|
|
|
||
|
|
MACHINE_START(COMPEX, "Compex WP18 / NP18A")
|
||
|
|
/* Maintainer: Imre Kaloz <Kaloz@openwrt.org> */
|
||
|
|
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
.timer = &ixp4xx_timer,
|
||
|
|
--- a/arch/arm/mach-ixp4xx/mi424wr-setup.c
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/mi424wr-setup.c
|
||
|
|
@@ -333,8 +333,6 @@ static void __init mi424wr_init(void)
|
||
|
|
|
||
|
|
MACHINE_START(MI424WR, "Actiontec MI424WR")
|
||
|
|
/* Maintainer: Jose Vasconcellos */
|
||
|
|
- .phys_io = IXP4XX_UART2_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
.timer = &ixp4xx_timer,
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/modules.builtin
|
||
|
|
@@ -0,0 +1,2 @@
|
||
|
|
+kernel/arch/arm/mach-ixp4xx/ixp4xx_qmgr.ko
|
||
|
|
+kernel/arch/arm/mach-ixp4xx/ixp4xx_npe.ko
|
||
|
|
--- a/arch/arm/mach-ixp4xx/pronghorn-setup.c
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
|
||
|
|
@@ -224,8 +224,6 @@ static void __init pronghorn_init(void)
|
||
|
|
|
||
|
|
MACHINE_START(PRONGHORN, "ADI Engineering Pronghorn")
|
||
|
|
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||
|
|
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
.timer = &ixp4xx_timer,
|
||
|
|
@@ -235,8 +233,6 @@ MACHINE_END
|
||
|
|
|
||
|
|
MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro")
|
||
|
|
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||
|
|
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
.timer = &ixp4xx_timer,
|
||
|
|
--- a/arch/arm/mach-ixp4xx/sidewinder-setup.c
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/sidewinder-setup.c
|
||
|
|
@@ -139,8 +139,6 @@ static void __init sidewinder_init(void)
|
||
|
|
|
||
|
|
MACHINE_START(SIDEWINDER, "ADI Engineering Sidewinder")
|
||
|
|
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||
|
|
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
.timer = &ixp4xx_timer,
|
||
|
|
--- a/arch/arm/mach-ixp4xx/tw2662-setup.c
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/tw2662-setup.c
|
||
|
|
@@ -200,8 +200,6 @@ static void __init tw2662_init(void)
|
||
|
|
#ifdef CONFIG_MACH_TW2662
|
||
|
|
MACHINE_START(TW2662, "Titan Wireless TW-266-2")
|
||
|
|
/* Maintainer: Alexandros C. Couloumbis <alex@ozo.com> */
|
||
|
|
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.fixup = tw2662_fixup,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
--- a/arch/arm/mach-ixp4xx/tw5334-setup.c
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/tw5334-setup.c
|
||
|
|
@@ -152,8 +152,6 @@ static void __init tw5334_init(void)
|
||
|
|
#ifdef CONFIG_MACH_TW5334
|
||
|
|
MACHINE_START(TW5334, "Titan Wireless TW-533-4")
|
||
|
|
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||
|
|
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
.timer = &ixp4xx_timer,
|
||
|
|
--- a/arch/arm/mach-ixp4xx/usr8200-setup.c
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/usr8200-setup.c
|
||
|
|
@@ -202,8 +202,6 @@ static void __init usr8200_init(void)
|
||
|
|
|
||
|
|
MACHINE_START(USR8200, "USRobotics USR8200")
|
||
|
|
/* Maintainer: Peter Denison <openwrt@marshadder.org> */
|
||
|
|
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
.timer = &ixp4xx_timer,
|
||
|
|
--- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
|
||
|
|
@@ -161,8 +161,6 @@ static void __init wg302v1_init(void)
|
||
|
|
#ifdef CONFIG_MACH_WG302V1
|
||
|
|
MACHINE_START(WG302V1, "Netgear WG302 v1 / WAG302 v1")
|
||
|
|
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||
|
|
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.fixup = wg302v1_fixup,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
--- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
|
||
|
|
+++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
|
||
|
|
@@ -157,8 +157,6 @@ static void __init wrt300nv2_init(void)
|
||
|
|
#ifdef CONFIG_MACH_WRT300NV2
|
||
|
|
MACHINE_START(WRT300NV2, "Linksys WRT300N v2")
|
||
|
|
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
|
||
|
|
- .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
||
|
|
- .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
|
||
|
|
.map_io = ixp4xx_map_io,
|
||
|
|
.init_irq = ixp4xx_init_irq,
|
||
|
|
.timer = &ixp4xx_timer,
|