brcm63xx: add and enable support for loading an appended dtb

[openwrt.git] / target / linux / brcm63xx / patches-3.14 / 413-BCM63XX-allow-providing-fixup-data-in-board-data.patch

diff --git a/target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
index b4ccc26..3ef4585 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
+++ b/target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
 
 --- a/arch/mips/bcm63xx/boards/board_common.c
 +++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -33,6 +33,7 @@
+@@ -36,6 +36,7 @@
  #include <bcm63xx_dev_usb_ohci.h>
  #include <bcm63xx_dev_usb_usbd.h>
  #include <board_bcm963xx.h>
@@ -18,15 +18,15 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
  
  #include "board_common.h"
  
-@@ -159,6 +160,7 @@ int __init board_register_devices(void)
+@@ -184,6 +185,7 @@ int __init board_register_devices(void)
        int button_count = 0;
        int led_count = 0;
        int usbh_ports = 0;
 +      int i;
  
-       if (board.has_uart0)
-               bcm63xx_uart_register(0);
-@@ -247,5 +249,9 @@ int __init board_register_devices(void)
+ #if CONFIG_OF
+       if (of_have_populated_dt()) {
+@@ -281,6 +283,10 @@ int __init board_register_devices(void)
                platform_device_register(&bcm63xx_gpio_keys_device);
        }
  
@@ -36,6 +36,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
 +
        return 0;
  }
+ 
 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 @@ -9,6 +9,7 @@
@@ -58,7 +59,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
  /*
   * board definition
   */
-@@ -36,6 +42,10 @@ struct board_info {
+@@ -37,6 +43,10 @@ struct board_info {
        unsigned int    has_uart0:1;
        unsigned int    has_uart1:1;
        unsigned int    use_fallback_sprom:1;