mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[ixp4xx] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11204 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
|
||||
Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Kconfig 2008-03-20 21:07:50.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig 2008-03-20 21:09:12.000000000 +1030
|
||||
@@ -125,6 +125,15 @@
|
||||
--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Kconfig
|
||||
+++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Kconfig
|
||||
@@ -125,6 +125,15 @@ config ARCH_IXDP4XX
|
||||
depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
|
||||
default y
|
||||
|
||||
@@ -18,11 +18,11 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Kconfig
|
||||
#
|
||||
# Certain registers and IRQs are only enabled if supporting IXP465 CPUs
|
||||
#
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
|
||||
Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/arch/arm/mach-ixp4xx/Makefile 2008-03-20 21:07:50.000000000 +1030
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/Makefile 2008-03-20 21:09:12.000000000 +1030
|
||||
@@ -15,6 +15,7 @@
|
||||
--- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile
|
||||
+++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
|
||||
@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas10
|
||||
obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o
|
||||
obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o
|
||||
obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o
|
||||
@@ -30,17 +30,17 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/Makefile
|
||||
|
||||
obj-y += common.o
|
||||
|
||||
@@ -28,5 +29,6 @@
|
||||
@@ -28,5 +29,6 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-se
|
||||
obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o
|
||||
obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
|
||||
obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o
|
||||
+obj-$(CONFIG_MACH_FSG) += fsg-setup.o
|
||||
|
||||
obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/fsg-pci.c
|
||||
Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/fsg-pci.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/fsg-pci.c 2008-03-20 21:09:12.000000000 +1030
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/arch/arm/mach-ixp4xx/fsg-pci.c
|
||||
@@ -0,0 +1,71 @@
|
||||
+/*
|
||||
+ * arch/arch/mach-ixp4xx/fsg-pci.c
|
||||
@@ -113,10 +113,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/fsg-pci.c
|
||||
+}
|
||||
+
|
||||
+subsys_initcall(fsg_pci_init);
|
||||
Index: linux-2.6.24/arch/arm/mach-ixp4xx/fsg-setup.c
|
||||
Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/fsg-setup.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.24/arch/arm/mach-ixp4xx/fsg-setup.c 2008-03-20 21:09:12.000000000 +1030
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/arch/arm/mach-ixp4xx/fsg-setup.c
|
||||
@@ -0,0 +1,275 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-ixp4xx/fsg-setup.c
|
||||
@@ -393,10 +393,10 @@ Index: linux-2.6.24/arch/arm/mach-ixp4xx/fsg-setup.c
|
||||
+ .init_machine = fsg_init,
|
||||
+MACHINE_END
|
||||
+
|
||||
Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/fsg.h
|
||||
Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/fsg.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/fsg.h 2008-03-20 21:09:12.000000000 +1030
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/fsg.h
|
||||
@@ -0,0 +1,50 @@
|
||||
+/*
|
||||
+ * include/asm-arm/arch-ixp4xx/fsg.h
|
||||
@@ -448,10 +448,10 @@ Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/fsg.h
|
||||
+#define FSG_LED_USB_BIT 4
|
||||
+#define FSG_LED_RING_BIT 5
|
||||
+#define FSG_LED_SYNC_BIT 7
|
||||
Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/hardware.h
|
||||
Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/hardware.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/hardware.h 2008-03-20 21:07:50.000000000 +1030
|
||||
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/hardware.h 2008-03-20 21:09:12.000000000 +1030
|
||||
--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/hardware.h
|
||||
+++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/hardware.h
|
||||
@@ -45,5 +45,6 @@
|
||||
#include "nslu2.h"
|
||||
#include "nas100d.h"
|
||||
@@ -459,10 +459,10 @@ Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/hardware.h
|
||||
+#include "fsg.h"
|
||||
|
||||
#endif /* _ASM_ARCH_HARDWARE_H */
|
||||
Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/irqs.h
|
||||
Index: linux-2.6.24.7/include/asm-arm/arch-ixp4xx/irqs.h
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/include/asm-arm/arch-ixp4xx/irqs.h 2008-03-20 21:07:50.000000000 +1030
|
||||
+++ linux-2.6.24/include/asm-arm/arch-ixp4xx/irqs.h 2008-03-20 21:09:12.000000000 +1030
|
||||
--- linux-2.6.24.7.orig/include/asm-arm/arch-ixp4xx/irqs.h
|
||||
+++ linux-2.6.24.7/include/asm-arm/arch-ixp4xx/irqs.h
|
||||
@@ -128,4 +128,11 @@
|
||||
#define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7
|
||||
#define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6
|
||||
@@ -475,11 +475,11 @@ Index: linux-2.6.24/include/asm-arm/arch-ixp4xx/irqs.h
|
||||
+#define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5
|
||||
+
|
||||
#endif
|
||||
Index: linux-2.6.24/drivers/leds/Kconfig
|
||||
Index: linux-2.6.24.7/drivers/leds/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/drivers/leds/Kconfig 2008-03-20 21:07:50.000000000 +1030
|
||||
+++ linux-2.6.24/drivers/leds/Kconfig 2008-03-20 21:09:12.000000000 +1030
|
||||
@@ -48,6 +48,12 @@
|
||||
--- linux-2.6.24.7.orig/drivers/leds/Kconfig
|
||||
+++ linux-2.6.24.7/drivers/leds/Kconfig
|
||||
@@ -48,6 +48,12 @@ config LEDS_IXP4XX
|
||||
particular board must have LEDs and they must be connected
|
||||
to the GPIO lines. If unsure, say Y.
|
||||
|
||||
@@ -492,11 +492,11 @@ Index: linux-2.6.24/drivers/leds/Kconfig
|
||||
config LEDS_TOSA
|
||||
tristate "LED Support for the Sharp SL-6000 series"
|
||||
depends on LEDS_CLASS && PXA_SHARPSL
|
||||
Index: linux-2.6.24/drivers/leds/Makefile
|
||||
Index: linux-2.6.24.7/drivers/leds/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.24.orig/drivers/leds/Makefile 2008-03-20 21:07:50.000000000 +1030
|
||||
+++ linux-2.6.24/drivers/leds/Makefile 2008-03-20 21:09:56.000000000 +1030
|
||||
@@ -20,6 +20,7 @@
|
||||
--- linux-2.6.24.7.orig/drivers/leds/Makefile
|
||||
+++ linux-2.6.24.7/drivers/leds/Makefile
|
||||
@@ -20,6 +20,7 @@ obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-
|
||||
obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
|
||||
obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
|
||||
obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
|
||||
@@ -504,10 +504,10 @@ Index: linux-2.6.24/drivers/leds/Makefile
|
||||
|
||||
# LED Triggers
|
||||
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
|
||||
Index: linux-2.6.24/drivers/leds/leds-fsg.c
|
||||
Index: linux-2.6.24.7/drivers/leds/leds-fsg.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.24/drivers/leds/leds-fsg.c 2008-03-20 21:09:12.000000000 +1030
|
||||
--- /dev/null
|
||||
+++ linux-2.6.24.7/drivers/leds/leds-fsg.c
|
||||
@@ -0,0 +1,261 @@
|
||||
+/*
|
||||
+ * LED Driver for the Freecom FSG-3
|
||||
|
||||
Reference in New Issue
Block a user