aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-08-11 11:37:01 +0000
committerJonas Gorski <jogo@openwrt.org>2014-08-11 11:37:01 +0000
commit9c6287d6a14b7f7105e4b61774c5310cb96489c3 (patch)
tree9d73aef68371873277ac1764244d0977f0661029 /target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
parent79057c72551647fdb5ebaac28eccd6b21e28ddca (diff)
downloadupstream-9c6287d6a14b7f7105e4b61774c5310cb96489c3.tar.gz
upstream-9c6287d6a14b7f7105e4b61774c5310cb96489c3.tar.bz2
upstream-9c6287d6a14b7f7105e4b61774c5310cb96489c3.zip
brcm63xx: add support for registering parallel flash through dtb
Add the required nodes to the dtsi files and code to prevent double registration from the board support code. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 42123
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch4
1 files changed, 2 insertions, 2 deletions
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 3ef4585590..320c297746 100644
--- 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
@@ -18,7 +18,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
#include "board_common.h"
-@@ -184,6 +185,7 @@ int __init board_register_devices(void)
+@@ -196,6 +197,7 @@ int __init board_register_devices(void)
int button_count = 0;
int led_count = 0;
int usbh_ports = 0;
@@ -26,7 +26,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
#if CONFIG_OF
if (of_have_populated_dt()) {
-@@ -281,6 +283,10 @@ int __init board_register_devices(void)
+@@ -293,6 +295,10 @@ int __init board_register_devices(void)
platform_device_register(&bcm63xx_gpio_keys_device);
}