On Sunday 22 January 2012 14:45:45 Álvaro Fernández Rojas wrote:
> This adds support for Comtrend 5365. Open commits are
> https://dev.openwrt.org/ticket/10732 and
> https://dev.openwrt.org/ticket/10717. Also modifies increases the number
> of buttons supported by brcm63xx boards. Directory to apply patch is:
> target/linux/brcm63xx
>
> Signed-off-by: Álvaro Fernández Rojas <nolt...@gmail.com>
Looks good, except that you missed updating the 3.0, 3.1 and 3.2 patches, can
you resubmit with these patches updated as well?
Thanks.
>
> Index: patches-2.6.39/200-extended-platform-devices.patch
> ===================================================================
> --- patches-2.6.39/200-extended-platform-devices.patch (revisión:
> 29846)
> +++ patches-2.6.39/200-extended-platform-devices.patch (copia de
> trabajo)
> @@ -15,7 +15,7 @@
> @@ -61,6 +61,10 @@ struct board_info {
>
> /* Buttons */
> - struct gpio_button buttons[2];
> + struct gpio_button buttons[4];
> +
> + /* Additional platform devices */
> + struct platform_device **devs;
> Index: patches-2.6.39/457-board_96348A-122.patch
> ===================================================================
> --- patches-2.6.39/457-board_96348A-122.patch (revisión: 0)
> +++ patches-2.6.39/457-board_96348A-122.patch (revisión: 0)
> @@ -0,0 +1,78 @@
> +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +@@ -1009,6 +1009,67 @@
> + },
> + };
> +
> ++static struct board_info __initdata board_96348A_122 = {
> ++ .name = "96348A-122",
> ++ .expected_cpu_id = 0x6348,
> ++
> ++ .has_uart0 = 1,
> ++ .has_enet1 = 1,
> ++ .has_pci = 1,
> ++
> ++ .enet1 = {
> ++ .force_speed_100 = 1,
> ++ .force_duplex_full = 1,
> ++ },
> ++
> ++ .has_ohci0 = 1,
> ++
> ++ .leds = {
> ++ {
> ++ .name = "power",
> ++ .gpio = 0,
> ++ .active_low = 1,
> ++ .default_trigger = "default-on",
> ++ },
> ++ {
> ++ .name = "alarm",
> ++ .gpio = 2,
> ++ .active_low = 1,
> ++ },
> ++ {
> ++ .name = "wps",
> ++ .gpio = 6,
> ++ .active_low = 1,
> ++ },
> ++ },
> ++ .buttons = {
> ++ {
> ++ .desc = "reset",
> ++ .gpio = 33,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = KEY_RESTART,
> ++ .threshold = 3,
> ++ },
> ++ {
> ++ .desc = "wifi",
> ++ .gpio = 34,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = BTN_0,
> ++ .threshold = 3,
> ++ },
> ++ {
> ++ .desc = "wps",
> ++ .gpio = 35,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = KEY_WPS_BUTTON,
> ++ .threshold = 3,
> ++ },
> ++ },
> ++};
> ++
> + #endif
> +
> + /*
> +@@ -2068,6 +2129,7 @@
> + &board_V2500V_BB,
> + &board_V2110,
> + &board_ct536_ct5621,
> ++ &board_96348A_122,
> + #endif
> +
> + #ifdef CONFIG_BCM63XX_CPU_6358
> \ No newline at end of file
>
> Cambios de propiedades en patches-2.6.39/457-board_96348A-122.patch
> ___________________________________________________________________
> Añadido: svn:executable
> + *
>
> Index: patches-2.6.39/500-ssb-add-callback-for-sprom.patch
> ===================================================================
> --- patches-2.6.39/500-ssb-add-callback-for-sprom.patch (revisión:
> 29846)
> +++ patches-2.6.39/500-ssb-add-callback-for-sprom.patch (copia de
> trabajo)
> @@ -1,6 +1,6 @@
> --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> -@@ -2128,6 +2128,17 @@ static struct ssb_sprom bcm63xx_sprom =
> +@@ -2190,6 +2190,17 @@ static struct ssb_sprom bcm63xx_sprom =
> .boardflags_lo = 0x2848,
> .boardflags_hi = 0x0000,
> };
> @@ -18,7 +18,7 @@
> #endif
>
> /*
> -@@ -2397,8 +2408,9 @@ int __init board_register_devices(void)
> +@@ -2459,8 +2470,9 @@ int __init board_register_devices(void)
> if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
> memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
> memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
> Index: patches-2.6.39/100-reset_buttons.patch
> ===================================================================
> --- patches-2.6.39/100-reset_buttons.patch (revisión: 29846)
> +++ patches-2.6.39/100-reset_buttons.patch (copia de trabajo)
> @@ -92,7 +92,7 @@
> struct gpio_led leds[5];
> +
> + /* Buttons */
> -+ struct gpio_button buttons[2];
> ++ struct gpio_button buttons[4];
> };
>
> #endif /* ! BOARD_BCM963XX_H_ */
> Index: patches-2.6.39/977-ssb_export_fallback_sprom.patch
> ===================================================================
> --- patches-2.6.39/977-ssb_export_fallback_sprom.patch (revisión:
> 29846)
> +++ patches-2.6.39/977-ssb_export_fallback_sprom.patch (copia de
> trabajo)
> @@ -1,6 +1,6 @@
> --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> -@@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void)
> +@@ -2170,7 +2170,7 @@ static void __init nb4_nvram_fixup(void)
> * bcm4318 WLAN work
> */
> #ifdef CONFIG_SSB_PCIHOST
> @@ -9,7 +9,7 @@
> .revision = 0x02,
> .board_rev = 0x17,
> .country_code = 0x0,
> -@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom =
> +@@ -2190,6 +2190,7 @@ static struct ssb_sprom bcm63xx_sprom =
> .boardflags_lo = 0x2848,
> .boardflags_hi = 0x0000,
> };
> Index: patches-3.0/200-extended-platform-devices.patch
> ===================================================================
> --- patches-3.0/200-extended-platform-devices.patch (revisión: 29846)
> +++ patches-3.0/200-extended-platform-devices.patch (copia de trabajo)
> @@ -15,7 +15,7 @@
> @@ -61,6 +61,10 @@ struct board_info {
>
> /* Buttons */
> - struct gpio_button buttons[2];
> + struct gpio_button buttons[4];
> +
> + /* Additional platform devices */
> + struct platform_device **devs;
> Index: patches-3.0/457-board_96348A-122.patch
> ===================================================================
> --- patches-3.0/457-board_96348A-122.patch (revisión: 0)
> +++ patches-3.0/457-board_96348A-122.patch (revisión: 0)
> @@ -0,0 +1,78 @@
> +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +@@ -1009,6 +1009,67 @@
> + },
> + };
> +
> ++static struct board_info __initdata board_96348A_122 = {
> ++ .name = "96348A-122",
> ++ .expected_cpu_id = 0x6348,
> ++
> ++ .has_uart0 = 1,
> ++ .has_enet1 = 1,
> ++ .has_pci = 1,
> ++
> ++ .enet1 = {
> ++ .force_speed_100 = 1,
> ++ .force_duplex_full = 1,
> ++ },
> ++
> ++ .has_ohci0 = 1,
> ++
> ++ .leds = {
> ++ {
> ++ .name = "power",
> ++ .gpio = 0,
> ++ .active_low = 1,
> ++ .default_trigger = "default-on",
> ++ },
> ++ {
> ++ .name = "alarm",
> ++ .gpio = 2,
> ++ .active_low = 1,
> ++ },
> ++ {
> ++ .name = "wps",
> ++ .gpio = 6,
> ++ .active_low = 1,
> ++ },
> ++ },
> ++ .buttons = {
> ++ {
> ++ .desc = "reset",
> ++ .gpio = 33,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = KEY_RESTART,
> ++ .threshold = 3,
> ++ },
> ++ {
> ++ .desc = "wifi",
> ++ .gpio = 34,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = BTN_0,
> ++ .threshold = 3,
> ++ },
> ++ {
> ++ .desc = "wps",
> ++ .gpio = 35,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = KEY_WPS_BUTTON,
> ++ .threshold = 3,
> ++ },
> ++ },
> ++};
> ++
> + #endif
> +
> + /*
> +@@ -2068,6 +2129,7 @@
> + &board_V2500V_BB,
> + &board_V2110,
> + &board_ct536_ct5621,
> ++ &board_96348A_122,
> + #endif
> +
> + #ifdef CONFIG_BCM63XX_CPU_6358
>
> Cambios de propiedades en patches-3.0/457-board_96348A-122.patch
> ___________________________________________________________________
> Añadido: svn:executable
> + *
>
> Index: patches-3.0/100-reset_buttons.patch
> ===================================================================
> --- patches-3.0/100-reset_buttons.patch (revisión: 29846)
> +++ patches-3.0/100-reset_buttons.patch (copia de trabajo)
> @@ -92,7 +92,7 @@
> struct gpio_led leds[5];
> +
> + /* Buttons */
> -+ struct gpio_button buttons[2];
> ++ struct gpio_button buttons[4];
> };
>
> #endif /* ! BOARD_BCM963XX_H_ */
> Index: patches-3.0/977-ssb_export_fallback_sprom.patch
> ===================================================================
> --- patches-3.0/977-ssb_export_fallback_sprom.patch (revisión: 29846)
> +++ patches-3.0/977-ssb_export_fallback_sprom.patch (copia de trabajo)
> @@ -1,6 +1,6 @@
> --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> -@@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void)
> +@@ -2170,7 +2170,7 @@ static void __init nb4_nvram_fixup(void)
> * bcm4318 WLAN work
> */
> #ifdef CONFIG_SSB_PCIHOST
> @@ -9,7 +9,7 @@
> .revision = 0x02,
> .board_rev = 0x17,
> .country_code = 0x0,
> -@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom =
> +@@ -2190,6 +2190,7 @@ static struct ssb_sprom bcm63xx_sprom =
> .boardflags_lo = 0x2848,
> .boardflags_hi = 0x0000,
> };
> Index: patches-3.1/200-extended-platform-devices.patch
> ===================================================================
> --- patches-3.1/200-extended-platform-devices.patch (revisión: 29846)
> +++ patches-3.1/200-extended-platform-devices.patch (copia de trabajo)
> @@ -15,7 +15,7 @@
> @@ -61,6 +61,10 @@ struct board_info {
>
> /* Buttons */
> - struct gpio_button buttons[2];
> + struct gpio_button buttons[4];
> +
> + /* Additional platform devices */
> + struct platform_device **devs;
> Index: patches-3.1/457-board_96348A-122.patch
> ===================================================================
> --- patches-3.1/457-board_96348A-122.patch (revisión: 0)
> +++ patches-3.1/457-board_96348A-122.patch (revisión: 0)
> @@ -0,0 +1,78 @@
> +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +@@ -1009,6 +1009,67 @@
> + },
> + };
> +
> ++static struct board_info __initdata board_96348A_122 = {
> ++ .name = "96348A-122",
> ++ .expected_cpu_id = 0x6348,
> ++
> ++ .has_uart0 = 1,
> ++ .has_enet1 = 1,
> ++ .has_pci = 1,
> ++
> ++ .enet1 = {
> ++ .force_speed_100 = 1,
> ++ .force_duplex_full = 1,
> ++ },
> ++
> ++ .has_ohci0 = 1,
> ++
> ++ .leds = {
> ++ {
> ++ .name = "power",
> ++ .gpio = 0,
> ++ .active_low = 1,
> ++ .default_trigger = "default-on",
> ++ },
> ++ {
> ++ .name = "alarm",
> ++ .gpio = 2,
> ++ .active_low = 1,
> ++ },
> ++ {
> ++ .name = "wps",
> ++ .gpio = 6,
> ++ .active_low = 1,
> ++ },
> ++ },
> ++ .buttons = {
> ++ {
> ++ .desc = "reset",
> ++ .gpio = 33,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = KEY_RESTART,
> ++ .threshold = 3,
> ++ },
> ++ {
> ++ .desc = "wifi",
> ++ .gpio = 34,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = BTN_0,
> ++ .threshold = 3,
> ++ },
> ++ {
> ++ .desc = "wps",
> ++ .gpio = 35,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = KEY_WPS_BUTTON,
> ++ .threshold = 3,
> ++ },
> ++ },
> ++};
> ++
> + #endif
> +
> + /*
> +@@ -2068,6 +2129,7 @@
> + &board_V2500V_BB,
> + &board_V2110,
> + &board_ct536_ct5621,
> ++ &board_96348A_122,
> + #endif
> +
> + #ifdef CONFIG_BCM63XX_CPU_6358
>
> Cambios de propiedades en patches-3.1/457-board_96348A-122.patch
> ___________________________________________________________________
> Añadido: svn:executable
> + *
>
> Index: patches-3.1/100-reset_buttons.patch
> ===================================================================
> --- patches-3.1/100-reset_buttons.patch (revisión: 29846)
> +++ patches-3.1/100-reset_buttons.patch (copia de trabajo)
> @@ -92,7 +92,7 @@
> struct gpio_led leds[5];
> +
> + /* Buttons */
> -+ struct gpio_button buttons[2];
> ++ struct gpio_button buttons[4];
> };
>
> #endif /* ! BOARD_BCM963XX_H_ */
> Index: patches-3.1/977-ssb_export_fallback_sprom.patch
> ===================================================================
> --- patches-3.1/977-ssb_export_fallback_sprom.patch (revisión: 29846)
> +++ patches-3.1/977-ssb_export_fallback_sprom.patch (copia de trabajo)
> @@ -1,6 +1,6 @@
> --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> -@@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void)
> +@@ -2170,7 +2170,7 @@ static void __init nb4_nvram_fixup(void)
> * bcm4318 WLAN work
> */
> #ifdef CONFIG_SSB_PCIHOST
> @@ -9,7 +9,7 @@
> .revision = 0x02,
> .board_rev = 0x17,
> .country_code = 0x0,
> -@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom =
> +@@ -2190,6 +2190,7 @@ static struct ssb_sprom bcm63xx_sprom =
> .boardflags_lo = 0x2848,
> .boardflags_hi = 0x0000,
> };
> Index: patches-3.2/200-extended-platform-devices.patch
> ===================================================================
> --- patches-3.2/200-extended-platform-devices.patch (revisión: 29846)
> +++ patches-3.2/200-extended-platform-devices.patch (copia de trabajo)
> @@ -15,7 +15,7 @@
> @@ -61,6 +61,10 @@ struct board_info {
>
> /* Buttons */
> - struct gpio_button buttons[2];
> + struct gpio_button buttons[4];
> +
> + /* Additional platform devices */
> + struct platform_device **devs;
> Index: patches-3.2/457-board_96348A-122.patch
> ===================================================================
> --- patches-3.2/457-board_96348A-122.patch (revisión: 0)
> +++ patches-3.2/457-board_96348A-122.patch (revisión: 0)
> @@ -0,0 +1,78 @@
> +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +@@ -1010,6 +1010,67 @@
> + },
> + };
> +
> ++static struct board_info __initdata board_96348A_122 = {
> ++ .name = "96348A-122",
> ++ .expected_cpu_id = 0x6348,
> ++
> ++ .has_uart0 = 1,
> ++ .has_enet1 = 1,
> ++ .has_pci = 1,
> ++
> ++ .enet1 = {
> ++ .force_speed_100 = 1,
> ++ .force_duplex_full = 1,
> ++ },
> ++
> ++ .has_ohci0 = 1,
> ++
> ++ .leds = {
> ++ {
> ++ .name = "power",
> ++ .gpio = 0,
> ++ .active_low = 1,
> ++ .default_trigger = "default-on",
> ++ },
> ++ {
> ++ .name = "alarm",
> ++ .gpio = 2,
> ++ .active_low = 1,
> ++ },
> ++ {
> ++ .name = "wps",
> ++ .gpio = 6,
> ++ .active_low = 1,
> ++ },
> ++ },
> ++ .buttons = {
> ++ {
> ++ .desc = "reset",
> ++ .gpio = 33,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = KEY_RESTART,
> ++ .threshold = 3,
> ++ },
> ++ {
> ++ .desc = "wifi",
> ++ .gpio = 34,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = BTN_0,
> ++ .threshold = 3,
> ++ },
> ++ {
> ++ .desc = "wps",
> ++ .gpio = 35,
> ++ .active_low = 1,
> ++ .type = EV_KEY,
> ++ .code = KEY_WPS_BUTTON,
> ++ .threshold = 3,
> ++ },
> ++ },
> ++};
> ++
> + #endif
> +
> + /*
> +@@ -2069,6 +2130,7 @@
> + &board_V2500V_BB,
> + &board_V2110,
> + &board_ct536_ct5621,
> ++ &board_96348A_122,
> + #endif
> +
> + #ifdef CONFIG_BCM63XX_CPU_6358
>
> Cambios de propiedades en patches-3.2/457-board_96348A-122.patch
> ___________________________________________________________________
> Añadido: svn:executable
> + *
>
> Index: patches-3.2/100-reset_buttons.patch
> ===================================================================
> --- patches-3.2/100-reset_buttons.patch (revisión: 29846)
> +++ patches-3.2/100-reset_buttons.patch (copia de trabajo)
> @@ -92,7 +92,7 @@
> struct gpio_led leds[5];
> +
> + /* Buttons */
> -+ struct gpio_button buttons[2];
> ++ struct gpio_button buttons[4];
> };
>
> #endif /* ! BOARD_BCM963XX_H_ */
> Index: patches-3.2/977-ssb_export_fallback_sprom.patch
> ===================================================================
> --- patches-3.2/977-ssb_export_fallback_sprom.patch (revisión: 29846)
> +++ patches-3.2/977-ssb_export_fallback_sprom.patch (copia de trabajo)
> @@ -1,6 +1,6 @@
> --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> -@@ -2109,7 +2109,7 @@ static void __init nb4_nvram_fixup(void)
> +@@ -2171,7 +2171,7 @@ static void __init nb4_nvram_fixup(void)
> * bcm4318 WLAN work
> */
> #ifdef CONFIG_SSB_PCIHOST
> @@ -9,7 +9,7 @@
> .revision = 0x02,
> .board_rev = 0x17,
> .country_code = 0x0,
> -@@ -2129,6 +2129,7 @@ static struct ssb_sprom bcm63xx_sprom =
> +@@ -2191,6 +2191,7 @@ static struct ssb_sprom bcm63xx_sprom =
> .boardflags_lo = 0x2848,
> .boardflags_hi = 0x0000,
> };
> Index: base-files/etc/defconfig/96348A-122/network
> ===================================================================
> --- base-files/etc/defconfig/96348A-122/network (revisión: 0)
> +++ base-files/etc/defconfig/96348A-122/network (revisión: 0)
> @@ -0,0 +1,14 @@
> +# Copyright (C) 2008 OpenWrt.org
> +
> +config interface loopback
> + option ifname lo
> + option proto static
> + option ipaddr 127.0.0.1
> + option netmask 255.0.0.0
> +
> +config interface lan
> + option type bridge
> + option ifname eth0
> + option proto static
> + option ipaddr 192.168.1.1
> + option netmask 255.255.255.0
>
> Cambios de propiedades en base-files/etc/defconfig/96348A-122/network
> ___________________________________________________________________
> Añadido: svn:executable
> + *
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
--
Florian
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
