diff options
Diffstat (limited to 'target/linux/lantiq/patches')
| -rw-r--r-- | target/linux/lantiq/patches/104-board_xway.patch | 32 | ||||
| -rw-r--r-- | target/linux/lantiq/patches/270-crypto.patch | 20 | ||||
| -rw-r--r-- | target/linux/lantiq/patches/400-mach-arv45xx.patch | 224 | ||||
| -rw-r--r-- | target/linux/lantiq/patches/700-dwc_otg.patch | 26 |
4 files changed, 193 insertions, 109 deletions
diff --git a/target/linux/lantiq/patches/104-board_xway.patch b/target/linux/lantiq/patches/104-board_xway.patch index e70ff80074..fcd9c0e326 100644 --- a/target/linux/lantiq/patches/104-board_xway.patch +++ b/target/linux/lantiq/patches/104-board_xway.patch @@ -615,7 +615,7 @@ +} --- /dev/null +++ b/arch/mips/lantiq/xway/devices.c -@@ -0,0 +1,278 @@ +@@ -0,0 +1,305 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published @@ -638,6 +638,7 @@ +#include <linux/time.h> +#include <linux/io.h> +#include <linux/gpio.h> ++#include <linux/gpio_buttons.h> +#include <linux/leds.h> + +#include <asm/bootinfo.h> @@ -668,6 +669,26 @@ + platform_device_register(&lq_gpio_leds); +} + ++/* gpio buttons */ ++static struct gpio_buttons_platform_data lq_gpio_buttons_platform_data; ++ ++static struct platform_device lq_gpio_buttons_platform_device = ++{ ++ .name = "gpio-buttons", ++ .id = 0, ++ .dev = { ++ .platform_data = (void *) &lq_gpio_buttons_platform_data, ++ }, ++}; ++ ++void __init ++lq_register_gpio_buttons(struct gpio_button *buttons, int cnt) ++{ ++ lq_gpio_buttons_platform_data.buttons = buttons; ++ lq_gpio_buttons_platform_data.nbuttons = cnt; ++ platform_device_register(&lq_gpio_buttons_platform_device); ++} ++ +/* serial to parallel conversion */ +static struct resource lq_stp_resource = +{ @@ -894,9 +915,15 @@ + break; + } +} ++ ++void __init ++lq_register_crypto(const char *name) ++{ ++ platform_device_register_simple(name, 0, 0, 0); ++} --- /dev/null +++ b/arch/mips/lantiq/xway/devices.h -@@ -0,0 +1,25 @@ +@@ -0,0 +1,26 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published @@ -920,6 +947,7 @@ +extern void __init lq_register_wdt(void); +extern void __init lq_register_ethernet(struct lq_eth_data *eth); +extern void __init lq_register_asc(int port); ++extern void __init lq_register_gpio_buttons(struct gpio_button *buttons, int cnt); + +#endif --- /dev/null diff --git a/target/linux/lantiq/patches/270-crypto.patch b/target/linux/lantiq/patches/270-crypto.patch index e6ee88585c..685158029c 100644 --- a/target/linux/lantiq/patches/270-crypto.patch +++ b/target/linux/lantiq/patches/270-crypto.patch @@ -6166,30 +6166,18 @@ +}; + +#endif /* DEU_FALCON_H */ ---- a/arch/mips/lantiq/xway/devices.c -+++ b/arch/mips/lantiq/xway/devices.c -@@ -277,3 +277,9 @@ - break; - } - } -+ -+void __init -+lq_register_crypto(const char *name) -+{ -+ platform_device_register_simple(name, 0, 0, 0); -+} --- a/arch/mips/lantiq/xway/devices.h +++ b/arch/mips/lantiq/xway/devices.h -@@ -21,5 +21,6 @@ - extern void __init lq_register_wdt(void); +@@ -22,5 +22,6 @@ extern void __init lq_register_ethernet(struct lq_eth_data *eth); extern void __init lq_register_asc(int port); + extern void __init lq_register_gpio_buttons(struct gpio_button *buttons, int cnt); +extern void __init lq_register_crypto(const char *name); #endif --- a/arch/mips/lantiq/xway/mach-easy50712.c +++ b/arch/mips/lantiq/xway/mach-easy50712.c -@@ -72,6 +72,7 @@ +@@ -74,6 +74,7 @@ lq_register_wdt(); lq_register_pci(&lq_pci_data); lq_register_ethernet(&lq_eth_data); @@ -6199,7 +6187,7 @@ MIPS_MACHINE(LANTIQ_MACH_EASY50712, --- a/arch/mips/lantiq/xway/mach-easy50812.c +++ b/arch/mips/lantiq/xway/mach-easy50812.c -@@ -71,6 +71,7 @@ +@@ -73,6 +73,7 @@ lq_register_wdt(); lq_register_pci(&lq_pci_data); lq_register_ethernet(&lq_eth_data); diff --git a/target/linux/lantiq/patches/400-mach-arv45xx.patch b/target/linux/lantiq/patches/400-mach-arv45xx.patch index 6a7770c01e..98ff680331 100644 --- a/target/linux/lantiq/patches/400-mach-arv45xx.patch +++ b/target/linux/lantiq/patches/400-mach-arv45xx.patch @@ -1,13 +1,17 @@ --- a/arch/mips/include/asm/mach-lantiq/machine.h +++ b/arch/mips/include/asm/mach-lantiq/machine.h -@@ -11,4 +11,9 @@ +@@ -11,4 +11,13 @@ LANTIQ_MACH_EASY4010, /* Twinpass evalkit */ LANTIQ_MACH_EASY50712, /* Danube evalkit */ LANTIQ_MACH_EASY50812, /* AR9 eval board */ -+ LANTIQ_MACH_ARV4518, /* Airties WAV-221, SMC-7908A-ISP */ -+ LANTIQ_MACH_ARV452, /* Airties WAV-281, Arcor EasyboxA800 */ -+ LANTIQ_MACH_ARV4525, /* Speedport W502V */ -+ LANTIQ_MACH_ARV752DPW22, /* Arcor easybox a803 */ ++ ++ /* Arcadyan */ ++ LANTIQ_MACH_ARV4510PW, /* Wippies Homebox */ ++ LANTIQ_MACH_ARV4518PW, /* Airties WAV-221, SMC-7908A-ISP */ ++ LANTIQ_MACH_ARV4520PW, /* Airties WAV-281, Arcor EasyboxA800 */ ++ LANTIQ_MACH_ARV452CPW, /* Arcor EasyboxA801 */ ++ LANTIQ_MACH_ARV4525PW, /* Speedport W502V */ ++ LANTIQ_MACH_ARV752DPW, /* Arcor easybox a803 */ + LANTIQ_MACH_ARV7518PW, /* ASTORIA */ }; --- a/arch/mips/lantiq/xway/Kconfig @@ -32,7 +36,7 @@ +obj-$(CONFIG_LANTIQ_MACH_ARV45XX) += mach-arv45xx.o --- /dev/null +++ b/arch/mips/lantiq/xway/mach-arv45xx.c -@@ -0,0 +1,299 @@ +@@ -0,0 +1,389 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published @@ -58,9 +62,10 @@ +#include <lantiq_platform.h> + +#include "devices.h" ++#include "dev-dwc_otg.h" + -+#define ARV452_LATCH_SWITCH (1 << 10) -+#define ARV752DPW22_LATCH_DEFAULT (2) ++#define ARV4520PW_LATCH_SWITCH (1 << 10) ++#define ARV752DPW_LATCH_DEFAULT (2) + +#ifdef CONFIG_MTD_PARTITIONS +static struct mtd_partition arv45xx_partitions[] = @@ -86,13 +91,29 @@ + .size = 0x10000, + }, +}; -+#endif + -+static struct physmap_flash_data arv45xx_flash_data = { -+#ifdef CONFIG_MTD_PARTITIONS -+ .nr_parts = ARRAY_SIZE(arv45xx_partitions), -+ .parts = arv45xx_partitions, -+#endif ++static struct mtd_partition arv4518_partitions[] = ++{ ++ { ++ .name = "uboot", ++ .offset = 0x0, ++ .size = 0x40000, ++ }, ++ { ++ .name = "uboot_env", ++ .offset = 0x40000, ++ .size = 0x10000, ++ }, ++ { ++ .name = "linux", ++ .offset = 0x50000, ++ .size = 0x3a0000, ++ }, ++ { ++ .name = "board_config", ++ .offset = 0x3f0000, ++ .size = 0x10000, ++ }, +}; + +static struct mtd_partition arv75xx_partitions[] = @@ -119,6 +140,22 @@ + }, +}; + ++#endif ++ ++static struct physmap_flash_data arv45xx_flash_data = { ++#ifdef CONFIG_MTD_PARTITIONS ++ .nr_parts = ARRAY_SIZE(arv45xx_partitions), ++ .parts = arv45xx_partitions, ++#endif ++}; ++ ++static struct physmap_flash_data arv4518_flash_data = { ++#ifdef CONFIG_MTD_PARTITIONS ++ .nr_parts = ARRAY_SIZE(arv4518_partitions), ++ .parts = arv4518_partitions, ++#endif ++}; ++ +static struct physmap_flash_data arv75xx_flash_data = { +#ifdef CONFIG_MTD_PARTITIONS + .nr_parts = ARRAY_SIZE(arv75xx_partitions), @@ -140,24 +177,34 @@ +}; + +static struct gpio_led -+arv4518_leds_gpio[] __initdata = { -+ { .name = "soc:blue:power", .gpio = 3, .active_low = 1, }, -+ { .name = "soc:blue:adsl", .gpio = 4, .active_low = 1, }, -+ { .name = "soc:blue:internet", .gpio = 5, .active_low = 1, }, -+ { .name = "soc:red:power", .gpio = 6, .active_low = 1, }, -+ { .name = "soc:yello:wps", .gpio = 7, .active_low = 1, }, -+ { .name = "soc:red:wps", .gpio = 9, .active_low = 1, }, -+ { .name = "soc:blue:voip", .gpio = 32, .active_low = 1, }, -+ { .name = "soc:blue:fxs1", .gpio = 33, .active_low = 1, }, -+ { .name = "soc:blue:fxs2", .gpio = 34, .active_low = 1, }, -+ { .name = "soc:blue:fxo", .gpio = 35, .active_low = 1, }, -+ { .name = "soc:blue:voice", .gpio = 36, .active_low = 1, }, -+ { .name = "soc:blue:usb", .gpio = 37, .active_low = 1, }, -+ { .name = "soc:blue:wlan", .gpio = 38, .active_low = 1, }, ++arv4510pw_leds_gpio[] __initdata = { ++ { .name = "soc:green:foo", .gpio = 4, .active_low = 1, }, +}; + +static struct gpio_led -+arv452_leds_gpio[] __initdata = { ++arv4518pw_leds_gpio[] __initdata = { ++ { .name = "soc:green:power", .gpio = 3, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:adsl", .gpio = 4, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:internet", .gpio = 5, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:wlan", .gpio = 6, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:yellow:wps", .gpio = 7, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:red:fail", .gpio = 8, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:usb", .gpio = 19, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:voip", .gpio = 32, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:fxs1", .gpio = 33, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:fxs2", .gpio = 34, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:fxo", .gpio = 35, .active_low = 1, .default_trigger = "default-on" }, ++}; ++ ++static struct gpio_button ++arv4518pw_gpio_buttons[] __initdata = { ++ { .desc = "wlan", .type = EV_KEY, .code = BTN_0, .threshold = 3, .gpio = 28, .active_low = 1, }, ++ { .desc = "wps", .type = EV_KEY, .code = BTN_1, .threshold = 3, .gpio = 29, .active_low = 1, }, ++ { .desc = "reset", .type = EV_KEY, .code = BTN_2, .threshold = 3, .gpio = 30, .active_low = 1, }, ++}; ++ ++static struct gpio_led ++arv4520pw_leds_gpio[] __initdata = { + { .name = "soc:blue:power", .gpio = 3, .active_low = 1, }, + { .name = "soc:blue:adsl", .gpio = 4, .active_low = 1, }, + { .name = "soc:blue:internet", .gpio = 5, .active_low = 1, }, @@ -173,16 +220,17 @@ + { .name = "soc:blue:wlan", .gpio = 38, .active_low = 1, }, +}; + -+static struct gpio_led arv4525_leds_gpio[] __initdata = { -+ { .name = "soc:green:festnetz", .gpio = 4, .active_low = 1, }, -+ { .name = "soc:green:internet", .gpio = 5, .active_low = 1, }, -+ { .name = "soc:green:dsl", .gpio = 6, .active_low = 1, }, -+ { .name = "soc:green:wlan", .gpio = 8, .active_low = 1, }, -+ { .name = "soc:green:online", .gpio = 9, .active_low = 1, }, ++static struct gpio_led ++arv4525pw_leds_gpio[] __initdata = { ++ { .name = "soc:green:festnetz", .gpio = 4, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:internet", .gpio = 5, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:dsl", .gpio = 6, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:wlan", .gpio = 8, .active_low = 1, .default_trigger = "default-on" }, ++ { .name = "soc:green:online", .gpio = 9, .active_low = 1, .default_trigger = "default-on" }, +}; + +static struct gpio_led -+arv752dpw22_leds_gpio[] __initdata = { ++arv752dpw_leds_gpio[] __initdata = { + { .name = "soc:blue:power", .gpio = 3, .active_low = 1, .default_trigger = "default-on" }, + { .name = "soc:red:internet", .gpio = 5, .active_low = 1, .default_trigger = "default-on" }, + { .name = "soc:red:power", .gpio = 6, .active_low = 1, .default_trigger = "default-on" }, @@ -200,6 +248,13 @@ + { .name = "soc:green:eth4", .gpio = 46, .active_low = 1, .default_trigger = "default-on", }, +}; + ++static struct gpio_button ++arv752dpw_gpio_buttons[] __initdata = { ++ { .desc = "btn0", .type = EV_KEY, .code = BTN_0, .threshold = 3, .gpio = 12, .active_low = 1, }, ++ { .desc = "btn1", .type = EV_KEY, .code = BTN_1, .threshold = 3, .gpio = 13, .active_low = 1, }, ++ { .desc = "btn2", .type = EV_KEY, .code = BTN_2, .threshold = 3, .gpio = 28, .active_low = 1, }, ++}; ++ +static struct gpio_led +arv7518pw_leds_gpio[] __initdata = { + { .name = "soc:green:power", .gpio = 2, .active_low = 1, }, @@ -228,69 +283,107 @@ + lq_register_ethernet(&lq_eth_data); +} + ++static void ++bewan_register_ethernet(void) ++{ ++#define BEWAN_BRN_MAC 0x3f0014 ++ memcpy_fromio(lq_eth_data.mac, ++ (void *)KSEG1ADDR(LQ_FLASH_START + BEWAN_BRN_MAC), 6); ++ lq_register_ethernet(&lq_eth_data); ++} ++ +static void __init -+arv4518_init(void) ++arv4510pw_init(void) +{ + lq_register_gpio(); -+ lq_register_gpio_ebu(0); -+ lq_register_gpio_leds(arv4518_leds_gpio, ARRAY_SIZE(arv4518_leds_gpio)); ++ lq_register_gpio_stp(); ++ lq_register_gpio_leds(arv4510pw_leds_gpio, ARRAY_SIZE(arv4510pw_leds_gpio)); + lq_register_asc(0); + lq_register_asc(1); + lq_register_nor(&arv45xx_flash_data); + lq_register_pci(&lq_pci_data); ++ lq_pci_data.irq[15] = (INT_NUM_IM2_IRL0 + 31); ++ lq_pci_data.gpio |= PCI_EXIN1 | PCI_REQ2; ++ lq_register_pci(&lq_pci_data); ++ lq_register_wdt(); ++ bewan_register_ethernet(); ++} ++ ++MIPS_MACHINE(LANTIQ_MACH_ARV4510PW, ++ "ARV4510PW", ++ "ARV4510PW - Wippies Homebox", ++ arv4510pw_init); ++ ++static void __init ++arv4518pw_init(void) ++{ ++ lq_register_gpio(); ++ lq_register_gpio_ebu(0); ++ lq_register_gpio_leds(arv4518pw_leds_gpio, ARRAY_SIZE(arv4518pw_leds_gpio)); ++ lq_register_gpio_buttons(arv4518pw_gpio_buttons, ARRAY_SIZE(arv4518pw_gpio_buttons)); ++ lq_register_asc(0); ++ lq_register_asc(1); ++ lq_register_nor(&arv4518_flash_data); ++ lq_pci_data.gpio = PCI_GNT2 | PCI_REQ2; ++ lq_register_pci(&lq_pci_data); + lq_register_wdt(); + arv45xx_register_ethernet(); ++ xway_register_dwc(14); ++ gpio_request(13, "switch-reset"); ++ gpio_direction_output(13, 1); ++ gpio_export(13, 0); +} + -+MIPS_MACHINE(LANTIQ_MACH_ARV4518, -+ "ARV4518", -+ "ARV4518 - SMC7908A-ISP", -+ arv4518_init); ++MIPS_MACHINE(LANTIQ_MACH_ARV4518PW, ++ "ARV4518PW", ++ "ARV4518PW - SMC7908A-ISP, Airties WAV-221", ++ arv4518pw_init); + +static void __init -+arv452_init(void) ++arv4520pw_init(void) +{ + lq_register_gpio(); -+ lq_register_gpio_ebu(ARV452_LATCH_SWITCH); -+ lq_register_gpio_leds(arv452_leds_gpio, ARRAY_SIZE(arv452_leds_gpio)); ++ lq_register_gpio_ebu(ARV4520PW_LATCH_SWITCH); ++ lq_register_gpio_leds(arv4520pw_leds_gpio, ARRAY_SIZE(arv4520pw_leds_gpio)); + lq_register_asc(0); + lq_register_asc(1); + lq_register_nor(&arv45xx_flash_data); + lq_register_pci(&lq_pci_data); + lq_register_wdt(); + arv45xx_register_ethernet(); ++ xway_register_dwc(28); +} + -+MIPS_MACHINE(LANTIQ_MACH_ARV452, -+ "ARV452", -+ "ARV452 - Airties WAV-281, Arcor A800", -+ arv452_init); ++MIPS_MACHINE(LANTIQ_MACH_ARV4520PW, ++ "ARV4520PW", ++ "ARV4520PW - Airties WAV-281, Arcor A800", ++ arv4520pw_init); + +static void __init -+arv4525_init(void) ++arv4525pw_init(void) +{ + lq_register_gpio(); -+ lq_register_gpio_leds(arv4525_leds_gpio, ARRAY_SIZE(arv4525_leds_gpio)); ++ lq_register_gpio_leds(arv4525pw_leds_gpio, ARRAY_SIZE(arv4525pw_leds_gpio)); + lq_register_asc(0); + lq_register_asc(1); + lq_register_nor(&arv45xx_flash_data); ++ lq_pci_data.clock = PCI_CLOCK_INT; + lq_register_pci(&lq_pci_data); + lq_register_wdt(); + lq_eth_data.mii_mode = MII_MODE; + arv45xx_register_ethernet(); +} + -+MIPS_MACHINE(LANTIQ_MACH_ARV4525, -+ "ARV4525", -+ "ARV4525 - Speedport W502V", -+ arv4525_init); -+ ++MIPS_MACHINE(LANTIQ_MACH_ARV4525PW, ++ "ARV4525PW", ++ "ARV4525PW - Speedport W502V", ++ arv4525pw_init); + +static void __init +arv7518pw_init(void) +{ + lq_register_gpio(); -+ lq_register_gpio_ebu(ARV452_LATCH_SWITCH); ++ lq_register_gpio_ebu(ARV4520PW_LATCH_SWITCH); + lq_register_asc(0); + lq_register_asc(1); + lq_register_gpio_leds(arv7518pw_leds_gpio, ARRAY_SIZE(arv7518pw_leds_gpio)); @@ -307,13 +400,14 @@ + arv7518pw_init); + +static void __init -+arv752dpw22_init(void) ++arv752dpw_init(void) +{ + lq_register_gpio(); -+ lq_register_gpio_ebu(ARV752DPW22_LATCH_DEFAULT); ++ lq_register_gpio_ebu(ARV752DPW_LATCH_DEFAULT); + lq_register_asc(0); + lq_register_asc(1); -+ lq_register_gpio_leds(arv752dpw22_leds_gpio, ARRAY_SIZE(arv752dpw22_leds_gpio)); ++ lq_register_gpio_leds(arv752dpw_leds_gpio, ARRAY_SIZE(arv752dpw_leds_gpio)); ++ lq_register_gpio_buttons(arv752dpw_gpio_buttons, ARRAY_SIZE(arv752dpw_gpio_buttons)); + lq_register_nor(&arv75xx_flash_data); + lq_pci_data.irq[15] = (INT_NUM_IM2_IRL0 + 31); + lq_pci_data.gpio |= PCI_EXIN1 | PCI_REQ2; @@ -328,7 +422,7 @@ + gpio_direction_output(33, 1); +} + -+MIPS_MACHINE(LANTIQ_MACH_ARV752DPW22, -+ "ARV752DPW22", -+ "ARV752DPW22 - Arcor A803", -+ arv752dpw22_init); ++MIPS_MACHINE(LANTIQ_MACH_ARV752DPW, ++ "ARV752DPW", ++ "ARV752DPW - Arcor A803", ++ arv752dpw_init); diff --git a/target/linux/lantiq/patches/700-dwc_otg.patch b/target/linux/lantiq/patches/700-dwc_otg.patch index b50970350e..ea2a5f7f07 100644 --- a/target/linux/lantiq/patches/700-dwc_otg.patch +++ b/target/linux/lantiq/patches/700-dwc_otg.patch @@ -15603,29 +15603,3 @@ +extern void __init xway_register_dwc(int pin); + +#endif ---- a/arch/mips/lantiq/xway/mach-arv45xx.c -+++ b/arch/mips/lantiq/xway/mach-arv45xx.c -@@ -23,6 +23,7 @@ - #include <lantiq_platform.h> - - #include "devices.h" -+#include "dev-dwc_otg.h" - - #define ARV452_LATCH_SWITCH (1 << 10) - #define ARV752DPW22_LATCH_DEFAULT (2) -@@ -195,6 +196,7 @@ - lq_register_pci(&lq_pci_data); - lq_register_wdt(); - arv45xx_register_ethernet(); -+ xway_register_dwc(14); - } - - MIPS_MACHINE(LANTIQ_MACH_ARV4518, -@@ -214,6 +216,7 @@ - lq_register_pci(&lq_pci_data); - lq_register_wdt(); - arv45xx_register_ethernet(); -+ xway_register_dwc(28); - } - - MIPS_MACHINE(LANTIQ_MACH_ARV452, |