Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synchronize official source code #138

Merged
merged 5 commits into from
Nov 2, 2024
Merged

Synchronize official source code #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c46b689
ath79: add support for MikroTik RouterBOARD 750 r2 (hEX lite)
rogerpueyo Jun 2, 2021
9bc6a18
ramips: m4r v4: fix typo
neheb Oct 25, 2024
92c2a4c
ipq806x: Revert "ipq806x: swap lan leds for Meraki MR52"
rkboni Oct 24, 2024
607091d
ipq806x: Fix default MAC addresses on MR52 by moving to `nvmem-layout`
rkboni Oct 24, 2024
4f0e281
ath79: Really fix 5GHz on QCA9886 variant of ZTE MF286
Leo-PL Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions target/linux/ath79/dts/qca9533_mikrotik_routerboard-16m.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,3 @@
};
};
};

&wmac {
status = "okay";

qca,no-eeprom;
};
78 changes: 78 additions & 0 deletions target/linux/ath79/dts/qca9533_mikrotik_routerboard-750-r2.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

#include "qca9533_mikrotik_routerboard-16m.dtsi"

/ {
compatible = "mikrotik,routerboard-750-r2", "qca,qca9533";
model = "MikroTik RouterBOARD 750 r2 (hEX lite)";

aliases {
led-boot = &led_usr;
led-failsafe = &led_usr;
led-upgrade = &led_usr;
led-running = &led_usr;
};

leds {
compatible = "gpio-leds";
pinctrl-names = "default";

led_usr: usr {
label = "green:usr";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};

led1 {
label = "green:port1";
gpios = <&ssr 0 GPIO_ACTIVE_LOW>;
};

led2 {
label = "green:port2";
gpios = <&ssr 1 GPIO_ACTIVE_LOW>;
};

led3 {
label = "green:port3";
gpios = <&ssr 2 GPIO_ACTIVE_LOW>;
};

led4 {
label = "green:port4";
gpios = <&ssr 3 GPIO_ACTIVE_LOW>;
};

led5 {
label = "green:port5";
gpios = <&ssr 4 GPIO_ACTIVE_LOW>;
};
};
};

&pinmux {
pmx_spi_cs1: pinmux_spi_cs1 {
pinctrl-single,bits = <0x8 0x0a000000 0xff000000>;
};
};

&spi {
pinctrl-names = "default";
pinctrl-0 = <&pmx_spi_cs1>;

cs-gpios = <0>, <&gpio 11 GPIO_ACTIVE_LOW>;

ssr: ssr@1 {
compatible = "fairchild,74hc595";
gpio-controller;
#gpio-cells = <2>;
registers-number = <1>;
reg = <1>;
spi-max-frequency = <10000000>;
};
};

&eth0 {
status = "okay";

phy-handle = <&swphy4>;
};
6 changes: 6 additions & 0 deletions target/linux/ath79/dts/qca9533_mikrotik_routerboard-95x.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@
};
};

&wmac {
status = "okay";

qca,no-eeprom;
};

&eth0 {
status = "okay";

Expand Down
6 changes: 6 additions & 0 deletions target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@
};
};

&wmac {
status = "okay";

qca,no-eeprom;
};

&eth0 {
status = "okay";

Expand Down
6 changes: 6 additions & 0 deletions target/linux/ath79/dts/qca9533_mikrotik_routerboard-map-2nd.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@
};
};

&wmac {
status = "okay";

qca,no-eeprom;
};

&eth0 {
status = "okay";

Expand Down
6 changes: 6 additions & 0 deletions target/linux/ath79/dts/qca9533_mikrotik_routerboard-mapl-2nd.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@
};
};

&wmac {
status = "okay";

qca,no-eeprom;
};

&eth0 {
status = "okay";

Expand Down
6 changes: 6 additions & 0 deletions target/linux/ath79/dts/qca9533_mikrotik_routerboard-wap-2nd.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
};
};

&wmac {
status = "okay";

qca,no-eeprom;
};

&eth0 {
status = "okay";

Expand Down
6 changes: 6 additions & 0 deletions target/linux/ath79/dts/qca9533_mikrotik_routerboard-wapr-2nd.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@
};
};

&wmac {
status = "okay";

qca,no-eeprom;
};

&eth0 {
status = "okay";

Expand Down
9 changes: 8 additions & 1 deletion target/linux/ath79/dts/qca9563_zte_mf286.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,20 @@
#address-cells = <1>;
#size-cells = <1>;

/* ath9k */
cal_caldata_1000: cal@1000 {
reg = <0x1000 0x440>;
};

/* ath10k wave1 in plain MF286 */
cal_caldata_5000: cal@5000 {
reg = <0x5000 0x844>;
};

/* ath10k wave2 in early MF286A */
precal_caldata_5000: precal@5000 {
reg = <0x5000 0x2f20>;
};
};

