forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #35 from openwrtdiy/openwrt-21.02
Synchronize official source code
- Loading branch information
Showing
46 changed files
with
5,668 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
.../linux/bcm47xx/patches-5.4/700-net-bgmac-connect-to-PHY-even-if-it-is-BGMAC_PHY_NOR.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||
| Date: Sun, 7 Nov 2021 14:20:40 +0100 | ||
| Subject: [PATCH] net: bgmac: connect to PHY even if it is BGMAC_PHY_NOREGS | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| Recent bgmac change was meant to just fix a race between "Generic PHY" | ||
| and "bcm53xx" drivers after -EPROBE_DEFER. It modified bgmac to use | ||
| phy_connect() only if there is a real PHY device connected. | ||
|
|
||
| That change broke bgmac on bcm47xx. bcma_phy_connect() now registers a | ||
| fixed PHY with the bgmac_phy_connect_direct(). That fails as another | ||
| fixed PHY (also using address 0) is already registered - by bcm47xx arch | ||
| code bcm47xx_register_bus_complete(). | ||
|
|
||
| This change brings origial behaviour. It connects Ethernet interface | ||
| with pseudo-PHY (switch device) and adjusts Ethernet interface link to | ||
| match connected switch. | ||
|
|
||
| This fixes: | ||
| [ 2.548098] bgmac_bcma bcma0:1: Failed to register fixed PHY device | ||
| [ 2.554584] bgmac_bcma bcma0:1: Cannot connect to phy | ||
|
|
||
| Fixes: b5375509184d ("net: bgmac: improve handling PHY") | ||
| Link: https://lore.kernel.org/netdev/3639116e-9292-03ca-b9d9-d741118a4541@gmail.com/T/#u | ||
| Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||
| --- | ||
| drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| --- a/drivers/net/ethernet/broadcom/bgmac-bcma.c | ||
| +++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c | ||
| @@ -94,7 +94,7 @@ static int bcma_phy_connect(struct bgmac | ||
| return 0; | ||
|
|
||
| /* Connect to the PHY */ | ||
| - if (bgmac->mii_bus && bgmac->phyaddr != BGMAC_PHY_NOREGS) { | ||
| + if (bgmac->mii_bus) { | ||
| snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, bgmac->mii_bus->id, | ||
| bgmac->phyaddr); | ||
| phy_dev = phy_connect(bgmac->net_dev, bus_id, bgmac_adjust_link, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
247 changes: 247 additions & 0 deletions
247
target/linux/bcm53xx/patches-5.4/041-v6.0-0001-ARM-dts-BCM5301X-Add-DT-for-Meraki-MR26.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,247 @@ | ||
| From 935327a73553001f8d81375c76985d05f604507f Mon Sep 17 00:00:00 2001 | ||
| From: Christian Lamparter <chunkeey@gmail.com> | ||
| Date: Sat, 18 Jun 2022 00:00:29 +0200 | ||
| Subject: [PATCH] ARM: dts: BCM5301X: Add DT for Meraki MR26 | ||
|
|
||
| Meraki MR26 is an EOL wireless access point featuring a | ||
| PoE ethernet port and two dual-band 3x3 MIMO 802.11n | ||
| radios and 1x1 dual-band WIFI dedicated to scanning. | ||
|
|
||
| Thank you Amir for the unit and PSU. | ||
|
|
||
| Hardware info: | ||
| SOC : Broadcom BCM53015A1KFEBG (dual-core Cortex-A9 CPU at 800 MHz) | ||
| RAM : SK Hynix Inc. H5TQ1G63EFR, 1 GBit DDR3 SDRAM = 128 MiB | ||
| NAND : Spansion S34ML01G100TF100, 1 GBit SLC NAND Flash = 128 MiB | ||
| ETH : 1 GBit Ethernet Port - PoE (TPS23754 PoE Interface) | ||
| WIFI0 : Broadcom BCM43431KMLG, BCM43431 802.11 abgn (3x3:3) | ||
| WIFI1 : Broadcom BCM43431KMLG, BCM43431 802.11 abgn (3x3:3) | ||
| WIFI2 : Broadcom BCM43428 "Air Marshal" 802.11 abgn (1x1:1) | ||
| BUTTON: One reset key behind a small hole next to the Ethernet Port | ||
| LEDS : One amber (fault), one white (indicator) LED, separate RGB-LED | ||
| MISC : Atmel AT24C64 8KiB EEPROM i2c | ||
| : Ti INA219 26V, 12-bit, i2c output current/voltage/power monitor | ||
|
|
||
| SERIAL: | ||
| WARNING: The serial port needs a TTL/RS-232 3V3 level converter! | ||
| The Serial setting is 115200-8-N-1. The board has a populated | ||
| right angle 1x4 0.1" pinheader. | ||
| The pinout is: VCC (next to J3, has the pin 1 indicator), RX, TX, GND. | ||
|
|
||
| Odd stuff: | ||
|
|
||
| - uboot does not support lzma compression, but gzip'd uImage/DTB work. | ||
| - uboot claims to support FIT, but fails to pass the DTB to the kernel. | ||
| Appending the dtb after the kernel image works. | ||
| - RGB-controller is supported through an external userspace program. | ||
| - The ubi partition contains a "board-config" volume. It stores the | ||
| MAC Address (0x66 in binary) and Serial No. (0x7c alpha-numerical). | ||
| - SoC's temperature sensor always reports that it is on fire. | ||
| This causes the system to immediately shutdown! Looking at reported | ||
| "418 degree Celsius" suggests that this sensor is not working. | ||
|
|
||
| WIFI: | ||
| b43 is able to initialize all three WIFIs @ 802.11bg. | ||
| | b43-phy0: Broadcom 43431 WLAN found (core revision 29) | ||
| | bcma-pci-bridge 0000:01:00.0: bus1: Switched to core: 0x812 | ||
| | b43-phy0: Found PHY: Analog 9, Type 7 (HT), Revision 1 | ||
| | b43-phy0: Found Radio: Manuf 0x17F, ID 0x2059, Revision 0, Version 1 | ||
| | b43-phy0 warning: 5 GHz band is unsupported on this PHY | ||
| | b43-phy1: Broadcom 43431 WLAN found (core revision 29) | ||
| | bcma-pci-bridge 0001:01:00.0: bus2: Switched to core: 0x812 | ||
| | b43-phy1: Found PHY: Analog 9, Type 7 (HT), Revision 1 | ||
| | b43-phy1: Found Radio: Manuf 0x17F, ID 0x2059, Revision 0, Version 1 | ||
| | b43-phy1 warning: 5 GHz band is unsupported on this PHY | ||
| | b43-phy2: Broadcom 43228 WLAN found (core revision 30) | ||
| | bcma-pci-bridge 0002:01:00.0: bus3: Switched to core: 0x812 | ||
| | b43-phy2: Found PHY: Analog 9, Type 4 (N), Revision 16 | ||
| | b43-phy2: Found Radio: Manuf 0x17F, ID 0x2057, Revision 9, Version 1 | ||
| | Broadcom 43xx driver loaded [ Features: NL ] | ||
|
|
||
| Signed-off-by: Christian Lamparter <chunkeey@gmail.com> | ||
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | ||
| --- | ||
| arch/arm/boot/dts/Makefile | 1 + | ||
| arch/arm/boot/dts/bcm53015-meraki-mr26.dts | 166 +++++++++++++++++++++ | ||
| 2 files changed, 167 insertions(+) | ||
| create mode 100644 arch/arm/boot/dts/bcm53015-meraki-mr26.dts | ||
|
|
||
| --- a/arch/arm/boot/dts/Makefile | ||
| +++ b/arch/arm/boot/dts/Makefile | ||
| @@ -121,6 +121,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ | ||
| bcm47094-luxul-xwr-3150-v1.dtb \ | ||
| bcm47094-netgear-r8500.dtb \ | ||
| bcm47094-phicomm-k3.dtb \ | ||
| + bcm53015-meraki-mr26.dtb \ | ||
| bcm53016-meraki-mr32.dtb \ | ||
| bcm94708.dtb \ | ||
| bcm94709.dtb \ | ||
| --- /dev/null | ||
| +++ b/arch/arm/boot/dts/bcm53015-meraki-mr26.dts | ||
| @@ -0,0 +1,166 @@ | ||
| +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT | ||
| +/* | ||
| + * Broadcom BCM470X / BCM5301X ARM platform code. | ||
| + * DTS for Meraki MR26 / Codename: Venom | ||
| + * | ||
| + * Copyright (C) 2022 Christian Lamparter <chunkeey@gmail.com> | ||
| + */ | ||
| + | ||
| +/dts-v1/; | ||
| + | ||
| +#include "bcm4708.dtsi" | ||
| +#include "bcm5301x-nand-cs0-bch8.dtsi" | ||
| +#include <dt-bindings/leds/common.h> | ||
| + | ||
| +/ { | ||
| + compatible = "meraki,mr26", "brcm,bcm53015", "brcm,bcm4708"; | ||
| + model = "Meraki MR26"; | ||
| + | ||
| + memory@0 { | ||
| + reg = <0x00000000 0x08000000>; | ||
| + device_type = "memory"; | ||
| + }; | ||
| + | ||
| + leds { | ||
| + compatible = "gpio-leds"; | ||
| + | ||
| + led-0 { | ||
| + function = LED_FUNCTION_FAULT; | ||
| + color = <LED_COLOR_ID_AMBER>; | ||
| + gpios = <&chipcommon 13 GPIO_ACTIVE_HIGH>; | ||
| + panic-indicator; | ||
| + }; | ||
| + led-1 { | ||
| + function = LED_FUNCTION_INDICATOR; | ||
| + color = <LED_COLOR_ID_WHITE>; | ||
| + gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>; | ||
| + }; | ||
| + }; | ||
| + | ||
| + keys { | ||
| + compatible = "gpio-keys"; | ||
| + #address-cells = <1>; | ||
| + #size-cells = <0>; | ||
| + | ||
| + key-restart { | ||
| + label = "Reset"; | ||
| + linux,code = <KEY_RESTART>; | ||
| + gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>; | ||
| + }; | ||
| + }; | ||
| +}; | ||
| + | ||
| +&uart0 { | ||
| + clock-frequency = <50000000>; | ||
| + /delete-property/ clocks; | ||
| +}; | ||
| + | ||
| +&uart1 { | ||
| + status = "disabled"; | ||
| +}; | ||
| + | ||
| +&gmac0 { | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| +&gmac1 { | ||
| + status = "disabled"; | ||
| +}; | ||
| +&gmac2 { | ||
| + status = "disabled"; | ||
| +}; | ||
| +&gmac3 { | ||
| + status = "disabled"; | ||
| +}; | ||
| + | ||
| +&nandcs { | ||
| + nand-ecc-algo = "hw"; | ||
| + | ||
| + partitions { | ||
| + compatible = "fixed-partitions"; | ||
| + #address-cells = <0x1>; | ||
| + #size-cells = <0x1>; | ||
| + | ||
| + partition@0 { | ||
| + label = "u-boot"; | ||
| + reg = <0x0 0x200000>; | ||
| + read-only; | ||
| + }; | ||
| + | ||
| + partition@200000 { | ||
| + label = "u-boot-env"; | ||
| + reg = <0x200000 0x200000>; | ||
| + /* empty */ | ||
| + }; | ||
| + | ||
| + partition@400000 { | ||
| + label = "u-boot-backup"; | ||
| + reg = <0x400000 0x200000>; | ||
| + /* empty */ | ||
| + }; | ||
| + | ||
| + partition@600000 { | ||
| + label = "u-boot-env-backup"; | ||
| + reg = <0x600000 0x200000>; | ||
| + /* empty */ | ||
| + }; | ||
| + | ||
| + partition@800000 { | ||
| + label = "ubi"; | ||
| + reg = <0x800000 0x7780000>; | ||
| + }; | ||
| + }; | ||
| +}; | ||
| + | ||
| +&srab { | ||
| + status = "okay"; | ||
| + | ||
| + ports { | ||
| + port@0 { | ||
| + reg = <0>; | ||
| + label = "poe"; | ||
| + }; | ||
| + | ||
| + port@5 { | ||
| + reg = <5>; | ||
| + label = "cpu"; | ||
| + ethernet = <&gmac0>; | ||
| + | ||
| + fixed-link { | ||
| + speed = <1000>; | ||
| + duplex-full; | ||
| + }; | ||
| + }; | ||
| + }; | ||
| +}; | ||
| + | ||
| +&i2c0 { | ||
| + status = "okay"; | ||
| + | ||
| + pinctrl-names = "default"; | ||
| + pinctrl-0 = <&pinmux_i2c>; | ||
| + | ||
| + clock-frequency = <100000>; | ||
| + | ||
| + ina219@40 { | ||
| + compatible = "ti,ina219"; /* PoE power */ | ||
| + reg = <0x40>; | ||
| + shunt-resistor = <60000>; /* = 60 mOhms */ | ||
| + }; | ||
| + | ||
| + eeprom@56 { | ||
| + compatible = "atmel,24c64"; | ||
| + reg = <0x56>; | ||
| + pagesize = <32>; | ||
| + read-only; | ||
| + #address-cells = <1>; | ||
| + #size-cells = <1>; | ||
| + | ||
| + /* it's empty */ | ||
| + }; | ||
| +}; | ||
| + | ||
| +&thermal { | ||
| + status = "disabled"; | ||
| + /* does not work, reads 418 degree Celsius */ | ||
| +}; |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
Oops, something went wrong.