refresh 2.6.32 patches, fix livebox support (#6821)
SVN-Revision: 20204
This commit is contained in:
parent
0193462642
commit
f2e91995ea
21 changed files with 114 additions and 257 deletions
|
@ -13,8 +13,6 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|||
create mode 100644 arch/mips/bcm63xx/dev-usb-ohci.c
|
||||
create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h
|
||||
|
||||
diff --git a/arch/mips/bcm63xx/Kconfig b/arch/mips/bcm63xx/Kconfig
|
||||
index fb177d6..76fbbf7 100644
|
||||
--- a/arch/mips/bcm63xx/Kconfig
|
||||
+++ b/arch/mips/bcm63xx/Kconfig
|
||||
@@ -16,10 +16,16 @@ config BCM63XX_CPU_6345
|
||||
|
@ -34,8 +32,6 @@ index fb177d6..76fbbf7 100644
|
|||
endmenu
|
||||
|
||||
source "arch/mips/bcm63xx/boards/Kconfig"
|
||||
diff --git a/arch/mips/bcm63xx/Makefile b/arch/mips/bcm63xx/Makefile
|
||||
index 00064b6..be5d7ad 100644
|
||||
--- a/arch/mips/bcm63xx/Makefile
|
||||
+++ b/arch/mips/bcm63xx/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
|
@ -46,8 +42,6 @@ index 00064b6..be5d7ad 100644
|
|||
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
||||
|
||||
obj-y += boards/
|
||||
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
index ea17941..e2c0c36 100644
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -24,6 +24,7 @@
|
||||
|
@ -58,7 +52,7 @@ index ea17941..e2c0c36 100644
|
|||
#include <board_bcm963xx.h>
|
||||
|
||||
#define PFX "board_bcm963xx: "
|
||||
@@ -803,6 +804,9 @@ int __init board_register_devices(void)
|
||||
@@ -804,6 +805,9 @@ int __init board_register_devices(void)
|
||||
!board_get_mac_address(board.enet1.mac_addr))
|
||||
bcm63xx_enet_register(1, &board.enet1);
|
||||
|
||||
|
@ -68,9 +62,6 @@ index ea17941..e2c0c36 100644
|
|||
if (board.has_dsp)
|
||||
bcm63xx_dsp_register(&board.dsp);
|
||||
|
||||
diff --git a/arch/mips/bcm63xx/dev-usb-ohci.c b/arch/mips/bcm63xx/dev-usb-ohci.c
|
||||
new file mode 100644
|
||||
index 0000000..f1fb442
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/bcm63xx/dev-usb-ohci.c
|
||||
@@ -0,0 +1,49 @@
|
||||
|
@ -123,9 +114,6 @@ index 0000000..f1fb442
|
|||
+ ohci_resources[1].start = bcm63xx_get_irq_number(IRQ_OHCI0);
|
||||
+ return platform_device_register(&bcm63xx_ohci_device);
|
||||
+}
|
||||
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h
|
||||
new file mode 100644
|
||||
index 0000000..518a04d
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h
|
||||
@@ -0,0 +1,6 @@
|
||||
|
@ -135,7 +123,3 @@ index 0000000..518a04d
|
|||
+int bcm63xx_ohci_register(void);
|
||||
+
|
||||
+#endif /* BCM63XX_DEV_USB_OHCI_H_ */
|
||||
--
|
||||
1.6.3.3
|
||||
|
||||
|
||||
|
|
|
@ -13,8 +13,6 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|||
create mode 100644 arch/mips/bcm63xx/dev-usb-ehci.c
|
||||
create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
|
||||
|
||||
diff --git a/arch/mips/bcm63xx/Kconfig b/arch/mips/bcm63xx/Kconfig
|
||||
index 76fbbf7..4aa21e8 100644
|
||||
--- a/arch/mips/bcm63xx/Kconfig
|
||||
+++ b/arch/mips/bcm63xx/Kconfig
|
||||
@@ -26,6 +26,8 @@ config BCM63XX_CPU_6358
|
||||
|
@ -26,8 +24,6 @@ index 76fbbf7..4aa21e8 100644
|
|||
endmenu
|
||||
|
||||
source "arch/mips/bcm63xx/boards/Kconfig"
|
||||
diff --git a/arch/mips/bcm63xx/Makefile b/arch/mips/bcm63xx/Makefile
|
||||
index be5d7ad..6e229c2 100644
|
||||
--- a/arch/mips/bcm63xx/Makefile
|
||||
+++ b/arch/mips/bcm63xx/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
|
@ -38,8 +34,6 @@ index be5d7ad..6e229c2 100644
|
|||
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
||||
|
||||
obj-y += boards/
|
||||
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
index e2c0c36..b0d3db3 100644
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -25,6 +25,7 @@
|
||||
|
@ -50,7 +44,7 @@ index e2c0c36..b0d3db3 100644
|
|||
#include <board_bcm963xx.h>
|
||||
|
||||
#define PFX "board_bcm963xx: "
|
||||
@@ -804,6 +805,9 @@ int __init board_register_devices(void)
|
||||
@@ -805,6 +806,9 @@ int __init board_register_devices(void)
|
||||
!board_get_mac_address(board.enet1.mac_addr))
|
||||
bcm63xx_enet_register(1, &board.enet1);
|
||||
|
||||
|
@ -60,9 +54,6 @@ index e2c0c36..b0d3db3 100644
|
|||
if (board.has_ohci0)
|
||||
bcm63xx_ohci_register();
|
||||
|
||||
diff --git a/arch/mips/bcm63xx/dev-usb-ehci.c b/arch/mips/bcm63xx/dev-usb-ehci.c
|
||||
new file mode 100644
|
||||
index 0000000..4bdd675
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/bcm63xx/dev-usb-ehci.c
|
||||
@@ -0,0 +1,49 @@
|
||||
|
@ -115,9 +106,6 @@ index 0000000..4bdd675
|
|||
+ ehci_resources[1].start = bcm63xx_get_irq_number(IRQ_EHCI0);
|
||||
+ return platform_device_register(&bcm63xx_ehci_device);
|
||||
+}
|
||||
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
|
||||
new file mode 100644
|
||||
index 0000000..17fb519
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
|
||||
@@ -0,0 +1,6 @@
|
||||
|
@ -127,7 +115,3 @@ index 0000000..17fb519
|
|||
+int bcm63xx_ehci_register(void);
|
||||
+
|
||||
+#endif /* BCM63XX_DEV_USB_EHCI_H_ */
|
||||
--
|
||||
1.6.3.3
|
||||
|
||||
|
||||
|
|
|
@ -6,8 +6,6 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|||
arch/mips/bcm63xx/gpio.c | 2 --
|
||||
1 files changed, 0 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
|
||||
index 87ca390..3725345 100644
|
||||
--- a/arch/mips/bcm63xx/gpio.c
|
||||
+++ b/arch/mips/bcm63xx/gpio.c
|
||||
@@ -130,5 +130,3 @@ int __init bcm63xx_gpio_init(void)
|
||||
|
@ -16,7 +14,3 @@ index 87ca390..3725345 100644
|
|||
}
|
||||
-
|
||||
-arch_initcall(bcm63xx_gpio_init);
|
||||
--
|
||||
1.6.3.3
|
||||
|
||||
|
||||
|
|
|
@ -6,9 +6,6 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|||
3 files changed, 172 insertions(+), 1 deletions(-)
|
||||
create mode 100644 drivers/usb/host/ohci-bcm63xx.c
|
||||
|
||||
diff --git a/drivers/usb/host/ohci-bcm63xx.c b/drivers/usb/host/ohci-bcm63xx.c
|
||||
new file mode 100644
|
||||
index 0000000..c9bccec
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/host/ohci-bcm63xx.c
|
||||
@@ -0,0 +1,166 @@
|
||||
|
@ -178,8 +175,6 @@ index 0000000..c9bccec
|
|||
+};
|
||||
+
|
||||
+MODULE_ALIAS("platform:bcm63xx_ohci");
|
||||
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
|
||||
index 24eb747..1c82a60 100644
|
||||
--- a/drivers/usb/host/ohci-hcd.c
|
||||
+++ b/drivers/usb/host/ohci-hcd.c
|
||||
@@ -1051,6 +1051,11 @@ MODULE_LICENSE ("GPL");
|
||||
|
@ -194,11 +189,9 @@ index 24eb747..1c82a60 100644
|
|||
#if defined(CONFIG_CPU_SUBTYPE_SH7720) || \
|
||||
defined(CONFIG_CPU_SUBTYPE_SH7721) || \
|
||||
defined(CONFIG_CPU_SUBTYPE_SH7763) || \
|
||||
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
|
||||
index 5bf15fe..3c54d3e 100644
|
||||
--- a/drivers/usb/host/ohci.h
|
||||
+++ b/drivers/usb/host/ohci.h
|
||||
@@ -655,7 +655,7 @@ static inline u32 hc32_to_cpup (const struct ohci_hcd *ohci, const __hc32 *x)
|
||||
@@ -655,7 +655,7 @@ static inline u32 hc32_to_cpup (const st
|
||||
* some big-endian SOC implementations. Same thing happens with PSW access.
|
||||
*/
|
||||
|
||||
|
@ -207,7 +200,3 @@ index 5bf15fe..3c54d3e 100644
|
|||
#define big_endian_frame_no_quirk(ohci) (ohci->flags & OHCI_QUIRK_FRAME_NO)
|
||||
#else
|
||||
#define big_endian_frame_no_quirk(ohci) 0
|
||||
--
|
||||
1.6.3.3
|
||||
|
||||
|
||||
|
|
|
@ -5,9 +5,6 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|||
2 files changed, 159 insertions(+), 0 deletions(-)
|
||||
create mode 100644 drivers/usb/host/ehci-bcm63xx.c
|
||||
|
||||
diff --git a/drivers/usb/host/ehci-bcm63xx.c b/drivers/usb/host/ehci-bcm63xx.c
|
||||
new file mode 100644
|
||||
index 0000000..50638f7
|
||||
--- /dev/null
|
||||
+++ b/drivers/usb/host/ehci-bcm63xx.c
|
||||
@@ -0,0 +1,154 @@
|
||||
|
@ -165,11 +162,9 @@ index 0000000..50638f7
|
|||
+};
|
||||
+
|
||||
+MODULE_ALIAS("platform:bcm63xx_ehci");
|
||||
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
|
||||
index 1ec3857..8e7c61e 100644
|
||||
--- a/drivers/usb/host/ehci-hcd.c
|
||||
+++ b/drivers/usb/host/ehci-hcd.c
|
||||
@@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL");
|
||||
@@ -1141,6 +1141,11 @@ MODULE_LICENSE ("GPL");
|
||||
#define PLATFORM_DRIVER ehci_atmel_driver
|
||||
#endif
|
||||
|
||||
|
@ -181,7 +176,3 @@ index 1ec3857..8e7c61e 100644
|
|||
#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
|
||||
!defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
|
||||
#error "missing bus glue for ehci-hcd"
|
||||
--
|
||||
1.6.3.3
|
||||
|
||||
|
||||
|
|
|
@ -5,8 +5,6 @@ compilation of the bcm63xx defconfig against USB.
|
|||
|
||||
Signed-off-by: Florian Fainelli <ffainelli@freebox.fr>
|
||||
---
|
||||
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
|
||||
index 436878e..65d7843 100644
|
||||
--- a/arch/mips/include/asm/io.h
|
||||
+++ b/arch/mips/include/asm/io.h
|
||||
@@ -447,6 +447,9 @@ __BUILDIO(q, u64)
|
||||
|
@ -19,6 +17,3 @@ index 436878e..65d7843 100644
|
|||
/*
|
||||
* Some code tests for these symbols
|
||||
*/
|
||||
--
|
||||
|
||||
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
Index: linux-2.6.32.9/drivers/watchdog/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/drivers/watchdog/Makefile 2010-02-23 16:38:51.000000000 +0100
|
||||
+++ linux-2.6.32.9/drivers/watchdog/Makefile 2010-02-28 18:13:51.000000000 +0100
|
||||
@@ -113,6 +113,7 @@
|
||||
--- a/drivers/watchdog/Makefile
|
||||
+++ b/drivers/watchdog/Makefile
|
||||
@@ -113,6 +113,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
|
||||
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
|
||||
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
|
||||
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
|
||||
|
@ -10,11 +8,9 @@ Index: linux-2.6.32.9/drivers/watchdog/Makefile
|
|||
|
||||
# PARISC Architecture
|
||||
|
||||
Index: linux-2.6.32.9/drivers/watchdog/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/drivers/watchdog/Kconfig 2010-02-23 16:38:51.000000000 +0100
|
||||
+++ linux-2.6.32.9/drivers/watchdog/Kconfig 2010-02-28 18:13:51.000000000 +0100
|
||||
@@ -850,6 +850,16 @@
|
||||
--- a/drivers/watchdog/Kconfig
|
||||
+++ b/drivers/watchdog/Kconfig
|
||||
@@ -850,6 +850,16 @@ config TXX9_WDT
|
||||
help
|
||||
Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
|
||||
|
||||
|
@ -31,10 +27,8 @@ Index: linux-2.6.32.9/drivers/watchdog/Kconfig
|
|||
# PARISC Architecture
|
||||
|
||||
# POWERPC Architecture
|
||||
Index: linux-2.6.32.9/drivers/watchdog/bcm63xx_wdt.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.32.9/drivers/watchdog/bcm63xx_wdt.c 2010-02-28 18:17:15.000000000 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/watchdog/bcm63xx_wdt.c
|
||||
@@ -0,0 +1,334 @@
|
||||
+/*
|
||||
+ * Broadcom BCM63xx SoC watchdog driver
|
||||
|
|
|
@ -11,11 +11,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
|
|||
drivers/mtd/redboot.c | 13 ++++++++++---
|
||||
3 files changed, 18 insertions(+), 3 deletions(-)
|
||||
|
||||
Index: linux-2.6.32.9/drivers/mtd/maps/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/drivers/mtd/maps/Kconfig 2010-02-28 18:16:50.000000000 +0100
|
||||
+++ linux-2.6.32.9/drivers/mtd/maps/Kconfig 2010-02-28 18:18:20.000000000 +0100
|
||||
@@ -259,6 +259,13 @@
|
||||
--- a/drivers/mtd/maps/Kconfig
|
||||
+++ b/drivers/mtd/maps/Kconfig
|
||||
@@ -259,6 +259,13 @@ config MTD_ALCHEMY
|
||||
help
|
||||
Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards
|
||||
|
||||
|
@ -29,11 +27,9 @@ Index: linux-2.6.32.9/drivers/mtd/maps/Kconfig
|
|||
config MTD_DILNETPC
|
||||
tristate "CFI Flash device mapped on DIL/Net PC"
|
||||
depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
|
||||
Index: linux-2.6.32.9/drivers/mtd/redboot.c
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/drivers/mtd/redboot.c 2010-02-28 18:16:50.000000000 +0100
|
||||
+++ linux-2.6.32.9/drivers/mtd/redboot.c 2010-02-28 18:18:20.000000000 +0100
|
||||
@@ -39,7 +39,7 @@
|
||||
--- a/drivers/mtd/redboot.c
|
||||
+++ b/drivers/mtd/redboot.c
|
||||
@@ -39,7 +39,7 @@ static inline int redboot_checksum(struc
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -42,7 +38,7 @@ Index: linux-2.6.32.9/drivers/mtd/redboot.c
|
|||
struct mtd_partition **pparts,
|
||||
unsigned long fis_origin)
|
||||
{
|
||||
@@ -162,6 +162,14 @@
|
||||
@@ -162,6 +162,14 @@ static int parse_redboot_partitions(stru
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -57,7 +53,7 @@ Index: linux-2.6.32.9/drivers/mtd/redboot.c
|
|||
for (i = 0; i < numslots; i++) {
|
||||
struct fis_list *new_fl, **prev;
|
||||
|
||||
@@ -184,9 +192,8 @@
|
||||
@@ -184,9 +192,8 @@ static int parse_redboot_partitions(stru
|
||||
new_fl->img = &buf[i];
|
||||
if (fis_origin) {
|
||||
buf[i].flash_base -= fis_origin;
|
||||
|
@ -68,19 +64,15 @@ Index: linux-2.6.32.9/drivers/mtd/redboot.c
|
|||
|
||||
/* I'm sure the JFFS2 code has done me permanent damage.
|
||||
* I now think the following is _normal_
|
||||
Index: linux-2.6.32.9/drivers/mtd/maps/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/drivers/mtd/maps/Makefile 2010-02-28 18:16:50.000000000 +0100
|
||||
+++ linux-2.6.32.9/drivers/mtd/maps/Makefile 2010-02-28 18:18:20.000000000 +0100
|
||||
@@ -61,3 +61,4 @@
|
||||
--- a/drivers/mtd/maps/Makefile
|
||||
+++ b/drivers/mtd/maps/Makefile
|
||||
@@ -61,3 +61,4 @@ obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-asy
|
||||
obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o
|
||||
obj-$(CONFIG_MTD_VMU) += vmu-flash.o
|
||||
obj-$(CONFIG_MTD_GPIO_ADDR) += gpio-addr-flash.o
|
||||
+obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o
|
||||
Index: linux-2.6.32.9/drivers/mtd/maps/bcm963xx-flash.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.32.9/drivers/mtd/maps/bcm963xx-flash.c 2010-02-28 18:18:20.000000000 +0100
|
||||
--- /dev/null
|
||||
+++ b/drivers/mtd/maps/bcm963xx-flash.c
|
||||
@@ -0,0 +1,399 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2006-2008 Florian Fainelli <florian@openwrt.org>
|
||||
|
@ -481,10 +473,8 @@ Index: linux-2.6.32.9/drivers/mtd/maps/bcm963xx-flash.c
|
|||
+MODULE_DESCRIPTION("Broadcom BCM63xx MTD partition parser/mapping for CFE and RedBoot");
|
||||
+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
|
||||
+MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>");
|
||||
Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm_tag.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm_tag.h 2010-02-28 18:18:20.000000000 +0100
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm_tag.h
|
||||
@@ -0,0 +1,178 @@
|
||||
+#ifndef __BCM63XX_TAG_H
|
||||
+#define __BCM63XX_TAG_H
|
||||
|
@ -664,11 +654,9 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm_tag.h
|
|||
+};
|
||||
+
|
||||
+#endif /* __BCM63XX_TAG_H */
|
||||
Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:23:48.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:24:06.000000000 +0100
|
||||
@@ -722,20 +722,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -722,20 +722,6 @@ static int board_get_mac_address(u8 *mac
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -689,7 +677,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
static struct resource mtd_resources[] = {
|
||||
{
|
||||
.start = 0, /* filled at runtime */
|
||||
@@ -745,12 +731,9 @@
|
||||
@@ -745,12 +731,9 @@ static struct resource mtd_resources[] =
|
||||
};
|
||||
|
||||
static struct platform_device mtd_dev = {
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
Index: linux-2.6.32.9/drivers/net/bcm63xx_enet.c
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/drivers/net/bcm63xx_enet.c 2010-02-28 18:18:37.000000000 +0100
|
||||
+++ linux-2.6.32.9/drivers/net/bcm63xx_enet.c 2010-02-28 18:20:03.000000000 +0100
|
||||
@@ -1526,7 +1526,7 @@
|
||||
--- a/drivers/net/bcm63xx_enet.c
|
||||
+++ b/drivers/net/bcm63xx_enet.c
|
||||
@@ -1526,7 +1526,7 @@ static int compute_hw_mtu(struct bcm_ene
|
||||
actual_mtu = mtu;
|
||||
|
||||
/* add ethernet header + vlan tag size */
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:37:27.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:41:36.000000000 +0100
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -15,6 +15,8 @@
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/mtd/physmap.h>
|
||||
|
@ -11,7 +9,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
#include <asm/addrspace.h>
|
||||
#include <bcm63xx_board.h>
|
||||
#include <bcm63xx_cpu.h>
|
||||
@@ -288,6 +290,16 @@
|
||||
@@ -288,6 +290,16 @@ static struct board_info __initdata boar
|
||||
.active_low = 1,
|
||||
},
|
||||
},
|
||||
|
@ -28,7 +26,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
};
|
||||
|
||||
static struct board_info __initdata board_96348gw = {
|
||||
@@ -345,6 +357,16 @@
|
||||
@@ -345,6 +357,16 @@ static struct board_info __initdata boar
|
||||
.active_low = 1,
|
||||
},
|
||||
},
|
||||
|
@ -45,7 +43,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
};
|
||||
|
||||
static struct board_info __initdata board_FAST2404 = {
|
||||
@@ -771,6 +793,16 @@
|
||||
@@ -771,6 +793,16 @@ static struct platform_device bcm63xx_gp
|
||||
.dev.platform_data = &bcm63xx_led_data,
|
||||
};
|
||||
|
||||
|
@ -62,7 +60,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
/*
|
||||
* third stage init callback, register all board devices.
|
||||
*/
|
||||
@@ -826,6 +858,13 @@
|
||||
@@ -826,6 +858,13 @@ int __init board_register_devices(void)
|
||||
|
||||
platform_device_register(&bcm63xx_gpio_leds);
|
||||
|
||||
|
@ -76,11 +74,9 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
return 0;
|
||||
}
|
||||
|
||||
Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 18:36:33.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 18:36:58.000000000 +0100
|
||||
@@ -55,6 +55,9 @@
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
@@ -55,6 +55,9 @@ struct board_info {
|
||||
|
||||
/* GPIO LEDs */
|
||||
struct gpio_led leds[5];
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:42:13.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:43:29.000000000 +0100
|
||||
@@ -785,6 +785,10 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -785,6 +785,10 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
};
|
||||
#endif
|
||||
|
||||
|
@ -13,7 +11,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
static struct gpio_led_platform_data bcm63xx_led_data;
|
||||
|
||||
static struct platform_device bcm63xx_gpio_leds = {
|
||||
@@ -853,6 +857,8 @@
|
||||
@@ -853,6 +857,8 @@ int __init board_register_devices(void)
|
||||
|
||||
platform_device_register(&mtd_dev);
|
||||
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:45:23.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:47:09.000000000 +0100
|
||||
@@ -393,6 +393,25 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -393,6 +393,25 @@ static struct board_info __initdata boar
|
||||
.has_ehci0 = 1,
|
||||
};
|
||||
|
||||
|
@ -28,7 +26,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
static struct board_info __initdata board_DV201AMR = {
|
||||
.name = "DV201AMR",
|
||||
.expected_cpu_id = 0x6348,
|
||||
@@ -577,6 +596,7 @@
|
||||
@@ -577,6 +596,7 @@ static const struct board_info __initdat
|
||||
&board_FAST2404,
|
||||
&board_DV201AMR,
|
||||
&board_96348gw_a,
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:47:31.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:49:16.000000000 +0100
|
||||
@@ -575,6 +575,27 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -575,6 +575,27 @@ static struct board_info __initdata boar
|
||||
.has_ohci0 = 1,
|
||||
.has_ehci0 = 1,
|
||||
};
|
||||
|
@ -30,7 +28,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
#endif
|
||||
|
||||
/*
|
||||
@@ -603,6 +624,7 @@
|
||||
@@ -603,6 +624,7 @@ static const struct board_info __initdat
|
||||
&board_96358vw,
|
||||
&board_96358vw2,
|
||||
&board_AGPFS0,
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:50:37.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:54:31.000000000 +0100
|
||||
@@ -336,24 +336,39 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -336,24 +336,39 @@ static struct board_info __initdata boar
|
||||
.active_low = 1,
|
||||
},
|
||||
{
|
||||
|
@ -50,7 +48,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
.active_low = 1,
|
||||
},
|
||||
},
|
||||
@@ -855,6 +870,7 @@
|
||||
@@ -855,6 +870,7 @@ static struct platform_device bcm63xx_gp
|
||||
int __init board_register_devices(void)
|
||||
{
|
||||
u32 val;
|
||||
|
@ -58,7 +56,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
|
||||
if (board.has_pccard)
|
||||
bcm63xx_pcmcia_register();
|
||||
@@ -901,7 +917,11 @@
|
||||
@@ -901,7 +917,11 @@ int __init board_register_devices(void)
|
||||
|
||||
platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
|
||||
|
||||
|
@ -71,11 +69,9 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
bcm63xx_led_data.leds = board.leds;
|
||||
|
||||
platform_device_register(&bcm63xx_gpio_leds);
|
||||
Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 18:54:39.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 18:54:49.000000000 +0100
|
||||
@@ -54,7 +54,7 @@
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
@@ -54,7 +54,7 @@ struct board_info {
|
||||
struct bcm63xx_dsp_platform_data dsp;
|
||||
|
||||
/* GPIO LEDs */
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 18:55:54.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 19:01:23.000000000 +0100
|
||||
@@ -589,6 +589,63 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -589,6 +589,63 @@ static struct board_info __initdata boar
|
||||
|
||||
.has_ohci0 = 1,
|
||||
.has_ehci0 = 1,
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h 2010-02-28 19:02:10.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h 2010-02-28 19:02:40.000000000 +0100
|
||||
@@ -10,6 +10,10 @@
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
|
||||
@@ -10,6 +10,10 @@ static inline unsigned long bcm63xx_gpio
|
||||
switch (bcm63xx_get_cpu_id()) {
|
||||
case BCM6358_CPU_ID:
|
||||
return 40;
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/Kconfig 2010-02-28 19:03:38.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/Kconfig 2010-02-28 19:04:38.000000000 +0100
|
||||
@@ -8,4 +8,10 @@
|
||||
--- a/arch/mips/bcm63xx/boards/Kconfig
|
||||
+++ b/arch/mips/bcm63xx/boards/Kconfig
|
||||
@@ -8,4 +8,10 @@ config BOARD_BCM963XX
|
||||
select SSB
|
||||
help
|
||||
|
||||
|
@ -13,20 +11,16 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/Kconfig
|
|||
+ Inventel Livebox boards using the RedBoot bootloader.
|
||||
+
|
||||
endchoice
|
||||
Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/Makefile 2010-02-28 19:03:45.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/Makefile 2010-02-28 19:04:54.000000000 +0100
|
||||
--- a/arch/mips/bcm63xx/boards/Makefile
|
||||
+++ b/arch/mips/bcm63xx/boards/Makefile
|
||||
@@ -1,3 +1,4 @@
|
||||
obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o
|
||||
+obj-$(CONFIG_BOARD_LIVEBOX) += board_livebox.o
|
||||
|
||||
EXTRA_CFLAGS += -Werror
|
||||
Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_livebox.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_livebox.c 2010-02-28 19:05:16.000000000 +0100
|
||||
@@ -0,0 +1,227 @@
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/bcm63xx/boards/board_livebox.c
|
||||
@@ -0,0 +1,223 @@
|
||||
+/*
|
||||
+ * This file is subject to the terms and conditions of the GNU General Public
|
||||
+ * License. See the file "COPYING" in the main directory of this archive
|
||||
|
@ -42,15 +36,14 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_livebox.c
|
|||
+#include <linux/mtd/mtd.h>
|
||||
+#include <linux/mtd/partitions.h>
|
||||
+#include <linux/mtd/physmap.h>
|
||||
+#include <linux/input.h>
|
||||
+#include <linux/gpio_buttons.h>
|
||||
+#include <asm/addrspace.h>
|
||||
+#include <bcm63xx_board.h>
|
||||
+#include <bcm63xx_cpu.h>
|
||||
+#include <bcm63xx_regs.h>
|
||||
+#include <bcm63xx_io.h>
|
||||
+#include <bcm63xx_board.h>
|
||||
+#include <bcm63xx_dev_pci.h>
|
||||
+#include <bcm63xx_dev_uart.h>
|
||||
+#include <bcm63xx_dev_wdt.h>
|
||||
+#include <bcm63xx_dev_enet.h>
|
||||
+#include <bcm63xx_dev_pcmcia.h>
|
||||
+#include <bcm63xx_dev_usb_ohci.h>
|
||||
|
@ -222,9 +215,6 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_livebox.c
|
|||
+{
|
||||
+ u32 val;
|
||||
+
|
||||
+ bcm63xx_uart_register();
|
||||
+ bcm63xx_wdt_register();
|
||||
+
|
||||
+ if (board.has_pccard)
|
||||
+ bcm63xx_pcmcia_register();
|
||||
+
|
||||
|
@ -248,7 +238,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_livebox.c
|
|||
+ val &= MPI_CSBASE_BASE_MASK;
|
||||
+ mtd_resources[0].start = val;
|
||||
+ mtd_resources[0].end = 0x1FFFFFFF;
|
||||
+
|
||||
+
|
||||
+ platform_device_register(&mtd_dev);
|
||||
+
|
||||
+ return 0;
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 19:16:53.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 19:16:55.000000000 +0100
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <bcm63xx_dev_pcmcia.h>
|
||||
#include <bcm63xx_dev_usb_ohci.h>
|
||||
|
@ -10,7 +8,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
#include <board_bcm963xx.h>
|
||||
|
||||
#define PFX "board_bcm963xx: "
|
||||
@@ -406,6 +407,7 @@
|
||||
@@ -406,6 +407,7 @@ static struct board_info __initdata boar
|
||||
.has_ohci0 = 1,
|
||||
.has_pccard = 1,
|
||||
.has_ehci0 = 1,
|
||||
|
@ -18,7 +16,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
};
|
||||
|
||||
static struct board_info __initdata board_rta1025w_16 = {
|
||||
@@ -949,6 +951,9 @@
|
||||
@@ -949,6 +951,9 @@ int __init board_register_devices(void)
|
||||
if (board.has_dsp)
|
||||
bcm63xx_dsp_register(&board.dsp);
|
||||
|
||||
|
@ -28,10 +26,8 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|||
/* Generate MAC address for WLAN and
|
||||
* register our SPROM */
|
||||
#ifdef CONFIG_SSB_PCIHOST
|
||||
Index: linux-2.6.32.9/arch/mips/bcm63xx/dev-usb-udc.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/dev-usb-udc.c 2010-02-28 19:16:55.000000000 +0100
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/bcm63xx/dev-usb-udc.c
|
||||
@@ -0,0 +1,58 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2009 Henk Vergonet <Henk.Vergonet@gmail.com>
|
||||
|
@ -91,11 +87,9 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/dev-usb-udc.c
|
|||
+ udc_resources[1].start = bcm63xx_get_irq_number(IRQ_UDC0);
|
||||
+ return platform_device_register(&bcm63xx_udc_device);
|
||||
+}
|
||||
Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h 2010-02-28 19:16:53.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h 2010-02-28 19:16:55.000000000 +0100
|
||||
@@ -125,7 +125,7 @@
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
|
||||
@@ -125,7 +125,7 @@ enum bcm63xx_regs_set {
|
||||
#define BCM_6338_UART0_BASE (0xfffe0300)
|
||||
#define BCM_6338_GPIO_BASE (0xfffe0400)
|
||||
#define BCM_6338_SPI_BASE (0xfffe0c00)
|
||||
|
@ -104,7 +98,7 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
|
|||
#define BCM_6338_USBDMA_BASE (0xfffe2400)
|
||||
#define BCM_6338_OHCI0_BASE (0xdeadbeef)
|
||||
#define BCM_6338_OHCI_PRIV_BASE (0xfffe3000)
|
||||
@@ -155,7 +155,7 @@
|
||||
@@ -155,7 +155,7 @@ enum bcm63xx_regs_set {
|
||||
#define BCM_6345_UART0_BASE (0xfffe0300)
|
||||
#define BCM_6345_GPIO_BASE (0xfffe0400)
|
||||
#define BCM_6345_SPI_BASE (0xdeadbeef)
|
||||
|
@ -113,7 +107,7 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
|
|||
#define BCM_6345_USBDMA_BASE (0xfffe2800)
|
||||
#define BCM_6345_ENET0_BASE (0xfffe1800)
|
||||
#define BCM_6345_ENETDMA_BASE (0xfffe2800)
|
||||
@@ -210,7 +210,7 @@
|
||||
@@ -210,7 +210,7 @@ enum bcm63xx_regs_set {
|
||||
#define BCM_6358_UART0_BASE (0xfffe0100)
|
||||
#define BCM_6358_GPIO_BASE (0xfffe0080)
|
||||
#define BCM_6358_SPI_BASE (0xdeadbeef)
|
||||
|
@ -122,7 +116,7 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
|
|||
#define BCM_6358_OHCI0_BASE (0xfffe1400)
|
||||
#define BCM_6358_OHCI_PRIV_BASE (0xdeadbeef)
|
||||
#define BCM_6358_USBH_PRIV_BASE (0xfffe1500)
|
||||
@@ -430,6 +430,7 @@
|
||||
@@ -430,6 +430,7 @@ enum bcm63xx_irq {
|
||||
IRQ_TIMER = 0,
|
||||
IRQ_UART0,
|
||||
IRQ_DSL,
|
||||
|
@ -130,7 +124,7 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
|
|||
IRQ_ENET0,
|
||||
IRQ_ENET1,
|
||||
IRQ_ENET_PHY,
|
||||
@@ -472,7 +473,7 @@
|
||||
@@ -472,7 +473,7 @@ enum bcm63xx_irq {
|
||||
#define BCM_6345_UART0_IRQ (IRQ_INTERNAL_BASE + 2)
|
||||
#define BCM_6345_DSL_IRQ (IRQ_INTERNAL_BASE + 3)
|
||||
#define BCM_6345_ATM_IRQ (IRQ_INTERNAL_BASE + 4)
|
||||
|
@ -139,7 +133,7 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
|
|||
#define BCM_6345_ENET0_IRQ (IRQ_INTERNAL_BASE + 8)
|
||||
#define BCM_6345_ENET_PHY_IRQ (IRQ_INTERNAL_BASE + 12)
|
||||
#define BCM_6345_ENET0_RXDMA_IRQ (IRQ_INTERNAL_BASE + 13 + 1)
|
||||
@@ -494,10 +495,17 @@
|
||||
@@ -494,10 +495,17 @@ enum bcm63xx_irq {
|
||||
#define BCM_6348_TIMER_IRQ (IRQ_INTERNAL_BASE + 0)
|
||||
#define BCM_6348_UART0_IRQ (IRQ_INTERNAL_BASE + 2)
|
||||
#define BCM_6348_DSL_IRQ (IRQ_INTERNAL_BASE + 4)
|
||||
|
@ -157,10 +151,8 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
|
|||
#define BCM_6348_ENET0_RXDMA_IRQ (IRQ_INTERNAL_BASE + 20)
|
||||
#define BCM_6348_ENET0_TXDMA_IRQ (IRQ_INTERNAL_BASE + 21)
|
||||
#define BCM_6348_ENET1_RXDMA_IRQ (IRQ_INTERNAL_BASE + 22)
|
||||
Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h 2010-02-28 19:16:55.000000000 +0100
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h
|
||||
@@ -0,0 +1,6 @@
|
||||
+#ifndef BCM63XX_DEV_USB_UDC_H_
|
||||
+#define BCM63XX_DEV_USB_UDC_H_
|
||||
|
@ -168,11 +160,9 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h
|
|||
+int bcm63xx_udc_register(void);
|
||||
+
|
||||
+#endif /* BCM63XX_DEV_USB_UDC_H_ */
|
||||
Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 19:16:53.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 19:17:21.000000000 +0100
|
||||
@@ -45,6 +45,7 @@
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
||||
@@ -45,6 +45,7 @@ struct board_info {
|
||||
unsigned int has_ohci0:1;
|
||||
unsigned int has_ehci0:1;
|
||||
unsigned int has_dsp:1;
|
||||
|
@ -180,10 +170,8 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
|||
|
||||
/* ethernet config */
|
||||
struct bcm63xx_enet_platform_data enet0;
|
||||
Index: linux-2.6.32.9/arch/mips/bcm63xx/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/Makefile 2010-02-28 19:17:32.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/Makefile 2010-02-28 19:17:39.000000000 +0100
|
||||
--- a/arch/mips/bcm63xx/Makefile
|
||||
+++ b/arch/mips/bcm63xx/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
obj-y += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
|
||||
dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o dev-wdt.o \
|
||||
|
@ -192,11 +180,9 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/Makefile
|
|||
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
||||
|
||||
obj-y += boards/
|
||||
Index: linux-2.6.32.9/arch/mips/bcm63xx/clk.c
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/clk.c 2010-02-28 19:19:22.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/clk.c 2010-02-28 19:25:39.000000000 +0100
|
||||
@@ -141,6 +141,30 @@
|
||||
--- a/arch/mips/bcm63xx/clk.c
|
||||
+++ b/arch/mips/bcm63xx/clk.c
|
||||
@@ -141,6 +141,30 @@ static struct clk clk_usbh = {
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -227,7 +213,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/clk.c
|
|||
* SPI clock
|
||||
*/
|
||||
static void spi_set(struct clk *clk, int enable)
|
||||
@@ -208,6 +232,8 @@
|
||||
@@ -208,6 +232,8 @@ struct clk *clk_get(struct device *dev,
|
||||
return &clk_ephy;
|
||||
if (!strcmp(id, "usbh"))
|
||||
return &clk_usbh;
|
||||
|
@ -236,11 +222,9 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/clk.c
|
|||
if (!strcmp(id, "spi"))
|
||||
return &clk_spi;
|
||||
if (!strcmp(id, "periph"))
|
||||
Index: linux-2.6.32.9/arch/mips/bcm63xx/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.32.9.orig/arch/mips/bcm63xx/Kconfig 2010-02-28 19:29:37.000000000 +0100
|
||||
+++ linux-2.6.32.9/arch/mips/bcm63xx/Kconfig 2010-02-28 19:29:51.000000000 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
--- a/arch/mips/bcm63xx/Kconfig
|
||||
+++ b/arch/mips/bcm63xx/Kconfig
|
||||
@@ -7,6 +7,7 @@ config BCM63XX_CPU_6338
|
||||
select USB_ARCH_HAS_OHCI
|
||||
select USB_OHCI_BIG_ENDIAN_DESC
|
||||
select USB_OHCI_BIG_ENDIAN_MMIO
|
||||
|
@ -248,7 +232,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/Kconfig
|
|||
|
||||
config BCM63XX_CPU_6345
|
||||
bool "support 6345 CPU"
|
||||
@@ -19,6 +20,7 @@
|
||||
@@ -19,6 +20,7 @@ config BCM63XX_CPU_6348
|
||||
select USB_ARCH_HAS_OHCI
|
||||
select USB_OHCI_BIG_ENDIAN_DESC
|
||||
select USB_OHCI_BIG_ENDIAN_MMIO
|
||||
|
|
|
@ -6,8 +6,6 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|||
.../asm/mach-bcm63xx/cpu-feature-overrides.h | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
|
||||
index 71742ba..f453c01 100644
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
|
||||
@@ -24,7 +24,7 @@
|
||||
|
@ -19,7 +17,3 @@ index 71742ba..f453c01 100644
|
|||
#define cpu_has_dc_aliases 0
|
||||
#endif
|
||||
|
||||
--
|
||||
1.6.3.3
|
||||
|
||||
|
||||
|
|
|
@ -6,11 +6,9 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|||
arch/mips/bcm63xx/gpio.c | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
|
||||
index 3725345..315bc7f 100644
|
||||
--- a/arch/mips/bcm63xx/gpio.c
|
||||
+++ b/arch/mips/bcm63xx/gpio.c
|
||||
@@ -125,6 +125,8 @@ static struct gpio_chip bcm63xx_gpio_chip = {
|
||||
@@ -125,6 +125,8 @@ static struct gpio_chip bcm63xx_gpio_chi
|
||||
|
||||
int __init bcm63xx_gpio_init(void)
|
||||
{
|
||||
|
@ -19,7 +17,3 @@ index 3725345..315bc7f 100644
|
|||
bcm63xx_gpio_chip.ngpio = bcm63xx_gpio_count();
|
||||
pr_info("registering %d GPIOs\n", bcm63xx_gpio_chip.ngpio);
|
||||
|
||||
--
|
||||
1.6.3.3
|
||||
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
EXTRA_CFLAGS += -Werror
|
||||
--- /dev/null
|
||||
+++ b/arch/mips/bcm63xx/boards/board_livebox.c
|
||||
@@ -0,0 +1,227 @@
|
||||
@@ -0,0 +1,223 @@
|
||||
+/*
|
||||
+ * This file is subject to the terms and conditions of the GNU General Public
|
||||
+ * License. See the file "COPYING" in the main directory of this archive
|
||||
|
@ -36,15 +36,14 @@
|
|||
+#include <linux/mtd/mtd.h>
|
||||
+#include <linux/mtd/partitions.h>
|
||||
+#include <linux/mtd/physmap.h>
|
||||
+#include <linux/input.h>
|
||||
+#include <linux/gpio_buttons.h>
|
||||
+#include <asm/addrspace.h>
|
||||
+#include <bcm63xx_board.h>
|
||||
+#include <bcm63xx_cpu.h>
|
||||
+#include <bcm63xx_regs.h>
|
||||
+#include <bcm63xx_io.h>
|
||||
+#include <bcm63xx_board.h>
|
||||
+#include <bcm63xx_dev_pci.h>
|
||||
+#include <bcm63xx_dev_uart.h>
|
||||
+#include <bcm63xx_dev_wdt.h>
|
||||
+#include <bcm63xx_dev_enet.h>
|
||||
+#include <bcm63xx_dev_pcmcia.h>
|
||||
+#include <bcm63xx_dev_usb_ohci.h>
|
||||
|
@ -216,9 +215,6 @@
|
|||
+{
|
||||
+ u32 val;
|
||||
+
|
||||
+ bcm63xx_uart_register();
|
||||
+ bcm63xx_wdt_register();
|
||||
+
|
||||
+ if (board.has_pccard)
|
||||
+ bcm63xx_pcmcia_register();
|
||||
+
|
||||
|
@ -242,7 +238,7 @@
|
|||
+ val &= MPI_CSBASE_BASE_MASK;
|
||||
+ mtd_resources[0].start = val;
|
||||
+ mtd_resources[0].end = 0x1FFFFFFF;
|
||||
+
|
||||
+
|
||||
+ platform_device_register(&mtd_dev);
|
||||
+
|
||||
+ return 0;
|
||||
|
|
Loading…
Reference in a new issue