partition@280000 {
Expand Down Expand Up @@ -119,7 +126,7 @@
};

&wifi_ath10k {
nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_5000>, <&cal_caldata_5000>;
nvmem-cells = <&macaddr_mac_0>, <&cal_caldata_5000>, <&precal_caldata_5000>;
nvmem-cell-names = "mac-address", "calibration", "pre-calibration";
mac-address-increment = <1>;
};
Expand Down
9 changes: 9 additions & 0 deletions target/linux/ath79/image/mikrotik.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ define Device/mikrotik_routerboard-493g
endef
TARGET_DEVICES += mikrotik_routerboard-493g

define Device/mikrotik_routerboard-750-r2
$(Device/mikrotik_nor)
SOC := qca9533
DEVICE_MODEL := RouterBOARD 750 r2 (hEX lite)
IMAGE_SIZE := 16256k
SUPPORTED_DEVICES += rb-750-r2
endef
TARGET_DEVICES += mikrotik_routerboard-750-r2

define Device/mikrotik_routerboard-911-lite
$(Device/mikrotik_nor)
SOC := ar9344
Expand Down
1 change: 1 addition & 0 deletions target/linux/ath79/mikrotik/base-files/etc/board.d/01_leds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ mikrotik,routerboard-lhg-5nd)
ucidef_set_led_rssi "rssimediumhigh" "rssimediumhigh" "green:rssimediumhigh" "wlan0" "60" "100"
ucidef_set_led_rssi "rssihigh" "rssihigh" "green:rssihigh" "wlan0" "80" "100"
;;
mikrotik,routerboard-750-r2|\
mikrotik,routerboard-951ui-2hnd|\
mikrotik,routerboard-951ui-2nd|\
mikrotik,routerboard-952ui-5ac2nd)
Expand Down
5 changes: 5 additions & 0 deletions target/linux/ath79/mikrotik/base-files/etc/board.d/02_network
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ ath79_setup_interfaces()
ucidef_add_switch "switch1" \
"0@eth1" "1:lan:4" "2:lan:1" "3:lan:2" "4:lan:3"
;;
mikrotik,routerboard-750-r2)
ucidef_set_interface_wan "eth1"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:4" "2:lan:1" "3:lan:3" "4:lan:2"
;;
mikrotik,routerboard-911-lite|\
mikrotik,routerboard-912uag-2hpnd|\
mikrotik,routerboard-lhg-2nd|\
Expand Down
36 changes: 19 additions & 17 deletions target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@

lan1_green {
label = "green:lan1";
gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
};

lan2_green {
label = "green:lan2";
gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
};

led_active: active {
Expand All @@ -61,12 +61,12 @@

lan1_orange {
label = "orange:lan1";
gpios = <&qcom_pinmux 60 GPIO_ACTIVE_HIGH>;
gpios = <&qcom_pinmux 62 GPIO_ACTIVE_HIGH>;
};

lan2_orange {
label = "orange:lan2";
gpios = <&qcom_pinmux 62 GPIO_ACTIVE_HIGH>;
gpios = <&qcom_pinmux 60 GPIO_ACTIVE_HIGH>;
};
};
};
Expand All @@ -80,7 +80,7 @@
phy-mode = "sgmii";
phy-handle = <&phy0>;

nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 0>;
nvmem-cell-names = "mac-address";
};

Expand All @@ -93,9 +93,8 @@
phy-mode = "sgmii";
phy-handle = <&phy4>;

nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 1>;
nvmem-cell-names = "mac-address";
mac-address-increment = <1>;
};

&gsbi7 {
Expand Down Expand Up @@ -142,11 +141,17 @@
pagesize = <32>;
reg = <0x52>;
read-only;
#address-cells = <1>;
#size-cells = <1>;

mac_address: mac-address@66 {
reg = <0x66 0x6>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;

mac_address: mac-address@66 {
compatible = "mac-base";
reg = <0x66 0x6>;
#nvmem-cell-cells = <1>;
};
};
};
};
Expand Down Expand Up @@ -212,21 +217,18 @@
};

&wifi0 {
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 4>;
nvmem-cell-names = "mac-address";
mac-address-increment = <4>;
};

&wifi1 {
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 3>;
nvmem-cell-names = "mac-address";
mac-address-increment = <3>;
};

&wifi2 {
nvmem-cells = <&mac_address>;
nvmem-cells = <&mac_address 2>;
nvmem-cell-names = "mac-address";
mac-address-increment = <2>;
};

&hs_phy_0 {
Expand Down
2 changes: 1 addition & 1 deletion target/linux/ramips/dts/mt7621_tplink_deco-m4r-v4.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
led {
label = "led";
gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
debounce_interval = <60>;
debounce-interval = <60>;
linux,code = <KEY_BRIGHTNESS_TOGGLE>;
};

Expand Down
Loading