aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-4.4/511-board_V2500V.patch
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-07-31 21:03:37 +0200
committerJonas Gorski <jonas.gorski@gmail.com>2017-12-16 12:57:05 +0100
commitaba4e29eadfb82ef7f52f85cdb4cd10a4abad622 (patch)
tree623fbf65cee966aed29b170859a92efa099552e2 /target/linux/brcm63xx/patches-4.4/511-board_V2500V.patch
parenta3384088a212cb1458746624f016f93ff98135f3 (diff)
downloadupstream-aba4e29eadfb82ef7f52f85cdb4cd10a4abad622.tar.gz
upstream-aba4e29eadfb82ef7f52f85cdb4cd10a4abad622.tar.bz2
upstream-aba4e29eadfb82ef7f52f85cdb4cd10a4abad622.zip
brcm63xx: register serial through device tree
Register serial consoles through device tree instead of through board data. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/511-board_V2500V.patch')
-rw-r--r--target/linux/brcm63xx/patches-4.4/511-board_V2500V.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/511-board_V2500V.patch b/target/linux/brcm63xx/patches-4.4/511-board_V2500V.patch
index 3ac6c18003..46909b0737 100644
--- a/target/linux/brcm63xx/patches-4.4/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-4.4/511-board_V2500V.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -716,6 +716,27 @@ static struct board_info __initdata boar
+@@ -483,6 +483,26 @@ static struct board_info __initdata boar
.ext_irq = 2,
},
};
@@ -9,7 +9,6 @@
+ .name = "V2500V_BB",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
@@ -28,7 +27,7 @@
#endif /* CONFIG_BCM63XX_CPU_6348 */
/*
-@@ -1048,6 +1069,7 @@ static const struct board_info __initcon
+@@ -755,6 +775,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
@@ -36,7 +35,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1087,6 +1109,7 @@ static struct of_device_id const bcm963x
+@@ -794,6 +815,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
@@ -44,7 +43,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, },
-@@ -1146,6 +1169,22 @@ void __init board_bcm963xx_init(void)
+@@ -853,6 +875,22 @@ void __init board_bcm963xx_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);
@@ -76,8 +75,8 @@
+#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
#include <bcm63xx_dev_flash.h>
- #include <bcm63xx_dev_hsspi.h>
-@@ -248,6 +249,13 @@ int __init bcm63xx_flash_register(void)
+ #include <bcm63xx_regs.h>
+@@ -247,6 +248,13 @@ int __init bcm63xx_flash_register(void)
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;