aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2020-07-20 18:18:50 +0200
committerFelix Fietkau <nbd@nbd.name>2020-08-06 12:42:43 +0200
commit431b177afa79340136745536f472a58aa869a438 (patch)
tree9b2c119a72d172312d2744b1ab680294a8106de0 /target
parentb7727a8005635a46255518bdf19eb016e160278a (diff)
downloadupstream-431b177afa79340136745536f472a58aa869a438.tar.gz
upstream-431b177afa79340136745536f472a58aa869a438.tar.bz2
upstream-431b177afa79340136745536f472a58aa869a438.zip
mediatek: fix mt7622-rfb1 board support
Make GPIO keys active-low. Add DSA support Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/mediatek/mt7622/base-files/etc/board.d/02_network3
-rw-r--r--target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch108
-rw-r--r--target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch4
-rw-r--r--target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch4
-rw-r--r--target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch6
-rw-r--r--target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch2
6 files changed, 67 insertions, 60 deletions
diff --git a/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network
index eed01a9293..426d9937bf 100755
--- a/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network
@@ -13,6 +13,9 @@ mediatek_setup_interfaces()
bananapi,bpi-r64)
ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" wan
;;
+ mediatek,mt7622-rfb1)
+ ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan
+ ;;
*)
ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6u@eth0" "5u@eth1"
diff --git a/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch b/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch
index 872854fd8c..906b661538 100644
--- a/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch
+++ b/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch
@@ -63,17 +63,15 @@
*
* SPDX-License-Identifier: (GPL-2.0 OR MIT)
*/
-@@ -14,8 +13,8 @@
+@@ -14,7 +13,7 @@
#include "mt6380.dtsi"
/ {
- model = "MediaTek MT7622 RFB1 board";
-- compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622";
+ model = "MT7622_MT7531 RFB";
-+ compatible = "bananapi,bpi-r64", "mediatek,mt7622";
+ compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622";
aliases {
- serial0 = &uart0;
@@ -23,7 +22,7 @@
chosen {
@@ -83,7 +81,7 @@
};
cpus {
-@@ -40,23 +39,45 @@
+@@ -40,23 +39,38 @@
gpio-keys {
compatible = "gpio-keys";
@@ -93,24 +91,17 @@
label = "factory";
linux,code = <BTN_0>;
- gpios = <&pio 0 0>;
-+ gpios = <&pio 0 GPIO_ACTIVE_HIGH>;
++ gpios = <&pio 0 GPIO_ACTIVE_LOW>;
};
wps {
label = "wps";
linux,code = <KEY_WPS_BUTTON>;
- gpios = <&pio 102 0>;
-+ gpios = <&pio 102 GPIO_ACTIVE_HIGH>;
++ gpios = <&pio 102 GPIO_ACTIVE_LOW>;
+ };
+ };
+
-+ gsw: gsw@0 {
-+ compatible = "mediatek,mt753x";
-+ mediatek,ethsys = <&ethsys>;
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ };
-+
+ leds {
+ compatible = "gpio-leds";
+
@@ -133,7 +124,7 @@
};
reg_1p8v: regulator-1p8v {
-@@ -101,27 +122,67 @@
+@@ -101,23 +115,82 @@
};
&eth {
@@ -169,48 +160,61 @@
+ mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
--
+
- phy5: ethernet-phy@5 {
- reg = <5>;
- phy-mode = "sgmii";
-- };
- };
- };
-
-+&gsw {
-+ mediatek,mdio = <&mdio>;
-+ mediatek,portmap = "llllw";
-+ mediatek,mdio_master_pinmux = <0>;
-+ reset-gpios = <&pio 54 0>;
-+ interrupt-parent = <&pio>;
-+ interrupts = <53 IRQ_TYPE_LEVEL_HIGH>;
-+ status = "okay";
++ switch@0 {
++ compatible = "mediatek,mt7531";
++ reg = <0>;
++ reset-gpios = <&pio 54 0>;
+
-+ port5: port@5 {
-+ compatible = "mediatek,mt753x-port";
-+ reg = <5>;
-+ phy-mode = "rgmii";
-+ fixed-link {
-+ speed = <1000>;
-+ full-duplex;
-+ };
-+ };
++ ports {
++ #address-cells = <1>;
++ #size-cells = <0>;
+
-+ port6: port@6 {
-+ compatible = "mediatek,mt753x-port";
-+ reg = <6>;
-+ phy-mode = "sgmii";
-+ fixed-link {
-+ speed = <2500>;
-+ full-duplex;
-+ };
-+ };
-+};
++ port@0 {
++ reg = <0>;
++ label = "lan1";
++ };
+
- &i2c1 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
-@@ -185,15 +246,28 @@
++ port@1 {
++ reg = <1>;
++ label = "lan2";
++ };
++
++ port@2 {
++ reg = <2>;
++ label = "lan3";
++ };
++
++ port@3 {
++ reg = <3>;
++ label = "lan4";
++ };
++
++ port@4 {
++ reg = <4>;
++ label = "wan";
++ };
++
++ port@6 {
++ reg = <6>;
++ label = "cpu";
++ ethernet = <&gmac0>;
++ phy-mode = "2500base-x";
++
++ fixed-link {
++ speed = <2500>;
++ full-duplex;
++ pause;
++ };
++ };
++ };
+ };
+ };
+ };
+@@ -185,15 +258,28 @@
&pcie {
pinctrl-names = "default";
@@ -240,7 +244,7 @@
/* eMMC is shared pin with parallel NAND */
emmc_pins_default: emmc-pins-default {
mux {
-@@ -460,11 +534,11 @@
+@@ -460,11 +546,11 @@
};
&sata {
diff --git a/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch b/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch
index 4e10319508..378ccb8338 100644
--- a/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch
+++ b/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch
@@ -22,7 +22,7 @@
"mediatek,mt8173-nor";
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-@@ -108,7 +108,7 @@
+@@ -101,7 +101,7 @@
};
&bch {
@@ -31,7 +31,7 @@
};
&btif {
-@@ -541,6 +541,62 @@
+@@ -553,6 +553,62 @@
status = "disable";
};
diff --git a/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch b/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch
index 3ebe45c6e4..b545ea809d 100644
--- a/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch
+++ b/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch
@@ -20,7 +20,7 @@
"syscon";
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-@@ -579,7 +579,7 @@
+@@ -591,7 +591,7 @@
reg = <0x140000 0x0080000>;
};
@@ -29,7 +29,7 @@
label = "Factory";
reg = <0x1c0000 0x0040000>;
};
-@@ -636,3 +636,8 @@
+@@ -648,3 +648,8 @@
pinctrl-0 = <&watchdog_pins>;
status = "okay";
};
diff --git a/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch b/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch
index 02e4c130ea..e32042301f 100644
--- a/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch
+++ b/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch
@@ -382,7 +382,8 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
};
};
+ };
-+
+
+- pcie1: pcie@1,0 {
+ pcie1: pcie@1a145000 {
+ compatible = "mediatek,mt7622-pcie";
+ device_type = "pci";
@@ -407,8 +408,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
+ bus-range = <0x00 0xff>;
+ ranges = <0x82000000 0 0x28000000 0 0x28000000 0 0x8000000>;
+ status = "disabled";
-
-- pcie1: pcie@1,0 {
++
+ slot1: pcie@1,0 {
reg = <0x0800 0 0 0 0>;
#address-cells = <3>;
diff --git a/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch b/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
index 48713ecc64..bc0f7b1a6c 100644
--- a/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
+++ b/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
@@ -389,7 +389,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
<0 0 0 2 &pcie_intc1 1>,
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-@@ -244,18 +244,16 @@
+@@ -256,18 +256,16 @@
};
};