bcm53xx: update to kernel 3.14

Use kernel 3.14 by default and refresh the patches

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 41913

7 files changed, 9 insertions, 14 deletions

diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile
index 679997c0a7..e8e8b431b6 100644
--- a/target/linux/bcm53xx/Makefile
+++ b/target/linux/bcm53xx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs usb pci pcie gpio
 MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 CPU_TYPE:=cortex-a9
 
-LINUX_VERSION:=3.10.49
+LINUX_VERSION:=3.14.14
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch b/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch
index 5b4a79ea51..0db670a619 100644
--- a/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch
+++ b/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch
@@ -104,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +#endif /* CONFIG_OF */
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
-@@ -322,6 +322,8 @@ struct bcma_bus {
+@@ -323,6 +323,8 @@ struct bcma_bus {
  		struct pci_dev *host_pci;
  		/* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */
  		struct sdio_func *host_sdio;
diff --git a/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch b/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch
index a10542e7d3..0bf1308045 100644
--- a/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch
+++ b/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch
@@ -70,7 +70,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  static int bcma_fill_sprom_with_fallback(struct bcma_bus *bus,
  					 struct ssb_sprom *out)
  {
-@@ -579,7 +621,14 @@ int bcma_sprom_get(struct bcma_bus *bus)
+@@ -580,7 +622,14 @@ int bcma_sprom_get(struct bcma_bus *bus)
  	u16 *sprom;
  	size_t sprom_sizes[] = { SSB_SPROMSIZE_WORDS_R4,
  				 SSB_SPROMSIZE_WORDS_R10, };
diff --git a/target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch b/target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch
index 7fdbaa3853..46464dc042 100644
--- a/target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch
+++ b/target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch
@@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  arch/arm/mach-bcm/bcm_5301x.c | 31 +++++++++++++++++++++++++++++++
  1 file changed, 31 insertions(+)
 
-diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c
-index edff697..e349897 100644
 --- a/arch/arm/mach-bcm/bcm_5301x.c
 +++ b/arch/arm/mach-bcm/bcm_5301x.c
 @@ -12,9 +12,26 @@
@@ -42,7 +40,7 @@ index edff697..e349897 100644
  static int bcm5301x_abort_handler(unsigned long addr, unsigned int fsr,
  				 struct pt_regs *regs)
  {
-@@ -49,6 +66,19 @@ static void __init bcm5301x_dt_init(void)
+@@ -49,6 +66,19 @@ static void __init bcm5301x_dt_init(void
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  }
  
@@ -62,13 +60,10 @@ index edff697..e349897 100644
  static const char __initconst *bcm5301x_dt_compat[] = {
  	"brcm,bcm4708",
  	NULL,
-@@ -57,5 +87,6 @@ static const char __initconst *bcm5301x_dt_compat[] = {
+@@ -57,5 +87,6 @@ static const char __initconst *bcm5301x_
  DT_MACHINE_START(BCM5301X, "BCM5301X")
  	.init_early	= bcm5301x_init_early,
  	.init_machine	= bcm5301x_dt_init,
 +	.restart	= bcm5301x_restart,
  	.dt_compat	= bcm5301x_dt_compat,
  MACHINE_END
--- 
-1.8.4.5
-
diff --git a/target/linux/bcm53xx/patches-3.14/141-bcma-store-more-alternative-addresses.patch b/target/linux/bcm53xx/patches-3.14/141-bcma-store-more-alternative-addresses.patch
index 6562f729a1..bb3ce62e90 100644
--- a/target/linux/bcm53xx/patches-3.14/141-bcma-store-more-alternative-addresses.patch
+++ b/target/linux/bcm53xx/patches-3.14/141-bcma-store-more-alternative-addresses.patch
@@ -60,7 +60,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  		ohci_addr = 0x18009000;
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
-@@ -266,7 +266,7 @@ struct bcma_device {
+@@ -267,7 +267,7 @@ struct bcma_device {
  	u8 core_unit;
  
  	u32 addr;
diff --git a/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch b/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
index dd4d284aaa..e4e2163a4f 100644
--- a/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
+++ b/target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
@@ -148,7 +148,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  		default:
 --- a/include/linux/bcma/bcma.h
 +++ b/include/linux/bcma/bcma.h
-@@ -337,6 +337,7 @@ struct bcma_bus {
+@@ -338,6 +338,7 @@ struct bcma_bus {
  	u8 num;
  
  	struct bcma_drv_cc drv_cc;
diff --git a/target/linux/bcm53xx/patches-3.14/160-bcma-add-PCI-IDs-for-more-devices.patch b/target/linux/bcm53xx/patches-3.14/160-bcma-add-PCI-IDs-for-more-devices.patch
index 830ae5ee3f..bbf669ba0e 100644
--- a/target/linux/bcm53xx/patches-3.14/160-bcma-add-PCI-IDs-for-more-devices.patch
+++ b/target/linux/bcm53xx/patches-3.14/160-bcma-add-PCI-IDs-for-more-devices.patch
@@ -13,9 +13,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/drivers/bcma/host_pci.c
 +++ b/drivers/bcma/host_pci.c
-@@ -281,6 +281,8 @@ static const struct pci_device_id bcma_p
- 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4365) },
+@@ -282,6 +282,8 @@ static const struct pci_device_id bcma_p
  	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
 +	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },
 +	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4360) },