diff options
| -rw-r--r-- | target/linux/gemini/Makefile | 6 | ||||
| -rw-r--r-- | target/linux/gemini/config-default (renamed from target/linux/gemini/config-3.8) | 6 | ||||
| -rw-r--r-- | target/linux/gemini/patches/000-ARM-gemini-get-platform-to-build-again.patch (renamed from target/linux/gemini/patches-3.8/000-ARM-gemini-get-platform-to-build-again.patch) | 18 | ||||
| -rw-r--r-- | target/linux/gemini/patches/002-arm-gemini-fix-platform_register_rtc-prototype.patch (renamed from target/linux/gemini/patches-3.8/002-arm-gemini-fix-platform_register_rtc-prototype.patch) | 0 | ||||
| -rw-r--r-- | target/linux/gemini/patches/110-watchdog-add-gemini_wdt-driver.patch (renamed from target/linux/gemini/patches-3.8/110-watchdog-add-gemini_wdt-driver.patch) | 2 | ||||
| -rw-r--r-- | target/linux/gemini/patches/111-arm-gemini-add-watchdog-device.patch (renamed from target/linux/gemini/patches-3.8/111-arm-gemini-add-watchdog-device.patch) | 0 | ||||
| -rw-r--r-- | target/linux/gemini/patches/112-arm-gemini-register-watchdog-devices.patch (renamed from target/linux/gemini/patches-3.8/112-arm-gemini-register-watchdog-devices.patch) | 8 | ||||
| -rw-r--r-- | target/linux/gemini/patches/120-net-add-gemini-gmac-driver.patch (renamed from target/linux/gemini/patches-3.8/120-net-add-gemini-gmac-driver.patch) | 2 | ||||
| -rw-r--r-- | target/linux/gemini/patches/121-arm-gemini-add-ethernet-device.patch (renamed from target/linux/gemini/patches-3.8/121-arm-gemini-add-ethernet-device.patch) | 0 | ||||
| -rw-r--r-- | target/linux/gemini/patches/122-arm-gemini-wbd111-register-ethernet.patch (renamed from target/linux/gemini/patches-3.8/122-arm-gemini-wbd111-register-ethernet.patch) | 2 | ||||
| -rw-r--r-- | target/linux/gemini/patches/123-arm-gemini-wbd222-register-eth.patch (renamed from target/linux/gemini/patches-3.8/123-arm-gemini-wbd222-register-eth.patch) | 2 | ||||
| -rw-r--r-- | target/linux/gemini/patches/124-arm-gemini-rut100-register-ethernet.patch (renamed from target/linux/gemini/patches-3.8/124-arm-gemini-rut100-register-ethernet.patch) | 2 | ||||
| -rw-r--r-- | target/linux/gemini/patches/130-usb-ehci-gemini-fot2gxx-support.patch (renamed from target/linux/gemini/patches-3.8/130-usb-ehci-gemini-fot2gxx-support.patch) | 8 | ||||
| -rw-r--r-- | target/linux/gemini/patches/131-arm-gemini-add-usb-platform-device.patch (renamed from target/linux/gemini/patches-3.8/131-arm-gemini-add-usb-platform-device.patch) | 0 | ||||
| -rw-r--r-- | target/linux/gemini/patches/132-arm-gemini-wbd111-register-usb.patch (renamed from target/linux/gemini/patches-3.8/132-arm-gemini-wbd111-register-usb.patch) | 2 | ||||
| -rw-r--r-- | target/linux/gemini/patches/133-arm-gemini-wbd222-register-usb.patch (renamed from target/linux/gemini/patches-3.8/133-arm-gemini-wbd222-register-usb.patch) | 2 | ||||
| -rw-r--r-- | target/linux/gemini/patches/134-arm-gemini-rut100-register-usb.patch (renamed from target/linux/gemini/patches-3.8/134-arm-gemini-rut100-register-usb.patch) | 2 | ||||
| -rw-r--r-- | target/linux/gemini/patches/135-arm-gemini-nas4220-register-usb.patch (renamed from target/linux/gemini/patches-3.8/135-arm-gemini-nas4220-register-usb.patch) | 2 | ||||
| -rw-r--r-- | target/linux/gemini/patches/140-arm-gemini-add-pci-support.patch (renamed from target/linux/gemini/patches-3.8/140-arm-gemini-add-pci-support.patch) | 2 |
19 files changed, 33 insertions, 33 deletions
diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index 29f3bb1c6a..78eb3f7f6c 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2011 OpenWrt.org +# Copyright (C) 2009-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=gemini BOARDNAME:=Cortina Systems CS351x -FEATURES:=squashfs broken +FEATURES:=squashfs pci CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.8.3 +LINUX_VERSION:=3.9-rc4 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/gemini/config-3.8 b/target/linux/gemini/config-default index c4b3e834bf..3f9d8fe8e4 100644 --- a/target/linux/gemini/config-3.8 +++ b/target/linux/gemini/config-default @@ -117,8 +117,8 @@ CONFIG_IP_PIMSM_V2=y CONFIG_KTIME_SCALAR=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -CONFIG_MACH_NAS4220B=y -CONFIG_MACH_RUT100=y +# CONFIG_MACH_NAS4220B is not set +# CONFIG_MACH_RUT100 is not set CONFIG_MACH_WBD111=y CONFIG_MACH_WBD222=y CONFIG_MDIO_BITBANG=y @@ -127,7 +127,7 @@ CONFIG_MDIO_GPIO=y CONFIG_MIGHT_HAVE_PCI=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_REDBOOT_PARTS=y +# CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y CONFIG_NLS=m diff --git a/target/linux/gemini/patches-3.8/000-ARM-gemini-get-platform-to-build-again.patch b/target/linux/gemini/patches/000-ARM-gemini-get-platform-to-build-again.patch index b6635e9b67..25ed5f2609 100644 --- a/target/linux/gemini/patches-3.8/000-ARM-gemini-get-platform-to-build-again.patch +++ b/target/linux/gemini/patches/000-ARM-gemini-get-platform-to-build-again.patch @@ -41,7 +41,7 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -386,6 +386,7 @@ config ARCH_GEMINI +@@ -410,6 +410,7 @@ config ARCH_GEMINI bool "Cortina Systems Gemini" select ARCH_REQUIRE_GPIOLIB select ARCH_USES_GETTIMEOFFSET @@ -62,9 +62,9 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de> obj-$(CONFIG_MACH_NAS4220B) += board-nas4220b.o --- a/arch/arm/mach-gemini/board-nas4220b.c +++ b/arch/arm/mach-gemini/board-nas4220b.c -@@ -107,4 +107,5 @@ MACHINE_START(NAS4220B, "Raidsonic NAS I +@@ -103,4 +103,5 @@ MACHINE_START(NAS4220B, "Raidsonic NAS I .init_irq = gemini_init_irq, - .timer = &ib4220b_timer, + .init_time = gemini_timer_init, .init_machine = ib4220b_init, + .restart = gemini_restart, MACHINE_END @@ -78,25 +78,25 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de> #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -91,4 +92,5 @@ MACHINE_START(RUT100, "Teltonika RUT100" +@@ -87,4 +88,5 @@ MACHINE_START(RUT100, "Teltonika RUT100" .init_irq = gemini_init_irq, - .timer = &rut1xx_timer, + .init_time = gemini_timer_init, .init_machine = rut1xx_init, + .restart = gemini_restart, MACHINE_END --- a/arch/arm/mach-gemini/board-wbd111.c +++ b/arch/arm/mach-gemini/board-wbd111.c -@@ -134,4 +134,5 @@ MACHINE_START(WBD111, "Wiliboard WBD-111 +@@ -130,4 +130,5 @@ MACHINE_START(WBD111, "Wiliboard WBD-111 .init_irq = gemini_init_irq, - .timer = &wbd111_timer, + .init_time = gemini_timer_init, .init_machine = wbd111_init, + .restart = gemini_restart, MACHINE_END --- a/arch/arm/mach-gemini/board-wbd222.c +++ b/arch/arm/mach-gemini/board-wbd222.c -@@ -134,4 +134,5 @@ MACHINE_START(WBD222, "Wiliboard WBD-222 +@@ -130,4 +130,5 @@ MACHINE_START(WBD222, "Wiliboard WBD-222 .init_irq = gemini_init_irq, - .timer = &wbd222_timer, + .init_time = gemini_timer_init, .init_machine = wbd222_init, + .restart = gemini_restart, MACHINE_END diff --git a/target/linux/gemini/patches-3.8/002-arm-gemini-fix-platform_register_rtc-prototype.patch b/target/linux/gemini/patches/002-arm-gemini-fix-platform_register_rtc-prototype.patch index f789f77fd5..f789f77fd5 100644 --- a/target/linux/gemini/patches-3.8/002-arm-gemini-fix-platform_register_rtc-prototype.patch +++ b/target/linux/gemini/patches/002-arm-gemini-fix-platform_register_rtc-prototype.patch diff --git a/target/linux/gemini/patches-3.8/110-watchdog-add-gemini_wdt-driver.patch b/target/linux/gemini/patches/110-watchdog-add-gemini_wdt-driver.patch index a2b6cb705d..31a6896423 100644 --- a/target/linux/gemini/patches-3.8/110-watchdog-add-gemini_wdt-driver.patch +++ b/target/linux/gemini/patches/110-watchdog-add-gemini_wdt-driver.patch @@ -381,7 +381,7 @@ +MODULE_ALIAS("platform:gemini-wdt"); --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig -@@ -152,6 +152,16 @@ config 977_WATCHDOG +@@ -154,6 +154,16 @@ config 977_WATCHDOG Not sure? It's safe to say N. diff --git a/target/linux/gemini/patches-3.8/111-arm-gemini-add-watchdog-device.patch b/target/linux/gemini/patches/111-arm-gemini-add-watchdog-device.patch index 00ca35d96a..00ca35d96a 100644 --- a/target/linux/gemini/patches-3.8/111-arm-gemini-add-watchdog-device.patch +++ b/target/linux/gemini/patches/111-arm-gemini-add-watchdog-device.patch diff --git a/target/linux/gemini/patches-3.8/112-arm-gemini-register-watchdog-devices.patch b/target/linux/gemini/patches/112-arm-gemini-register-watchdog-devices.patch index c2a83a38ab..74564b199e 100644 --- a/target/linux/gemini/patches-3.8/112-arm-gemini-register-watchdog-devices.patch +++ b/target/linux/gemini/patches/112-arm-gemini-register-watchdog-devices.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-gemini/board-nas4220b.c +++ b/arch/arm/mach-gemini/board-nas4220b.c -@@ -99,6 +99,7 @@ static void __init ib4220b_init(void) +@@ -95,6 +95,7 @@ static void __init ib4220b_init(void) platform_device_register(&ib4220b_led_device); platform_device_register(&ib4220b_key_device); platform_register_rtc(); @@ -10,7 +10,7 @@ MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B") --- a/arch/arm/mach-gemini/board-wbd111.c +++ b/arch/arm/mach-gemini/board-wbd111.c -@@ -126,6 +126,7 @@ static void __init wbd111_init(void) +@@ -122,6 +122,7 @@ static void __init wbd111_init(void) platform_device_register(&wbd111_leds_device); platform_device_register(&wbd111_keys_device); platform_register_rtc(); @@ -20,7 +20,7 @@ MACHINE_START(WBD111, "Wiliboard WBD-111") --- a/arch/arm/mach-gemini/board-wbd222.c +++ b/arch/arm/mach-gemini/board-wbd222.c -@@ -126,6 +126,7 @@ static void __init wbd222_init(void) +@@ -122,6 +122,7 @@ static void __init wbd222_init(void) platform_device_register(&wbd222_leds_device); platform_device_register(&wbd222_keys_device); platform_register_rtc(); @@ -30,7 +30,7 @@ MACHINE_START(WBD222, "Wiliboard WBD-222") --- a/arch/arm/mach-gemini/board-rut1xx.c +++ b/arch/arm/mach-gemini/board-rut1xx.c -@@ -84,6 +84,7 @@ static void __init rut1xx_init(void) +@@ -80,6 +80,7 @@ static void __init rut1xx_init(void) platform_device_register(&rut1xx_leds); platform_device_register(&rut1xx_keys_device); platform_register_rtc(); diff --git a/target/linux/gemini/patches-3.8/120-net-add-gemini-gmac-driver.patch b/target/linux/gemini/patches/120-net-add-gemini-gmac-driver.patch index b990a58adc..8801894f7e 100644 --- a/target/linux/gemini/patches-3.8/120-net-add-gemini-gmac-driver.patch +++ b/target/linux/gemini/patches/120-net-add-gemini-gmac-driver.patch @@ -1276,7 +1276,7 @@ + if (register_netdev(dev)) + return -1; + -+ gmac->phydev = phy_connect(dev, pdata->bus_id[num], &gmac_get_phy_status, 0, ++ gmac->phydev = phy_connect(dev, pdata->bus_id[num], &gmac_get_phy_status, + pdata->interface[num]); + if (IS_ERR(gmac->phydev)) + return PTR_ERR(gmac->phydev); diff --git a/target/linux/gemini/patches-3.8/121-arm-gemini-add-ethernet-device.patch b/target/linux/gemini/patches/121-arm-gemini-add-ethernet-device.patch index d6def9b687..d6def9b687 100644 --- a/target/linux/gemini/patches-3.8/121-arm-gemini-add-ethernet-device.patch +++ b/target/linux/gemini/patches/121-arm-gemini-add-ethernet-device.patch diff --git a/target/linux/gemini/patches-3.8/122-arm-gemini-wbd111-register-ethernet.patch b/target/linux/gemini/patches/122-arm-gemini-wbd111-register-ethernet.patch index aa54ade742..1a02b558dd 100644 --- a/target/linux/gemini/patches-3.8/122-arm-gemini-wbd111-register-ethernet.patch +++ b/target/linux/gemini/patches/122-arm-gemini-wbd111-register-ethernet.patch @@ -30,7 +30,7 @@ static struct gpio_keys_button wbd111_keys[] = { { .code = KEY_SETUP, -@@ -127,6 +147,8 @@ static void __init wbd111_init(void) +@@ -123,6 +143,8 @@ static void __init wbd111_init(void) platform_device_register(&wbd111_keys_device); platform_register_rtc(); platform_register_watchdog(); diff --git a/target/linux/gemini/patches-3.8/123-arm-gemini-wbd222-register-eth.patch b/target/linux/gemini/patches/123-arm-gemini-wbd222-register-eth.patch index 621a9ab8b4..32852da283 100644 --- a/target/linux/gemini/patches-3.8/123-arm-gemini-wbd222-register-eth.patch +++ b/target/linux/gemini/patches/123-arm-gemini-wbd222-register-eth.patch @@ -32,7 +32,7 @@ static struct gpio_keys_button wbd222_keys[] = { { .code = KEY_SETUP, -@@ -127,6 +149,8 @@ static void __init wbd222_init(void) +@@ -123,6 +145,8 @@ static void __init wbd222_init(void) platform_device_register(&wbd222_keys_device); platform_register_rtc(); platform_register_watchdog(); diff --git a/target/linux/gemini/patches-3.8/124-arm-gemini-rut100-register-ethernet.patch b/target/linux/gemini/patches/124-arm-gemini-rut100-register-ethernet.patch index 14be011452..e7c55d53e1 100644 --- a/target/linux/gemini/patches-3.8/124-arm-gemini-rut100-register-ethernet.patch +++ b/target/linux/gemini/patches/124-arm-gemini-rut100-register-ethernet.patch @@ -36,7 +36,7 @@ static struct gpio_keys_button rut1xx_keys[] = { { .code = KEY_SETUP, -@@ -85,6 +107,8 @@ static void __init rut1xx_init(void) +@@ -81,6 +103,8 @@ static void __init rut1xx_init(void) platform_device_register(&rut1xx_keys_device); platform_register_rtc(); platform_register_watchdog(); diff --git a/target/linux/gemini/patches-3.8/130-usb-ehci-gemini-fot2gxx-support.patch b/target/linux/gemini/patches/130-usb-ehci-gemini-fot2gxx-support.patch index 4e7fdcfe05..ed6c6259de 100644 --- a/target/linux/gemini/patches-3.8/130-usb-ehci-gemini-fot2gxx-support.patch +++ b/target/linux/gemini/patches/130-usb-ehci-gemini-fot2gxx-support.patch @@ -514,7 +514,7 @@ if (ehci->debug) dbgp_external_startup(ehci_to_hcd(ehci)); -@@ -340,11 +346,14 @@ static void ehci_silence_controller(stru +@@ -341,11 +347,14 @@ static void ehci_silence_controller(stru ehci->rh_state = EHCI_RH_HALTED; ehci_turn_off_all_ports(ehci); @@ -529,7 +529,7 @@ spin_unlock_irq(&ehci->lock); } -@@ -599,7 +608,9 @@ static int ehci_run (struct usb_hcd *hcd +@@ -600,7 +609,9 @@ static int ehci_run (struct usb_hcd *hcd // Philips, Intel, and maybe others need CMD_RUN before the // root hub will detect new devices (why?); NEC doesn't ehci->command &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET); @@ -539,7 +539,7 @@ ehci_writel(ehci, ehci->command, &ehci->regs->command); dbg_cmd (ehci, "init", ehci->command); -@@ -619,9 +630,11 @@ static int ehci_run (struct usb_hcd *hcd +@@ -620,9 +631,11 @@ static int ehci_run (struct usb_hcd *hcd */ down_write(&ehci_cf_port_reset_rwsem); ehci->rh_state = EHCI_RH_RUNNING; @@ -551,7 +551,7 @@ up_write(&ehci_cf_port_reset_rwsem); ehci->last_periodic_enable = ktime_get_real(); -@@ -1242,6 +1255,11 @@ MODULE_DESCRIPTION(DRIVER_DESC); +@@ -1241,6 +1254,11 @@ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_AUTHOR (DRIVER_AUTHOR); MODULE_LICENSE ("GPL"); diff --git a/target/linux/gemini/patches-3.8/131-arm-gemini-add-usb-platform-device.patch b/target/linux/gemini/patches/131-arm-gemini-add-usb-platform-device.patch index d1a4fee508..d1a4fee508 100644 --- a/target/linux/gemini/patches-3.8/131-arm-gemini-add-usb-platform-device.patch +++ b/target/linux/gemini/patches/131-arm-gemini-add-usb-platform-device.patch diff --git a/target/linux/gemini/patches-3.8/132-arm-gemini-wbd111-register-usb.patch b/target/linux/gemini/patches/132-arm-gemini-wbd111-register-usb.patch index faa531538e..44e72d17c3 100644 --- a/target/linux/gemini/patches-3.8/132-arm-gemini-wbd111-register-usb.patch +++ b/target/linux/gemini/patches/132-arm-gemini-wbd111-register-usb.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-gemini/board-wbd111.c +++ b/arch/arm/mach-gemini/board-wbd111.c -@@ -149,6 +149,7 @@ static void __init wbd111_init(void) +@@ -145,6 +145,7 @@ static void __init wbd111_init(void) platform_register_watchdog(); platform_device_register(&wbd111_phy_device); platform_register_ethernet(&gmac_data); diff --git a/target/linux/gemini/patches-3.8/133-arm-gemini-wbd222-register-usb.patch b/target/linux/gemini/patches/133-arm-gemini-wbd222-register-usb.patch index a4d332bdd4..2adc410926 100644 --- a/target/linux/gemini/patches-3.8/133-arm-gemini-wbd222-register-usb.patch +++ b/target/linux/gemini/patches/133-arm-gemini-wbd222-register-usb.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-gemini/board-wbd222.c +++ b/arch/arm/mach-gemini/board-wbd222.c -@@ -151,6 +151,7 @@ static void __init wbd222_init(void) +@@ -147,6 +147,7 @@ static void __init wbd222_init(void) platform_register_watchdog(); platform_device_register(&wbd222_phy_device); platform_register_ethernet(&gmac_data); diff --git a/target/linux/gemini/patches-3.8/134-arm-gemini-rut100-register-usb.patch b/target/linux/gemini/patches/134-arm-gemini-rut100-register-usb.patch index 95c6bade06..c3755ee7d4 100644 --- a/target/linux/gemini/patches-3.8/134-arm-gemini-rut100-register-usb.patch +++ b/target/linux/gemini/patches/134-arm-gemini-rut100-register-usb.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-gemini/board-rut1xx.c +++ b/arch/arm/mach-gemini/board-rut1xx.c -@@ -109,6 +109,7 @@ static void __init rut1xx_init(void) +@@ -105,6 +105,7 @@ static void __init rut1xx_init(void) platform_register_watchdog(); platform_device_register(&rut1xx_phy_device); platform_register_ethernet(&gmac_data); diff --git a/target/linux/gemini/patches-3.8/135-arm-gemini-nas4220-register-usb.patch b/target/linux/gemini/patches/135-arm-gemini-nas4220-register-usb.patch index 31d776d0a2..e08c889d4b 100644 --- a/target/linux/gemini/patches-3.8/135-arm-gemini-nas4220-register-usb.patch +++ b/target/linux/gemini/patches/135-arm-gemini-nas4220-register-usb.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-gemini/board-nas4220b.c +++ b/arch/arm/mach-gemini/board-nas4220b.c -@@ -100,6 +100,8 @@ static void __init ib4220b_init(void) +@@ -96,6 +96,8 @@ static void __init ib4220b_init(void) platform_device_register(&ib4220b_key_device); platform_register_rtc(); platform_register_watchdog(); diff --git a/target/linux/gemini/patches-3.8/140-arm-gemini-add-pci-support.patch b/target/linux/gemini/patches/140-arm-gemini-add-pci-support.patch index 82df3dfa15..37ffdadba3 100644 --- a/target/linux/gemini/patches-3.8/140-arm-gemini-add-pci-support.patch +++ b/target/linux/gemini/patches/140-arm-gemini-add-pci-support.patch @@ -1,6 +1,6 @@ --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -388,6 +388,7 @@ config ARCH_GEMINI +@@ -412,6 +412,7 @@ config ARCH_GEMINI select ARCH_USES_GETTIMEOFFSET select NEED_MACH_GPIO_H select CPU_FA526 |