mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

bcm53xx: update to kernel 3.14

Browse Source 
Use kernel 3.14 by default and refresh the patches

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

SVN-Revision: 41913
This commit is contained in:
Hauke Mehrtens 2014-07-31 21:44:41 +00:00
parent 350765676e
commit 69c403c234
7 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/bcm53xx/Makefile
View File

@ -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

2
target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch
View File

@ -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;

2
target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch
View File

@ -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, };

9
target/linux/bcm53xx/patches-3.14/131-ARM-BCM5301X-add-restart-support.patch
View File

@ -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

2
target/linux/bcm53xx/patches-3.14/141-bcma-store-more-alternative-addresses.patch
View File

@ -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;

2
target/linux/bcm53xx/patches-3.14/142-bcma-add-support-for-chipcommon-B-core.patch
View File

@ -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;

4
target/linux/bcm53xx/patches-3.14/160-bcma-add-PCI-IDs-for-more-devices.patch
View File

@ -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) },