brcm63xx: enhance dt partitions support to match upstream more closely

[openwrt/openwrt.git] / target / linux / brcm63xx / patches-4.4 / 520-bcm63xx-add-support-for-96368MVWG-board.patch

diff --git a/target/linux/brcm63xx/patches-4.4/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-4.4/520-bcm63xx-add-support-for-96368MVWG-board.patch
index 0175104d33784e718426b489a688065883247bb8..31002842f159976a79fa6c5072c1077d910e6285 100644 (file)
--- a/target/linux/brcm63xx/patches-4.4/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-4.4/520-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1141,6 +1141,59 @@ static struct board_info __initdata boar
+@@ -840,6 +840,58 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
@@ -21,7 +21,6 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 +      .name                           = "96368MVWG",
 +      .expected_cpu_id                = 0x6368,
 +
-+      .has_uart0                      = 1,
 +      .has_pci                        = 1,
 +
 +      .has_usbd                       = 1,
@@ -70,7 +69,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1192,6 +1245,10 @@ static const struct board_info __initcon
+@@ -891,6 +943,10 @@ static const struct board_info __initcon
        &board_HW553,
        &board_spw303v,
  #endif
@@ -81,7 +80,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1252,6 +1309,7 @@ static struct of_device_id const bcm963x
+@@ -951,6 +1007,7 @@ static struct of_device_id const bcm963x
        { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368
@@ -91,7 +90,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  #endif
 --- a/arch/mips/bcm63xx/boards/board_common.c
 +++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -83,12 +83,25 @@ void __init board_early_setup(const stru
+@@ -82,12 +82,25 @@ void __init board_early_setup(const stru
                bcm63xx_pci_enabled = 1;
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G2_PCI;