| Message ID | 7c28a29df1a2975b87b75a01176ab5ace4a05a7f.1689756363.git.weijie.gao@mediatek.com |
|---|---|
| State | Accepted |
| Commit | aef54ea16cacbbdb83ae5615b11964f15d006f75 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Add support for MediaTek MT7988 SoC | expand |
Hi, thank you very much for your work on mt7988 support and faster than expected ;) Nice to see that ethernet-support is already included, i see some changes to mt753x.. I will try out this series as fast as possible. > Gesendet: Mittwoch, 19. Juli 2023 um 11:17 Uhr > Von: "Weijie Gao" <weijie.gao@mediatek.com> > An: u-boot@lists.denx.de > Cc: "GSS_MTK_Uboot_upstream" <GSS_MTK_Uboot_upstream@mediatek.com>, "Daniel Golle" <daniel@makrotopia.org>, "Frank Wunderlich" <linux@fw-web.de>, "Weijie Gao" <weijie.gao@mediatek.com> > Betreff: [PATCH 21/29] arm: dts: medaitek: convert gmac link mode to 2500base-x so far only noticed a typo (medaitek => mediatek) in this part here regards Frank > Now that individual 2.5Gbps SGMII support has been added to > mtk-eth, all boards that use 2.5Gbps link with mt7531 must be > converted to use "2500base-x" instead of "sgmii". > > Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
Hi > Gesendet: Mittwoch, 19. Juli 2023 um 11:17 Uhr > Von: "Weijie Gao" <weijie.gao@mediatek.com> > An: u-boot@lists.denx.de > Cc: "GSS_MTK_Uboot_upstream" <GSS_MTK_Uboot_upstream@mediatek.com>, "Daniel Golle" <daniel@makrotopia.org>, "Frank Wunderlich" <linux@fw-web.de>, "Weijie Gao" <weijie.gao@mediatek.com> > Betreff: [PATCH 21/29] arm: dts: medaitek: convert gmac link mode to 2500base-x > > Now that individual 2.5Gbps SGMII support has been added to > mtk-eth, all boards that use 2.5Gbps link with mt7531 must be > converted to use "2500base-x" instead of "sgmii". > > Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> > --- > arch/arm/dts/mt7622-bananapi-bpi-r64.dts | 4 ++-- > arch/arm/dts/mt7622-rfb.dts | 4 ++-- > arch/arm/dts/mt7629-rfb.dts | 4 ++-- > arch/arm/dts/mt7981-emmc-rfb.dts | 4 ++-- > arch/arm/dts/mt7981-rfb.dts | 4 ++-- > arch/arm/dts/mt7981-sd-rfb.dts | 4 ++-- > arch/arm/dts/mt7986a-rfb.dts | 4 ++-- > arch/arm/dts/mt7986a-sd-rfb.dts | 4 ++-- > arch/arm/dts/mt7986b-rfb.dts | 4 ++-- > arch/arm/dts/mt7986b-sd-rfb.dts | 4 ++-- you miss arch/arm/dts/mt7986a-bpi-r3-sd.dts here which was added in 2023.07 i tested series on Bananapi-R4/mt7988, sdcard and network-support (many thx for this) works so far (not tested i2c, spi and others yet), also have not done tests on my other boards yet. noticed some build-warnings from the pinctrl-patch which are not critical, but should be fixed. e.g. this (seems for each call of PINCTRL_PIN_GROUP) drivers/pinctrl/mediatek/pinctrl-mt7988.c:1148:42: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] 1148 | PINCTRL_PIN_GROUP("net_wo1_uart_txd_1", mt7988_net_wo1_uart_txd_1), | ^~~~~~~~~~~~~~~~~~~~~~~~~ drivers/pinctrl/mediatek/pinctrl-mtk-common.h:31:3: note: in definition of macro 'PINCTRL_PIN_GROUP' 31 | id##_funcs, \ | ^~ regards Frank
On Wed, 2023-07-19 at 14:08 +0200, Frank Wunderlich wrote: > Hi > > > Gesendet: Mittwoch, 19. Juli 2023 um 11:17 Uhr > > Von: "Weijie Gao" <weijie.gao@mediatek.com> > > An: u-boot@lists.denx.de > > Cc: "GSS_MTK_Uboot_upstream" <GSS_MTK_Uboot_upstream@mediatek.com>, > "Daniel Golle" <daniel@makrotopia.org>, "Frank Wunderlich" < > linux@fw-web.de>, "Weijie Gao" <weijie.gao@mediatek.com> > > Betreff: [PATCH 21/29] arm: dts: medaitek: convert gmac link mode > to 2500base-x > > > > Now that individual 2.5Gbps SGMII support has been added to > > mtk-eth, all boards that use 2.5Gbps link with mt7531 must be > > converted to use "2500base-x" instead of "sgmii". > > > > Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> > > --- > > arch/arm/dts/mt7622-bananapi-bpi-r64.dts | 4 ++-- > > arch/arm/dts/mt7622-rfb.dts | 4 ++-- > > arch/arm/dts/mt7629-rfb.dts | 4 ++-- > > arch/arm/dts/mt7981-emmc-rfb.dts | 4 ++-- > > arch/arm/dts/mt7981-rfb.dts | 4 ++-- > > arch/arm/dts/mt7981-sd-rfb.dts | 4 ++-- > > arch/arm/dts/mt7986a-rfb.dts | 4 ++-- > > arch/arm/dts/mt7986a-sd-rfb.dts | 4 ++-- > > arch/arm/dts/mt7986b-rfb.dts | 4 ++-- > > arch/arm/dts/mt7986b-sd-rfb.dts | 4 ++-- > > you miss arch/arm/dts/mt7986a-bpi-r3-sd.dts here which was added in > 2023.07 Oh. I'll add it in v2. > > i tested series on Bananapi-R4/mt7988, sdcard and network-support > (many thx for this) works so far (not tested i2c, spi and others > yet), also have not done tests on my other boards yet. > > noticed some build-warnings from the pinctrl-patch which are not > critical, but should be fixed. > > e.g. this (seems for each call of PINCTRL_PIN_GROUP) > > drivers/pinctrl/mediatek/pinctrl-mt7988.c:1148:42: warning: > initialization discards 'const' qualifier from pointer target type [- > Wdiscarded-qualifiers] > 1148 | PINCTRL_PIN_GROUP("net_wo1_uart_txd_1", > mt7988_net_wo1_uart_txd_1), > | ^~~~~~~~~~~~~~~~~~~~ > ~~~~~ > drivers/pinctrl/mediatek/pinctrl-mtk-common.h:31:3: note: in > definition of macro 'PINCTRL_PIN_GROUP' > 31 | id##_funcs, \ > | ^~ > This is due to on of the patch was missing because its size exceeds 100KB. Please refer to: https://patchwork.ozlabs.org/project/uboot/patch/7c0cfbdeb17abcf805138eb69be583d5a068231b.1689756363.git.weijie.gao@mediatek.com/ I have to split it into two patches in v2. > > regards Frank
Gesendet: Donnerstag, 20. Juli 2023 um 02:58 Uhr Von: "Weijie Gao (高惟杰)" <Weijie.Gao@mediatek.com> > > On Wed, 2023-07-19 at 14:08 +0200, Frank Wunderlich wrote: > > noticed some build-warnings from the pinctrl-patch which are not > > critical, but should be fixed. > > > > e.g. this (seems for each call of PINCTRL_PIN_GROUP) > > > > drivers/pinctrl/mediatek/pinctrl-mt7988.c:1148:42: warning: > > initialization discards 'const' qualifier from pointer target type [- > > Wdiscarded-qualifiers] > > 1148 | PINCTRL_PIN_GROUP("net_wo1_uart_txd_1", > > mt7988_net_wo1_uart_txd_1), > > | ^~~~~~~~~~~~~~~~~~~~ > > ~~~~~ > > drivers/pinctrl/mediatek/pinctrl-mtk-common.h:31:3: note: in > > definition of macro 'PINCTRL_PIN_GROUP' > > 31 | id##_funcs, \ > > | ^~ > This is due to on of the patch was missing because its size exceeds > 100KB. Please refer to: > https://patchwork.ozlabs.org/project/uboot/patch/7c0cfbdeb17abcf805138eb69be583d5a068231b.1689756363.git.weijie.gao@mediatek.com/ > I have to split it into two patches in v2. indeed, part 12 was missing in my series-export from patchwork...all clean after applying it. thx for pointing to it. regards Frank
diff --git a/arch/arm/dts/mt7622-bananapi-bpi-r64.dts b/arch/arm/dts/mt7622-bananapi-bpi-r64.dts index 7c55744ac7..717baf26d3 100644 --- a/arch/arm/dts/mt7622-bananapi-bpi-r64.dts +++ b/arch/arm/dts/mt7622-bananapi-bpi-r64.dts @@ -224,12 +224,12 @@ ð { status = "okay"; mediatek,gmac-id = <0>; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; mediatek,switch = "mt7531"; reset-gpios = <&gpio 54 GPIO_ACTIVE_HIGH>; fixed-link { - speed = <1000>; + speed = <2500>; full-duplex; }; }; diff --git a/arch/arm/dts/mt7622-rfb.dts b/arch/arm/dts/mt7622-rfb.dts index 886a133e05..321de75ae3 100644 --- a/arch/arm/dts/mt7622-rfb.dts +++ b/arch/arm/dts/mt7622-rfb.dts @@ -233,12 +233,12 @@ ð { status = "okay"; mediatek,gmac-id = <0>; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; mediatek,switch = "mt7531"; reset-gpios = <&gpio 54 GPIO_ACTIVE_HIGH>; fixed-link { - speed = <1000>; + speed = <2500>; full-duplex; }; }; diff --git a/arch/arm/dts/mt7629-rfb.dts b/arch/arm/dts/mt7629-rfb.dts index 82f6a34162..f347725f2f 100644 --- a/arch/arm/dts/mt7629-rfb.dts +++ b/arch/arm/dts/mt7629-rfb.dts @@ -25,12 +25,12 @@ ð { status = "okay"; mediatek,gmac-id = <0>; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; mediatek,switch = "mt7531"; reset-gpios = <&gpio 28 GPIO_ACTIVE_HIGH>; fixed-link { - speed = <1000>; + speed = <2500>; full-duplex; }; }; diff --git a/arch/arm/dts/mt7981-emmc-rfb.dts b/arch/arm/dts/mt7981-emmc-rfb.dts index a0913c5b7c..9aa7cd8f6e 100644 --- a/arch/arm/dts/mt7981-emmc-rfb.dts +++ b/arch/arm/dts/mt7981-emmc-rfb.dts @@ -46,12 +46,12 @@ ð { status = "okay"; mediatek,gmac-id = <0>; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; mediatek,switch = "mt7531"; reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>; fixed-link { - speed = <1000>; + speed = <2500>; full-duplex; }; }; diff --git a/arch/arm/dts/mt7981-rfb.dts b/arch/arm/dts/mt7981-rfb.dts index 1dc90ac63f..22a022acb6 100644 --- a/arch/arm/dts/mt7981-rfb.dts +++ b/arch/arm/dts/mt7981-rfb.dts @@ -37,12 +37,12 @@ ð { status = "okay"; mediatek,gmac-id = <0>; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; mediatek,switch = "mt7531"; reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>; fixed-link { - speed = <1000>; + speed = <2500>; full-duplex; }; }; diff --git a/arch/arm/dts/mt7981-sd-rfb.dts b/arch/arm/dts/mt7981-sd-rfb.dts index 05f3fdb5ef..7d70808404 100644 --- a/arch/arm/dts/mt7981-sd-rfb.dts +++ b/arch/arm/dts/mt7981-sd-rfb.dts @@ -46,12 +46,12 @@ ð { status = "okay"; mediatek,gmac-id = <0>; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; mediatek,switch = "mt7531"; reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>; fixed-link { - speed = <1000>; + speed = <2500>; full-duplex; }; }; diff --git a/arch/arm/dts/mt7986a-rfb.dts b/arch/arm/dts/mt7986a-rfb.dts index dce85d8277..e5c9be7da8 100644 --- a/arch/arm/dts/mt7986a-rfb.dts +++ b/arch/arm/dts/mt7986a-rfb.dts @@ -55,12 +55,12 @@ ð { status = "okay"; mediatek,gmac-id = <0>; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; mediatek,switch = "mt7531"; reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; fixed-link { - speed = <1000>; + speed = <2500>; full-duplex; }; }; diff --git a/arch/arm/dts/mt7986a-sd-rfb.dts b/arch/arm/dts/mt7986a-sd-rfb.dts index 7f32607589..4f8fa70ec9 100644 --- a/arch/arm/dts/mt7986a-sd-rfb.dts +++ b/arch/arm/dts/mt7986a-sd-rfb.dts @@ -47,12 +47,12 @@ ð { status = "okay"; mediatek,gmac-id = <0>; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; mediatek,switch = "mt7531"; reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; fixed-link { - speed = <1000>; + speed = <2500>; full-duplex; }; }; diff --git a/arch/arm/dts/mt7986b-rfb.dts b/arch/arm/dts/mt7986b-rfb.dts index 3349e38a90..8196845a12 100644 --- a/arch/arm/dts/mt7986b-rfb.dts +++ b/arch/arm/dts/mt7986b-rfb.dts @@ -46,12 +46,12 @@ ð { status = "okay"; mediatek,gmac-id = <0>; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; mediatek,switch = "mt7531"; reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; fixed-link { - speed = <1000>; + speed = <2500>; full-duplex; }; }; diff --git a/arch/arm/dts/mt7986b-sd-rfb.dts b/arch/arm/dts/mt7986b-sd-rfb.dts index 6c9203332b..ec80a2fb71 100644 --- a/arch/arm/dts/mt7986b-sd-rfb.dts +++ b/arch/arm/dts/mt7986b-sd-rfb.dts @@ -47,12 +47,12 @@ ð { status = "okay"; mediatek,gmac-id = <0>; - phy-mode = "sgmii"; + phy-mode = "2500base-x"; mediatek,switch = "mt7531"; reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; fixed-link { - speed = <1000>; + speed = <2500>; full-duplex; }; };
Now that individual 2.5Gbps SGMII support has been added to mtk-eth, all boards that use 2.5Gbps link with mt7531 must be converted to use "2500base-x" instead of "sgmii". Signed-off-by: Weijie Gao <weijie.gao@mediatek.com> --- arch/arm/dts/mt7622-bananapi-bpi-r64.dts | 4 ++-- arch/arm/dts/mt7622-rfb.dts | 4 ++-- arch/arm/dts/mt7629-rfb.dts | 4 ++-- arch/arm/dts/mt7981-emmc-rfb.dts | 4 ++-- arch/arm/dts/mt7981-rfb.dts | 4 ++-- arch/arm/dts/mt7981-sd-rfb.dts | 4 ++-- arch/arm/dts/mt7986a-rfb.dts | 4 ++-- arch/arm/dts/mt7986a-sd-rfb.dts | 4 ++-- arch/arm/dts/mt7986b-rfb.dts | 4 ++-- arch/arm/dts/mt7986b-sd-rfb.dts | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-)