mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 05:54:26 -04:00
9261e7447e
This makes the patches which were just copied in the previous commit apply on top of kernel 4.19. The patches in the backports-4.19 folder were checked if they are really in kernel 4.19 based on the title and only removed if they were found in the upstream kernel. The following additional patches form the pending folder went into upstream Linux 4.19: pending-4.19/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch pending-4.19/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch pending-4.19/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch pending-4.19/479-mtd-spi-nor-add-eon-en25qh32.patch pending-4.19/950-tty-serial-exar-generalize-rs485-setup.patch pending-4.19/340-MIPS-mm-remove-mips_dma_mapping_error.patch Bigger changes were introduced to the m25p80 spi nor driver, as far as I saw it in the new code, it now has the functionality provided in this patch: pending-4.19/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch Part of this patch went upstream independent of OpenWrt: hack-4.19/220-gc_sections.patch This patch was reworked to match the changes done upstream. The MIPS DMA API changed a lot, this patch was rewritten to match the new DMA handling: pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch I did bigger manual changes to the following patches and I am not 100% sure if they are all correct: pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch pending-4.19/411-mtd-partial_eraseblock_write.patch pending-4.19/600-netfilter_conntrack_flush.patch pending-4.19/611-netfilter_match_bypass_default_table.patch pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch hack-4.19/211-host_tools_portability.patch hack-4.19/221-module_exports.patch hack-4.19/321-powerpc_crtsavres_prereq.patch hack-4.19/902-debloat_proc.patch This is based on patchset from Marko Ratkaj <marko.ratkaj@sartura.hr> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
99 lines
3.1 KiB
Diff
99 lines
3.1 KiB
Diff
From 3cb240533ab787899dc7f17aa7d6c5b4810e2e58 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Fri, 7 Jul 2017 17:26:01 +0200
|
|
Subject: bcm53xx: bgmac: use srab switch driver
|
|
|
|
use the srab switch driver on these SoCs.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
drivers/net/ethernet/broadcom/bgmac-bcma.c | 1 +
|
|
drivers/net/ethernet/broadcom/bgmac.c | 24 ++++++++++++++++++++++++
|
|
drivers/net/ethernet/broadcom/bgmac.h | 4 ++++
|
|
3 files changed, 29 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
|
|
@@ -268,6 +268,7 @@ static int bgmac_probe(struct bcma_devic
|
|
bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
|
|
bgmac->feature_flags |= BGMAC_FEAT_NO_RESET;
|
|
bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500;
|
|
+ bgmac->feature_flags |= BGMAC_FEAT_SRAB;
|
|
break;
|
|
default:
|
|
bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
|
|
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
|
@@ -12,6 +12,7 @@
|
|
#include <linux/bcma/bcma.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/interrupt.h>
|
|
+#include <linux/platform_data/b53.h>
|
|
#include <linux/bcm47xx_nvram.h>
|
|
#include <linux/phy.h>
|
|
#include <linux/phy_fixed.h>
|
|
@@ -1409,6 +1410,17 @@ static const struct ethtool_ops bgmac_et
|
|
.set_link_ksettings = phy_ethtool_set_link_ksettings,
|
|
};
|
|
|
|
+static struct b53_platform_data bgmac_b53_pdata = {
|
|
+};
|
|
+
|
|
+static struct platform_device bgmac_b53_dev = {
|
|
+ .name = "b53-srab-switch",
|
|
+ .id = -1,
|
|
+ .dev = {
|
|
+ .platform_data = &bgmac_b53_pdata,
|
|
+ },
|
|
+};
|
|
+
|
|
/**************************************************
|
|
* MII
|
|
**************************************************/
|
|
@@ -1540,6 +1552,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
|
|
net_dev->hw_features = net_dev->features;
|
|
net_dev->vlan_features = net_dev->features;
|
|
|
|
+ if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
|
|
+ bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
|
|
+
|
|
+ err = platform_device_register(&bgmac_b53_dev);
|
|
+ if (!err)
|
|
+ bgmac->b53_device = &bgmac_b53_dev;
|
|
+ }
|
|
+
|
|
err = register_netdev(bgmac->net_dev);
|
|
if (err) {
|
|
dev_err(bgmac->dev, "Cannot register net device\n");
|
|
@@ -1562,6 +1582,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
|
|
|
|
void bgmac_enet_remove(struct bgmac *bgmac)
|
|
{
|
|
+ if (bgmac->b53_device)
|
|
+ platform_device_unregister(&bgmac_b53_dev);
|
|
+ bgmac->b53_device = NULL;
|
|
+
|
|
unregister_netdev(bgmac->net_dev);
|
|
phy_disconnect(bgmac->net_dev->phydev);
|
|
netif_napi_del(&bgmac->napi);
|
|
--- a/drivers/net/ethernet/broadcom/bgmac.h
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac.h
|
|
@@ -427,6 +427,7 @@
|
|
#define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII BIT(18)
|
|
#define BGMAC_FEAT_CC7_IF_TYPE_RGMII BIT(19)
|
|
#define BGMAC_FEAT_IDM_MASK BIT(20)
|
|
+#define BGMAC_FEAT_SRAB BIT(21)
|
|
|
|
struct bgmac_slot_info {
|
|
union {
|
|
@@ -532,6 +533,9 @@ struct bgmac {
|
|
void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask,
|
|
u32 set);
|
|
int (*phy_connect)(struct bgmac *bgmac);
|
|
+
|
|
+ /* platform device for associated switch */
|
|
+ struct platform_device *b53_device;
|
|
};
|
|
|
|
struct bgmac *bgmac_alloc(struct device *dev);
|