From 1d0c4edda14e0be05362dc7c63de2eb378676a13 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Sat, 21 Jun 2014 19:23:38 +0000
Subject: brcm63xx: allow bcm963xx and livebox support at the same time

Use the CFE_EPTSEAL to tell them apart at runtime. Added for now only
for the 3.14 until properly tested.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41296 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../brcm63xx/patches-3.14/300-reset_buttons.patch  | 39 ++++++++++++++++------
 1 file changed, 29 insertions(+), 10 deletions(-)

(limited to 'target/linux/brcm63xx/patches-3.14/300-reset_buttons.patch')

diff --git a/target/linux/brcm63xx/patches-3.14/300-reset_buttons.patch b/target/linux/brcm63xx/patches-3.14/300-reset_buttons.patch
index 0886f6c5fc..c64d405496 100644
--- a/target/linux/brcm63xx/patches-3.14/300-reset_buttons.patch
+++ b/target/linux/brcm63xx/patches-3.14/300-reset_buttons.patch
@@ -1,25 +1,25 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -12,6 +12,8 @@
+@@ -10,6 +10,8 @@
+ #include <linux/init.h>
+ #include <linux/kernel.h>
  #include <linux/string.h>
- #include <linux/platform_device.h>
- #include <linux/ssb/ssb.h>
 +#include <linux/gpio_keys.h>
 +#include <linux/input.h>
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -37,6 +39,9 @@
+@@ -26,6 +28,9 @@
  
  #define HCS_OFFSET_128K			0x20000
  
 +#define BCM963XX_KEYS_POLL_INTERVAL	20
 +#define BCM963XX_KEYS_DEBOUNCE_INTERVAL	(BCM963XX_KEYS_POLL_INTERVAL * 3)
 +
- static struct board_info board;
- 
  /*
-@@ -380,6 +385,16 @@ static struct board_info __initdata boar
+  * known 3368 boards
+  */
+@@ -367,6 +372,16 @@ static struct board_info __initdata boar
  			.active_low	= 1,
  		},
  	},
@@ -36,7 +36,7 @@
  };
  
  static struct board_info __initdata board_96348gw = {
-@@ -438,6 +453,16 @@ static struct board_info __initdata boar
+@@ -425,6 +440,16 @@ static struct board_info __initdata boar
  			.active_low	= 1,
  		},
  	},
@@ -53,7 +53,26 @@
  };
  
  static struct board_info __initdata board_FAST2404 = {
-@@ -871,11 +896,23 @@ static struct platform_device bcm63xx_gp
+--- a/arch/mips/bcm63xx/boards/board_common.c
++++ b/arch/mips/bcm63xx/boards/board_common.c
+@@ -12,6 +12,7 @@
+ #include <linux/string.h>
+ #include <linux/platform_device.h>
+ #include <linux/ssb/ssb.h>
++#include <linux/gpio_keys.h>
+ #include <asm/addrspace.h>
+ #include <bcm63xx_board.h>
+ #include <bcm63xx_cpu.h>
+@@ -32,6 +33,8 @@
+ 
+ #define PFX	"board: "
+ 
++#define BCM963XX_KEYS_POLL_INTERVAL	20
++
+ static struct board_info board;
+ 
+ /*
+@@ -151,11 +154,23 @@ static struct platform_device bcm63xx_gp
  	.dev.platform_data	= &bcm63xx_led_data,
  };
  
@@ -77,7 +96,7 @@
  	if (board.has_uart0)
  		bcm63xx_uart_register(0);
  
-@@ -937,5 +974,16 @@ int __init board_register_devices(void)
+@@ -217,5 +232,16 @@ int __init board_register_devices(void)
  		gpio_request_one(board.ephy_reset_gpio,
  				board.ephy_reset_gpio_flags, "ephy-reset");
  
-- 
cgit v1.2.3