projects
/
openwrt
/
staging
/
jow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
856fba8
)
ixp4xx: add missing reboot handlers (fixes #11577)
author
Felix Fietkau
<nbd@openwrt.org>
Tue, 9 Oct 2012 15:38:55 +0000
(15:38 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Tue, 9 Oct 2012 15:38:55 +0000
(15:38 +0000)
SVN-Revision: 33672
12 files changed:
target/linux/ixp4xx/patches-3.3/105-wg302v1_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-3.3/110-pronghorn_series_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-3.3/115-sidewinder_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-3.3/120-compex_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-3.3/130-wrt300nv2_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-3.3/150-lanready_ap1000_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-3.3/160-delayed_uart_io.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-3.3/180-tw5334_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-3.3/185-mi424wr_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-3.3/500-usr8200_support.patch
patch
|
blob
|
history
target/linux/ixp4xx/patches-3.3/520-tw2662_support.patch
patch
|
blob
|
history
diff --git
a/target/linux/ixp4xx/patches-3.3/105-wg302v1_support.patch
b/target/linux/ixp4xx/patches-3.3/105-wg302v1_support.patch
index 1e8fdaa513a9be580041b08f637c5bb83b95e2df..c9d5b9421a0a9be00c6758d6d7982c7cdd27173a 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/105-wg302v1_support.patch
+++ b/
target/linux/ixp4xx/patches-3.3/105-wg302v1_support.patch
@@
-112,7
+112,7
@@
+subsys_initcall(wg302v1_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
+subsys_initcall(wg302v1_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
-@@ -0,0 +1,14
4
@@
+@@ -0,0 +1,14
5
@@
+/*
+ * arch/arm/mach-ixp4xx/wg302v1-setup.c
+ *
+/*
+ * arch/arm/mach-ixp4xx/wg302v1-setup.c
+ *
@@
-255,5
+255,6
@@
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
+#endif
+MACHINE_END
+#endif
diff --git
a/target/linux/ixp4xx/patches-3.3/110-pronghorn_series_support.patch
b/target/linux/ixp4xx/patches-3.3/110-pronghorn_series_support.patch
index 529cddb4369689a49fe8510b6c7f2b82f3a685ae..f795fb576d6aa582cff2983debe94beb725808da 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/110-pronghorn_series_support.patch
+++ b/
target/linux/ixp4xx/patches-3.3/110-pronghorn_series_support.patch
@@
-127,7
+127,7
@@
+subsys_initcall(pronghorn_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
+subsys_initcall(pronghorn_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
-@@ -0,0 +1,24
7
@@
+@@ -0,0 +1,24
9
@@
+/*
+ * arch/arm/mach-ixp4xx/pronghorn-setup.c
+ *
+/*
+ * arch/arm/mach-ixp4xx/pronghorn-setup.c
+ *
@@
-362,6
+362,7
@@
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
+
+MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro")
+MACHINE_END
+
+MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro")
@@
-374,6
+375,7
@@
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
--- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
+MACHINE_END
--- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
diff --git
a/target/linux/ixp4xx/patches-3.3/115-sidewinder_support.patch
b/target/linux/ixp4xx/patches-3.3/115-sidewinder_support.patch
index f2e626d16ab15de0f0740c413cac31d5f68e159a..0ffd839736fad18921f9b0745e33b0805e9c51bb 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/115-sidewinder_support.patch
+++ b/
target/linux/ixp4xx/patches-3.3/115-sidewinder_support.patch
@@
-130,7
+130,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+subsys_initcall(sidewinder_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/sidewinder-setup.c
+subsys_initcall(sidewinder_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/sidewinder-setup.c
-@@ -0,0 +1,15
0
@@
+@@ -0,0 +1,15
1
@@
+/*
+ * arch/arm/mach-ixp4xx/sidewinder-setup.c
+ *
+/*
+ * arch/arm/mach-ixp4xx/sidewinder-setup.c
+ *
@@
-280,4
+280,5
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
+MACHINE_END
diff --git
a/target/linux/ixp4xx/patches-3.3/120-compex_support.patch
b/target/linux/ixp4xx/patches-3.3/120-compex_support.patch
index da59f4c075c681f89d9fa09197e8593f4a300c18..3166f6722067f5afd64bdda63084dcc6d6a866df 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/120-compex_support.patch
+++ b/
target/linux/ixp4xx/patches-3.3/120-compex_support.patch
@@
-50,7
+50,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/compex-setup.c
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/compex-setup.c
-@@ -0,0 +1,13
7
@@
+@@ -0,0 +1,13
8
@@
+/*
+ * arch/arm/mach-ixp4xx/compex-setup.c
+ *
+/*
+ * arch/arm/mach-ixp4xx/compex-setup.c
+ *
@@
-187,6
+187,7
@@
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
+MACHINE_END
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
diff --git
a/target/linux/ixp4xx/patches-3.3/130-wrt300nv2_support.patch
b/target/linux/ixp4xx/patches-3.3/130-wrt300nv2_support.patch
index caa2b3887e9a53573f811cce000be25a3dde80a5..638af2903133ad9eb573a7421c03424beb70eec6 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/130-wrt300nv2_support.patch
+++ b/
target/linux/ixp4xx/patches-3.3/130-wrt300nv2_support.patch
@@
-103,7
+103,7
@@
+subsys_initcall(wrt300nv2_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+subsys_initcall(wrt300nv2_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
-@@ -0,0 +1,1
09
@@
+@@ -0,0 +1,1
10
@@
+/*
+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+ *
+/*
+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c
+ *
@@
-211,6
+211,7
@@
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
+#endif
--- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
+MACHINE_END
+#endif
--- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
diff --git
a/target/linux/ixp4xx/patches-3.3/150-lanready_ap1000_support.patch
b/target/linux/ixp4xx/patches-3.3/150-lanready_ap1000_support.patch
index da3c1432f3c5a43ae6e8d4b6d0a7cca51b837211..c2b25b3cb73a48902742fa862c988a997677d166 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/150-lanready_ap1000_support.patch
+++ b/
target/linux/ixp4xx/patches-3.3/150-lanready_ap1000_support.patch
@@
-1,6
+1,6
@@
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
-@@ -0,0 +1,15
2
@@
+@@ -0,0 +1,15
3
@@
+/*
+ * arch/arm/mach-ixp4xx/ap1000-setup.c
+ *
+/*
+ * arch/arm/mach-ixp4xx/ap1000-setup.c
+ *
@@
-151,6
+151,7
@@
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
+#endif
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+MACHINE_END
+#endif
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
diff --git
a/target/linux/ixp4xx/patches-3.3/160-delayed_uart_io.patch
b/target/linux/ixp4xx/patches-3.3/160-delayed_uart_io.patch
index a3b1f25e5b49ec7dc34a119531ece459395c8503..18d93979dfb7826cee52d59a2888cc92322573d4 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/160-delayed_uart_io.patch
+++ b/
target/linux/ixp4xx/patches-3.3/160-delayed_uart_io.patch
@@
-112,7
+112,7
@@
Add a new UART I/O type for slow busses such as the ixp4xx expansion bus
case UPIO_MEM:
case UPIO_MEM32:
case UPIO_AU:
case UPIO_MEM:
case UPIO_MEM32:
case UPIO_AU:
-@@ -243
5,6 +2436
,7 @@ int uart_match_port(struct uart_port *po
+@@ -243
6,6 +2437
,7 @@ int uart_match_port(struct uart_port *po
case UPIO_HUB6:
return (port1->iobase == port2->iobase) &&
(port1->hub6 == port2->hub6);
case UPIO_HUB6:
return (port1->iobase == port2->iobase) &&
(port1->hub6 == port2->hub6);
diff --git
a/target/linux/ixp4xx/patches-3.3/180-tw5334_support.patch
b/target/linux/ixp4xx/patches-3.3/180-tw5334_support.patch
index 2b6f0f0498df20cbaacb8088a6b532d168ce9e91..7d5a6f22031187c2f0f0074086628d44c66baa07 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/180-tw5334_support.patch
+++ b/
target/linux/ixp4xx/patches-3.3/180-tw5334_support.patch
@@
-35,7
+35,7
@@
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/tw5334-setup.c
obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/tw5334-setup.c
-@@ -0,0 +1,16
4
@@
+@@ -0,0 +1,16
5
@@
+/*
+ * arch/arm/mach-ixp4xx/tw5334-setup.c
+ *
+/*
+ * arch/arm/mach-ixp4xx/tw5334-setup.c
+ *
@@
-198,6
+198,7
@@
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
+#endif
--- /dev/null
+MACHINE_END
+#endif
--- /dev/null
diff --git
a/target/linux/ixp4xx/patches-3.3/185-mi424wr_support.patch
b/target/linux/ixp4xx/patches-3.3/185-mi424wr_support.patch
index 08ad726407018e3e48fb6c2cb72a0325d727f77c..4d61cee7a1ce2185abd6983b98b8aaaaa2e1b71e 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/185-mi424wr_support.patch
+++ b/
target/linux/ixp4xx/patches-3.3/185-mi424wr_support.patch
@@
-74,7
+74,7
@@
+
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/mi424wr-setup.c
+
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/mi424wr-setup.c
-@@ -0,0 +1,38
0
@@
+@@ -0,0 +1,38
1
@@
+/*
+ * arch/arm/mach-ixp4xx/mi424wr-setup.c
+ *
+/*
+ * arch/arm/mach-ixp4xx/mi424wr-setup.c
+ *
@@
-453,6
+453,7
@@
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
+
--- a/arch/arm/mach-ixp4xx/Makefile
+MACHINE_END
+
--- a/arch/arm/mach-ixp4xx/Makefile
diff --git
a/target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
b/target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
index 6cee21e89e97842311ed4abfe0062742f0437a34..57dfdace8efc7b45de8db1b852670b8871d45448 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
+++ b/
target/linux/ixp4xx/patches-3.3/190-cambria_support.patch
@@
-82,7
+82,7
@@
+subsys_initcall(cambria_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/cambria-setup.c
+subsys_initcall(cambria_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/cambria-setup.c
-@@ -0,0 +1,100
5
@@
+@@ -0,0 +1,100
6
@@
+/*
+ * arch/arm/mach-ixp4xx/cambria-setup.c
+ *
+/*
+ * arch/arm/mach-ixp4xx/cambria-setup.c
+ *
@@
-1087,6
+1087,7
@@
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
+MACHINE_END
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
diff --git
a/target/linux/ixp4xx/patches-3.3/500-usr8200_support.patch
b/target/linux/ixp4xx/patches-3.3/500-usr8200_support.patch
index 8ce1b412939ba0efe7a2e53aa81b11f33b34c8d6..38a63889710e7c8a36702f4643fe7feda08c685e 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/500-usr8200_support.patch
+++ b/
target/linux/ixp4xx/patches-3.3/500-usr8200_support.patch
@@
-116,7
+116,7
@@
+subsys_initcall(usr8200_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/usr8200-setup.c
+subsys_initcall(usr8200_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/usr8200-setup.c
-@@ -0,0 +1,21
3
@@
+@@ -0,0 +1,21
4
@@
+/*
+ * arch/arm/mach-ixp4xx/usr8200-setup.c
+ *
+/*
+ * arch/arm/mach-ixp4xx/usr8200-setup.c
+ *
@@
-329,6
+329,7
@@
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
--- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
+MACHINE_END
--- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
diff --git
a/target/linux/ixp4xx/patches-3.3/520-tw2662_support.patch
b/target/linux/ixp4xx/patches-3.3/520-tw2662_support.patch
index edce4771bfff5589302fbdf30e85f32bec0b9ff7..c7940a76965b26ffb5a0c402d290faa279aa0595 100644
(file)
--- a/
target/linux/ixp4xx/patches-3.3/520-tw2662_support.patch
+++ b/
target/linux/ixp4xx/patches-3.3/520-tw2662_support.patch
@@
-118,7
+118,7
@@
+subsys_initcall(tw2662_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/tw2662-setup.c
+subsys_initcall(tw2662_pci_init);
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/tw2662-setup.c
-@@ -0,0 +1,21
2
@@
+@@ -0,0 +1,21
3
@@
+/*
+ * arch/arm/mach-ixp4xx/tw2662-setup.c
+ *
+/*
+ * arch/arm/mach-ixp4xx/tw2662-setup.c
+ *
@@
-329,5
+329,6
@@
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
++ .restart = ixp4xx_restart,
+MACHINE_END
+#endif
+MACHINE_END
+#endif