From 2bab3e27962b39ef966e0612900fbe185b106241 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sat, 22 Nov 2014 12:25:52 +0000 Subject: brcm63xx: move board compatible strings into a table Move compatible strings from board structs into separate table. This allows for several board compatibles to match to the same board in case e.g. only the flash size / partitions differ. Signed-off-by: Jonas Gorski SVN-Revision: 43341 --- target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch') diff --git a/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch index 1743cb911f..1af8e4896f 100644 --- a/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch +++ b/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch @@ -8,13 +8,12 @@ Signed-off-by: Adrian Feliks --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1436,6 +1436,52 @@ static struct board_info __initdata boar +@@ -1424,6 +1424,51 @@ static struct board_info __initdata boar }, }; +static struct board_info __initdata board_96348gw_10_AR1004G = { + .name = "AR1004G", -+ .of_board_id = "asmax,ar1004g", + .expected_cpu_id = 0x6348, + + .has_uart0 = 1, @@ -61,7 +60,7 @@ Signed-off-by: Adrian Feliks /* BT Voyager 2110 */ static struct board_info __initdata board_V2110 = { -@@ -4259,6 +4305,7 @@ static const struct board_info __initcon +@@ -4221,6 +4266,7 @@ static const struct board_info __initcon &board_96348A_122, &board_CPVA502plus, &board_96348W3, @@ -69,3 +68,11 @@ Signed-off-by: Adrian Feliks #endif #ifdef CONFIG_BCM63XX_CPU_6358 +@@ -4275,6 +4321,7 @@ static struct of_device_id const bcm963x + { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, + #endif + #ifdef CONFIG_BCM63XX_CPU_6348 ++ { .compatible = "asmax,ar1004g", .data = &board_96348gw_10_AR1004G, }, + { .compatible = "brcm,bcm96348r", .data = &board_96348r, }, + { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, + { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, -- cgit v1.2.3