Author: jogo Date: 2015-03-25 16:35:24 +0100 (Wed, 25 Mar 2015) New Revision: 44987
Added: trunk/target/linux/brcm63xx/dts/bcm963268bu_p300.dts trunk/target/linux/brcm63xx/profiles/broadcom.mk Modified: trunk/target/linux/brcm63xx/base-files/lib/brcm63xx.sh trunk/target/linux/brcm63xx/image/Makefile trunk/target/linux/brcm63xx/patches-3.14/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch trunk/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch trunk/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch trunk/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch trunk/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch trunk/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch trunk/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch trunk/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch trunk/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch trunk/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch trunk/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch trunk/target/linux/brcm63xx/patches-3.14/568-board_DGND3700v1_3800B.patch trunk/target/linux/brcm63xx/patches-3.14/810-BCM63XX-move-kernel-behind-CFE.patch trunk/target/linux/brcm63xx/patches-3.18/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch trunk/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch trunk/target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch trunk/target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch trunk/target/linux/brcm63xx/patches-3.18/561-board_WAP-5813n.patch trunk/target/linux/brcm63xx/patches-3.18/562-board_VR-3025u.patch trunk/target/linux/brcm63xx/patches-3.18/563-board_VR-3025un.patch trunk/target/linux/brcm63xx/patches-3.18/564-board_P870HW-51a_v2.patch trunk/target/linux/brcm63xx/patches-3.18/565-board_hw520.patch trunk/target/linux/brcm63xx/patches-3.18/566-board_A4001N.patch trunk/target/linux/brcm63xx/patches-3.18/567-board_dsl-2751b_e1.patch trunk/target/linux/brcm63xx/patches-3.18/568-board_DGND3700v1_3800B.patch trunk/target/linux/brcm63xx/patches-3.18/569-board_homehub2a.patch trunk/target/linux/brcm63xx/patches-3.18/810-BCM63XX-move-kernel-behind-CFE.patch Log: brcm63xx: move bcm963268bu_p300 to dts Signed-off-by: Jonas Gorski <[email protected]> Modified: trunk/target/linux/brcm63xx/base-files/lib/brcm63xx.sh =================================================================== --- trunk/target/linux/brcm63xx/base-files/lib/brcm63xx.sh 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/base-files/lib/brcm63xx.sh 2015-03-25 15:35:24 UTC (rev 44987) @@ -30,6 +30,9 @@ "Broadcom 96348R reference board") board_name="bcm96348r" ;; + "Broadcom BCM963268BU_P300 reference board") + board_name="bcm963268bu_p300" + ;; "Broadcom bcm963281TAN reference board") board_name="bcm963281tan" ;; @@ -207,9 +210,6 @@ local board_name case "$1" in - 963268BU_P300) - board_name="bcm963268bu_p300" - ;; 96338W2_E7T) board_name="dsl-2640u" ;; Added: trunk/target/linux/brcm63xx/dts/bcm963268bu_p300.dts =================================================================== --- trunk/target/linux/brcm63xx/dts/bcm963268bu_p300.dts (rev 0) +++ trunk/target/linux/brcm63xx/dts/bcm963268bu_p300.dts 2015-03-25 15:35:24 UTC (rev 44987) @@ -0,0 +1,28 @@ +/dts-v1/; + +/include/ "bcm63268.dtsi" + +/ { + model = "Broadcom BCM963268BU_P300 reference board"; + compatible = "brcm,bcm963268bu_p300", "brcm,bcm63268"; + + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + debounce-interval = <60>; + + reset { + label = "reset"; + gpios = <&gpio1 0 0>; + linux,code = <0x198>; + }; + + wps { + label = "wps"; + gpios = <&gpio1 1 0>; + linux,code = <0x211>; + }; + }; +}; Modified: trunk/target/linux/brcm63xx/image/Makefile =================================================================== --- trunk/target/linux/brcm63xx/image/Makefile 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/image/Makefile 2015-03-25 15:35:24 UTC (rev 44987) @@ -275,6 +275,8 @@ $(eval $(call ImageDTB,CFEDTB,AR1004G,AR1004G,ar1004g,96348GW-10,6348)) # Belkin F5D7633 $(eval $(call ImageDTB,CFEDTB,F5D7633,F5D7633,f5d7633,96348GW-10,6348,--block-size 0x20000 --image-offset 0x20000)) +# Broadcom BCM963268BU_P300 +$(eval $(call ImageDTB,Dummy,BCM963268BU_P300,BCM963268BU_P300,bcm963268bu_p300,963268BU_P300,63268)) # BT Home Hub 2.0 A $(eval $(call ImageDTB,CFEDTB,BTHOMEHUB2A,HomeHub2A,homehub2a,HOMEHUB2A,6358,--image-offset 0x20000 --block-size 0x20000)) # BT Voyager V2500V, V2500V_SIP_CLUB, V2500V_AA Modified: trunk/target/linux/brcm63xx/patches-3.14/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -9,12 +9,12 @@ Signed-off-by: Jonas Gorski <[email protected]> --- - arch/mips/bcm63xx/boards/board_bcm963xx.c | 35 +++++++++++++++++++++++++++++ - 1 file changed, 35 insertions(+) + arch/mips/bcm63xx/boards/board_bcm963xx.c | 34 +++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -716,6 +716,49 @@ static const struct board_info __initcon +@@ -716,6 +716,48 @@ static const struct board_info __initcon }; static struct of_device_id const bcm963xx_boards_dt[] = { @@ -58,7 +58,6 @@ +#ifdef CONFIG_BCM63XX_CPU_6368 +#endif +#ifdef CONFIG_BCM63XX_CPU_63268 -+ { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, +#endif +#endif /* CONFIG_OF */ { }, Modified: trunk/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -44,7 +44,7 @@ { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, -@@ -1181,6 +1204,22 @@ void __init board_bcm963xx_init(void) +@@ -1180,6 +1203,22 @@ void __init board_bcm963xx_init(void) val &= MPI_CSBASE_BASE_MASK; } boot_addr = (u8 *)KSEG1ADDR(val); Modified: trunk/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -88,7 +88,7 @@ + { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + #endif --- a/arch/mips/bcm63xx/boards/board_common.c +++ b/arch/mips/bcm63xx/boards/board_common.c @@ -88,12 +88,25 @@ void __init board_early_setup(const stru Modified: trunk/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1925,6 +1925,131 @@ static struct board_info __initdata boar +@@ -1925,6 +1925,66 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -62,77 +62,12 @@ + }, + }, + }, -+ -+ .leds = { -+ { -+ .name = "963268BU_P300:green:power", -+ .gpio = 20, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:red:power", -+ .gpio = 21, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:internet", -+ .gpio = 8, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:red:internet", -+ .gpio = 2, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:adsl", -+ .gpio = 3, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:wps", -+ .gpio = 7, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:voip1", -+ .gpio = 4, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:voip2", -+ .gpio = 5, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:pots", -+ .gpio = 6, -+ .active_low = 1, -+ }, -+ }, -+ -+ .buttons = { -+ { -+ .desc = "reset", -+ .gpio = 32, -+ .type = EV_KEY, -+ .code = KEY_RESTART, -+ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, -+ }, -+ { -+ .desc = "wps", -+ .gpio = 33, -+ .type = EV_KEY, -+ .code = KEY_WPS_BUTTON, -+ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, -+ }, -+ }, +}; + static struct board_info __initdata board_963269bhr = { .name = "963269BHR", .expected_cpu_id = 0x63268, -@@ -2175,6 +2300,7 @@ static const struct board_info __initcon +@@ -2175,6 +2235,7 @@ static const struct board_info __initcon &board_96368mvngr, #endif #ifdef CONFIG_BCM63XX_CPU_63268 @@ -140,3 +75,11 @@ &board_963269bhr, &board_vw6339gu, #endif +@@ -2255,6 +2316,7 @@ static struct of_device_id const bcm963x + { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, + #endif + #ifdef CONFIG_BCM63XX_CPU_63268 ++ { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + #endif + #endif /* CONFIG_OF */ + { }, Modified: trunk/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -76,7 +76,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -2298,6 +2359,7 @@ static const struct board_info __initcon +@@ -2233,6 +2294,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -84,11 +84,11 @@ #endif #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, -@@ -2379,6 +2441,7 @@ static struct of_device_id const bcm963x +@@ -2314,6 +2376,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, + { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, Modified: trunk/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -61,7 +61,7 @@ static struct b53_platform_data WAP5813n_b53_pdata = { .alias = "eth0", }; -@@ -2359,6 +2413,7 @@ static const struct board_info __initcon +@@ -2294,6 +2348,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -69,7 +69,7 @@ &board_WAP5813n, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2441,6 +2496,7 @@ static struct of_device_id const bcm963x +@@ -2376,6 +2431,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, Modified: trunk/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -61,7 +61,7 @@ static struct b53_platform_data WAP5813n_b53_pdata = { .alias = "eth0", }; -@@ -2414,6 +2468,7 @@ static const struct board_info __initcon +@@ -2349,6 +2403,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, @@ -69,7 +69,7 @@ &board_WAP5813n, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2497,6 +2552,7 @@ static struct of_device_id const bcm963x +@@ -2432,6 +2487,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, Modified: trunk/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -50,7 +50,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -2467,6 +2510,7 @@ static const struct board_info __initcon +@@ -2402,6 +2445,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -58,11 +58,11 @@ &board_VR3025u, &board_VR3025un, &board_WAP5813n, -@@ -2554,6 +2598,7 @@ static struct of_device_id const bcm963x +@@ -2489,6 +2533,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, + { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, Modified: trunk/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -38,7 +38,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -2494,6 +2525,7 @@ static const struct board_info __initcon +@@ -2429,6 +2460,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -46,7 +46,7 @@ &board_HW553, &board_HW556_A, &board_HW556_B, -@@ -2575,6 +2607,7 @@ static struct of_device_id const bcm963x +@@ -2510,6 +2542,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, Modified: trunk/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -51,7 +51,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -2476,6 +2520,7 @@ static const struct board_info __initcon +@@ -2411,6 +2455,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, @@ -59,7 +59,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2560,6 +2605,7 @@ static struct of_device_id const bcm963x +@@ -2495,6 +2540,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 Modified: trunk/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -142,7 +142,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2514,6 +2649,7 @@ static const struct board_info __initcon +@@ -2449,6 +2584,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, Modified: trunk/target/linux/brcm63xx/patches-3.14/568-board_DGND3700v1_3800B.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/568-board_DGND3700v1_3800B.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/568-board_DGND3700v1_3800B.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -49,7 +49,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2723,6 +2765,7 @@ static const struct board_info __initcon +@@ -2658,6 +2700,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -57,7 +57,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2813,6 +2856,7 @@ static struct of_device_id const bcm963x +@@ -2748,6 +2791,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, Modified: trunk/target/linux/brcm63xx/patches-3.14/810-BCM63XX-move-kernel-behind-CFE.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.14/810-BCM63XX-move-kernel-behind-CFE.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.14/810-BCM63XX-move-kernel-behind-CFE.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -19,8 +19,6 @@ arch/mips/bcm63xx/Platform | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/mips/bcm63xx/Platform b/arch/mips/bcm63xx/Platform -index 5f86b2f..ee73f8f 100644 --- a/arch/mips/bcm63xx/Platform +++ b/arch/mips/bcm63xx/Platform @@ -4,4 +4,4 @@ @@ -29,6 +27,3 @@ -I$(srctree)/arch/mips/include/asm/mach-bcm63xx/ -load-$(CONFIG_BCM63XX) := 0xffffffff80010000 +load-$(CONFIG_BCM63XX) := 0xffffffff80800000 --- -1.7.10.4 - Modified: trunk/target/linux/brcm63xx/patches-3.18/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -9,12 +9,12 @@ Signed-off-by: Jonas Gorski <[email protected]> --- - arch/mips/bcm63xx/boards/board_bcm963xx.c | 35 +++++++++++++++++++++++++++++ - 1 file changed, 35 insertions(+) + arch/mips/bcm63xx/boards/board_bcm963xx.c | 34 +++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -716,6 +716,49 @@ static const struct board_info __initcon +@@ -716,6 +716,48 @@ static const struct board_info __initcon }; static struct of_device_id const bcm963xx_boards_dt[] = { @@ -58,7 +58,6 @@ +#ifdef CONFIG_BCM63XX_CPU_6368 +#endif +#ifdef CONFIG_BCM63XX_CPU_63268 -+ { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, +#endif +#endif /* CONFIG_OF */ { }, Modified: trunk/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -44,7 +44,7 @@ { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, -@@ -1181,6 +1204,22 @@ void __init board_bcm963xx_init(void) +@@ -1180,6 +1203,22 @@ void __init board_bcm963xx_init(void) val &= MPI_CSBASE_BASE_MASK; } boot_addr = (u8 *)KSEG1ADDR(val); Modified: trunk/target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -88,7 +88,7 @@ + { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + #endif --- a/arch/mips/bcm63xx/boards/board_common.c +++ b/arch/mips/bcm63xx/boards/board_common.c @@ -88,12 +88,25 @@ void __init board_early_setup(const stru Modified: trunk/target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/560-board_963268gu_p300.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1925,6 +1925,131 @@ static struct board_info __initdata boar +@@ -1925,6 +1925,66 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -62,77 +62,12 @@ + }, + }, + }, -+ -+ .leds = { -+ { -+ .name = "963268BU_P300:green:power", -+ .gpio = 20, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:red:power", -+ .gpio = 21, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:internet", -+ .gpio = 8, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:red:internet", -+ .gpio = 2, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:adsl", -+ .gpio = 3, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:wps", -+ .gpio = 7, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:voip1", -+ .gpio = 4, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:voip2", -+ .gpio = 5, -+ .active_low = 1, -+ }, -+ { -+ .name = "963268BU_P300:green:pots", -+ .gpio = 6, -+ .active_low = 1, -+ }, -+ }, -+ -+ .buttons = { -+ { -+ .desc = "reset", -+ .gpio = 32, -+ .type = EV_KEY, -+ .code = KEY_RESTART, -+ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, -+ }, -+ { -+ .desc = "wps", -+ .gpio = 33, -+ .type = EV_KEY, -+ .code = KEY_WPS_BUTTON, -+ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, -+ }, -+ }, +}; + static struct board_info __initdata board_963269bhr = { .name = "963269BHR", .expected_cpu_id = 0x63268, -@@ -2175,6 +2300,7 @@ static const struct board_info __initcon +@@ -2175,6 +2235,7 @@ static const struct board_info __initcon &board_96368mvngr, #endif #ifdef CONFIG_BCM63XX_CPU_63268 @@ -140,3 +75,11 @@ &board_963269bhr, &board_vw6339gu, #endif +@@ -2255,6 +2316,7 @@ static struct of_device_id const bcm963x + { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, + #endif + #ifdef CONFIG_BCM63XX_CPU_63268 ++ { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + #endif + #endif /* CONFIG_OF */ + { }, Modified: trunk/target/linux/brcm63xx/patches-3.18/561-board_WAP-5813n.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/561-board_WAP-5813n.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/561-board_WAP-5813n.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -76,7 +76,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -2298,6 +2359,7 @@ static const struct board_info __initcon +@@ -2233,6 +2294,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -84,11 +84,11 @@ #endif #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, -@@ -2379,6 +2441,7 @@ static struct of_device_id const bcm963x +@@ -2314,6 +2376,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, + { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, Modified: trunk/target/linux/brcm63xx/patches-3.18/562-board_VR-3025u.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/562-board_VR-3025u.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/562-board_VR-3025u.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -61,7 +61,7 @@ static struct b53_platform_data WAP5813n_b53_pdata = { .alias = "eth0", }; -@@ -2359,6 +2413,7 @@ static const struct board_info __initcon +@@ -2294,6 +2348,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -69,7 +69,7 @@ &board_WAP5813n, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2441,6 +2496,7 @@ static struct of_device_id const bcm963x +@@ -2376,6 +2431,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, Modified: trunk/target/linux/brcm63xx/patches-3.18/563-board_VR-3025un.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/563-board_VR-3025un.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/563-board_VR-3025un.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -61,7 +61,7 @@ static struct b53_platform_data WAP5813n_b53_pdata = { .alias = "eth0", }; -@@ -2414,6 +2468,7 @@ static const struct board_info __initcon +@@ -2349,6 +2403,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, @@ -69,7 +69,7 @@ &board_WAP5813n, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2497,6 +2552,7 @@ static struct of_device_id const bcm963x +@@ -2432,6 +2487,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, Modified: trunk/target/linux/brcm63xx/patches-3.18/564-board_P870HW-51a_v2.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/564-board_P870HW-51a_v2.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/564-board_P870HW-51a_v2.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -50,7 +50,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -2467,6 +2510,7 @@ static const struct board_info __initcon +@@ -2402,6 +2445,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -58,11 +58,11 @@ &board_VR3025u, &board_VR3025un, &board_WAP5813n, -@@ -2554,6 +2598,7 @@ static struct of_device_id const bcm963x +@@ -2489,6 +2533,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, + { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 - { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, + { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, Modified: trunk/target/linux/brcm63xx/patches-3.18/565-board_hw520.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/565-board_hw520.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/565-board_hw520.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -38,7 +38,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -2494,6 +2525,7 @@ static const struct board_info __initcon +@@ -2429,6 +2460,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -46,7 +46,7 @@ &board_HW553, &board_HW556_A, &board_HW556_B, -@@ -2575,6 +2607,7 @@ static struct of_device_id const bcm963x +@@ -2510,6 +2542,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, Modified: trunk/target/linux/brcm63xx/patches-3.18/566-board_A4001N.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/566-board_A4001N.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/566-board_A4001N.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -51,7 +51,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -2476,6 +2520,7 @@ static const struct board_info __initcon +@@ -2411,6 +2455,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, @@ -59,7 +59,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2560,6 +2605,7 @@ static struct of_device_id const bcm963x +@@ -2495,6 +2540,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 Modified: trunk/target/linux/brcm63xx/patches-3.18/567-board_dsl-2751b_e1.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/567-board_dsl-2751b_e1.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/567-board_dsl-2751b_e1.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -142,7 +142,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2514,6 +2649,7 @@ static const struct board_info __initcon +@@ -2449,6 +2584,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, Modified: trunk/target/linux/brcm63xx/patches-3.18/568-board_DGND3700v1_3800B.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/568-board_DGND3700v1_3800B.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/568-board_DGND3700v1_3800B.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -49,7 +49,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2723,6 +2765,7 @@ static const struct board_info __initcon +@@ -2658,6 +2700,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -57,7 +57,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2813,6 +2856,7 @@ static struct of_device_id const bcm963x +@@ -2748,6 +2791,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, Modified: trunk/target/linux/brcm63xx/patches-3.18/569-board_homehub2a.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/569-board_homehub2a.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/569-board_homehub2a.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1748,6 +1748,32 @@ +@@ -1748,6 +1748,32 @@ static struct board_info __initdata boar }, }; @@ -33,7 +33,7 @@ static struct board_info __initdata board_HW520 = { .name = "HW6358GW_B", .expected_cpu_id = 0x6358, -@@ -2748,6 +2774,7 @@ +@@ -2683,6 +2709,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -41,7 +41,7 @@ &board_HW520, &board_HW553, &board_HW556_A, -@@ -2845,6 +2872,7 @@ +@@ -2780,6 +2807,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, { .compatible = "t-com,spw303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, Modified: trunk/target/linux/brcm63xx/patches-3.18/810-BCM63XX-move-kernel-behind-CFE.patch =================================================================== --- trunk/target/linux/brcm63xx/patches-3.18/810-BCM63XX-move-kernel-behind-CFE.patch 2015-03-25 15:35:15 UTC (rev 44986) +++ trunk/target/linux/brcm63xx/patches-3.18/810-BCM63XX-move-kernel-behind-CFE.patch 2015-03-25 15:35:24 UTC (rev 44987) @@ -19,8 +19,6 @@ arch/mips/bcm63xx/Platform | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/mips/bcm63xx/Platform b/arch/mips/bcm63xx/Platform -index 5f86b2f..ee73f8f 100644 --- a/arch/mips/bcm63xx/Platform +++ b/arch/mips/bcm63xx/Platform @@ -4,4 +4,4 @@ @@ -29,6 +27,3 @@ -I$(srctree)/arch/mips/include/asm/mach-bcm63xx/ -load-$(CONFIG_BCM63XX) := 0xffffffff80010000 +load-$(CONFIG_BCM63XX) := 0xffffffff80800000 --- -1.7.10.4 - Added: trunk/target/linux/brcm63xx/profiles/broadcom.mk =================================================================== --- trunk/target/linux/brcm63xx/profiles/broadcom.mk (rev 0) +++ trunk/target/linux/brcm63xx/profiles/broadcom.mk 2015-03-25 15:35:24 UTC (rev 44987) @@ -0,0 +1,15 @@ +# +# Copyright (C) 2014 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/BCM963268BU_P300 + NAME:=Broadcom BCM96328BU_P300 reference board + PACKAGES:= kmod-usb-ohci kmod-usb2 kmod-bcm63xx-udc +endef +define Profile/BCM963268BU_P300/Description + Package set optimized for the Broadcom BCM963268BU_P300 reference boar. +endef +$(eval $(call Profile,BCM963268BU_P300)) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
