mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
ec6293febc
Ran update_kernel.sh in a fresh clone without any existing toolchains.
Manually rebased:
pending-5.4/611-netfilter_match_bypass_default_table.patch
The upstream change affecting this patch is the revert of an earlier
kernel commit. Therefore, we just revert our corresponding changes
in [1].
Build system: x86_64
Build-tested: ipq806x/R7800
[1] 9b1b89229f ("kernel: bump 5.4 to 5.4.86")
Signed-off-by: John Audia <graysky@archlinux.us>
[adjust manually rebased patch, add explanation]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
From 6859d91549341c2ad769d482de58129f080c0f04 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Thu, 18 Mar 2021 09:01:43 +0100
|
|
Subject: [PATCH 2/2] net: dsa: bcm_sf2: fix BCM4908 RGMII reg(s)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
BCM4908 has only 1 RGMII reg for controlling port 7.
|
|
|
|
Fixes: 73b7a6047971 ("net: dsa: bcm_sf2: support BCM4908's integrated switch")
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/bcm_sf2.c | 11 +++++++----
|
|
drivers/net/dsa/bcm_sf2_regs.h | 1 +
|
|
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/bcm_sf2.c
|
|
+++ b/drivers/net/dsa/bcm_sf2.c
|
|
@@ -35,7 +35,12 @@ static u16 bcm_sf2_reg_rgmii_cntrl(struc
|
|
{
|
|
switch (priv->type) {
|
|
case BCM4908_DEVICE_ID:
|
|
- /* TODO */
|
|
+ switch (port) {
|
|
+ case 7:
|
|
+ return REG_RGMII_11_CNTRL;
|
|
+ default:
|
|
+ break;
|
|
+ }
|
|
break;
|
|
default:
|
|
switch (port) {
|
|
@@ -1079,9 +1084,7 @@ static const u16 bcm_sf2_4908_reg_offset
|
|
[REG_PHY_REVISION] = 0x14,
|
|
[REG_SPHY_CNTRL] = 0x24,
|
|
[REG_CROSSBAR] = 0xc8,
|
|
- [REG_RGMII_0_CNTRL] = 0xe0,
|
|
- [REG_RGMII_1_CNTRL] = 0xec,
|
|
- [REG_RGMII_2_CNTRL] = 0xf8,
|
|
+ [REG_RGMII_11_CNTRL] = 0x014c,
|
|
[REG_LED_0_CNTRL] = 0x40,
|
|
[REG_LED_1_CNTRL] = 0x4c,
|
|
[REG_LED_2_CNTRL] = 0x58,
|
|
--- a/drivers/net/dsa/bcm_sf2_regs.h
|
|
+++ b/drivers/net/dsa/bcm_sf2_regs.h
|
|
@@ -21,6 +21,7 @@ enum bcm_sf2_reg_offs {
|
|
REG_RGMII_0_CNTRL,
|
|
REG_RGMII_1_CNTRL,
|
|
REG_RGMII_2_CNTRL,
|
|
+ REG_RGMII_11_CNTRL,
|
|
REG_LED_0_CNTRL,
|
|
REG_LED_1_CNTRL,
|
|
REG_LED_2_CNTRL,
|