mediatek: final preparation for OF_UPSTREAM support
Subsystems (4)
cover mediatek: final preparation for OF_UPSTREAM support
This is the last batch of part to push actual support of OF_UPSTREAM for the mediatek SoC.
The plan is to make the current downstream DTS on part with upstream implementation so we can permit a gradual transition to it while we don't cause any regression to any user.
This is to have the same node downstream and upstream. Mediatek is working hard upstream to also push all the remaining nodes.
All patch are the final changes after the pinctrl patch merged previously.
All patch pass CI tests tested in this PR [0]
[0] https://github.com/u-boot/u-boot/pull/731
Christian Marangi (7):
pinctrl: mediatek: mt7981: rename reg-names to upstream linux format
pinctrl: mediatek: mt7986: rename reg-names to upstream linux format
mediatek: mt7986: move gpio-controller up and rename pinctrl to pio
pinctrl: mediatek: mt7988: rename reg-names to upstream linux format
mediatek: mt7988: move gpio-controller up and rename pinctrl to pio
mediatek: mt7981: move gpio-controller up and rename pinctrl to pio
arm: dts: mediatek: add PCIe node for MT7981
John Crispin (1):
arm: dts: mediatek: add USB nodes for MT7981
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/mt7981.dtsi | 97 +++++++++++++++++++++-- arch/arm/dts/mt7986.dtsi | 14 ++-- arch/arm/dts/mt7986a-bpi-r3-sd.dts | 12 +-- 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 +- arch/arm/dts/mt7988-rfb.dts | 2 +- arch/arm/dts/mt7988-sd-rfb.dts | 2 +- arch/arm/dts/mt7988.dtsi | 12 ++- drivers/pinctrl/mediatek/pinctrl-mt7981.c | 5 +- 14 files changed, 125 insertions(+), 47 deletions(-)
Signature · 1 line
2.47.1
PATCH 1/8 pinctrl: mediatek: mt7981: rename reg-names to upstream linux format
Rename reg-names to upstream linux format. Upstream linux drop the "_base". To make use of upstream DTSI, align to the upstream naming.
--- arch/arm/dts/mt7981.dtsi | 6 +++--- drivers/pinctrl/mediatek/pinctrl-mt7981.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-)
arch/arm/dts/mt7981.dtsi +3 -3
@@ -117,9 +117,9 @@ <0x11f00000 0x1000>, <0x11f10000 0x1000>, <0x1000b000 0x1000>; - reg-names = "gpio_base", "iocfg_rt_base", "iocfg_rm_base", - "iocfg_rb_base", "iocfg_lb_base", "iocfg_bl_base", - "iocfg_tm_base", "iocfg_tl_base", "eint"; + reg-names = "gpio", "iocfg_rt", "iocfg_rm", + "iocfg_rb", "iocfg_lb", "iocfg_bl", + "iocfg_tm", "iocfg_tl", "eint"; gpio: gpio-controller { gpio-controller; #gpio-cells = <2>;
drivers/pinctrl/mediatek/pinctrl-mt7981.c +3 -2
@@ -1012,8 +1012,9 @@ static const struct mtk_function_desc mt7981_functions[] = { };static const char *const mt7981_pinctrl_register_base_names[] = { -"gpio_base" ,"iocfg_rt_base" ,"iocfg_rm_base" ,"iocfg_rb_base" , -"iocfg_lb_base" ,"iocfg_bl_base" ,"iocfg_tm_base" ,"iocfg_tl_base" , +"gpio" ,"iocfg_rt" ,"iocfg_rm" ,"iocfg_rb" , +"iocfg_lb" ,"iocfg_bl" ,"iocfg_tm" ,"iocfg_tl" , +"eint" , };static const struct mtk_pinctrl_soc mt7981_data = {
Signature · 1 line
2.47.1
Re: [PATCH 1/8] pinctrl: mediatek: mt7981: rename reg-names to upstream linux format
Quoted 51 lines · Christian Marangi
External email : Please do not click links or open attachments until you have verified the sender or the content.
Rename reg-names to upstream linux format. Upstream linux drop the "
_base". To make use of upstream DTSI, align to the upstream naming.Signed-off-by Christian Marangi <[email protected]>--- arch/arm/dts/mt7981.dtsi | 6 +++--- drivers/pinctrl/mediatek/pinctrl-mt7981.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-)arch/arm/dts/mt7981.dtsi +3
-3@@ -117,9 +117,9 @@ <0x11f00000 0x1000>, <0x11f10000 0x1000>, <0x1000b000 0x1000>; - reg-names = "gpio_base", "iocfg_rt_base", "iocfg_rm_base", - "iocfg_rb_base", "iocfg_lb_base", "iocfg_bl_base", - "iocfg_tm_base", "iocfg_tl_base", "eint"; + reg-names = "gpio", "iocfg_rt", "iocfg_rm", + "iocfg_rb", "iocfg_lb", "iocfg_bl", + "iocfg_tm", "iocfg_tl", "eint"; gpio: gpio-controller {gpio-controller; #gpio-cells = <2>;drivers/pinctrl/mediatek/pinctrl-mt7981.c +3
-2@@ -1012,8 +1012,9 @@ static const struct mtk_function_desc mt7981_functions[] = { };static const char *const mt7981_pinctrl_register_base_names[] = { -"gpio_base" ,"iocfg_rt_base" ,"iocfg_rm_base" ,"iocfg_rb_base" , -"iocfg_lb_base" ,"iocfg_bl_base" ,"iocfg_tm_base" ,"iocfg_tl_base" , +"gpio" ,"iocfg_rt" ,"iocfg_rm" ,"iocfg_rb" , +"iocfg_lb" ,"iocfg_bl" ,"iocfg_tm" ,"iocfg_tl" , +"eint" ,};
Quoted 4 lines
static const struct
mtk_pinctrl_socmt7981_data= {
--
2.47.1
Thanks!
PATCH 2/8 pinctrl: mediatek: mt7986: rename reg-names to upstream linux format
In reply to Christian MarangiRename reg-names to upstream linux format. Upstream linux drop the "_base". To make use of upstream DTSI, align to the upstream naming.
--- arch/arm/dts/mt7986.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/dts/mt7986.dtsi +3 -3
@@ -132,9 +132,9 @@ <0x11f00000 0x1000>, <0x11f10000 0x1000>, <0x1000b000 0x1000>; - reg-names = "gpio_base", "iocfg_rt_base", "iocfg_rb_base", - "iocfg_lt_base", "iocfg_lb_base", "iocfg_tr_base", - "iocfg_tl_base", "eint"; + reg-names = "gpio", "iocfg_rt", "iocfg_rb", + "iocfg_lt", "iocfg_lb", "iocfg_tr", + "iocfg_tl", "eint"; gpio: gpio-controller { gpio-controller; #gpio-cells = <2>;
Signature · 1 line
2.47.1
Re: [PATCH 2/8] pinctrl: mediatek: mt7986: rename reg-names to upstream linux format
Quoted 31 lines · Christian Marangi
External email : Please do not click links or open attachments until you have verified the sender or the content.
Rename reg-names to upstream linux format. Upstream linux drop the "
_base". To make use of upstream DTSI, align to the upstream naming.Signed-off-by Christian Marangi <[email protected]>--- arch/arm/dts/mt7986.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/arm/dts/mt7986.dtsi +3
-3@@ -132,9 +132,9 @@ <0x11f00000 0x1000>, <0x11f10000 0x1000>, <0x1000b000 0x1000>; - reg-names = "gpio_base", "iocfg_rt_base", "iocfg_rb_base", - "iocfg_lt_base", "iocfg_lb_base", "iocfg_tr_base", - "iocfg_tl_base", "eint"; + reg-names = "gpio", "iocfg_rt", "iocfg_rb", + "iocfg_lt", "iocfg_lb", "iocfg_tr", + "iocfg_tl", "eint"; gpio: gpio-controller {gpio-controller; #gpio-cells = <2>;
Quoted 4 lines
--
2.47.1
Thanks!
PATCH 3/8 mediatek: mt7986: move gpio-controller up and rename pinctrl to pio
In reply to Christian MarangiMove gpio-controller up to pinctrl node and rename label to "pio" to match the label used in upstream kernel linux.
Update any DTS that reference the pinctrl to follow the new naming and structure.
--- arch/arm/dts/mt7986.dtsi | 8 +++----- arch/arm/dts/mt7986a-bpi-r3-sd.dts | 12 ++++++------ 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 ++-- 6 files changed, 17 insertions(+), 19 deletions(-)
arch/arm/dts/mt7986.dtsi +3 -5
@@ -122,7 +122,7 @@ #clock-cells = <1>; }; - pinctrl: pinctrl@1001f000 { + pio: pinctrl@1001f000 { compatible = "mediatek,mt7986-pinctrl"; reg = <0x1001f000 0x1000>, <0x11c30000 0x1000>,
@@ -135,10 +135,8 @@ reg-names = "gpio", "iocfg_rt", "iocfg_rb", "iocfg_lt", "iocfg_lb", "iocfg_tr", "iocfg_tl", "eint"; - gpio: gpio-controller { - gpio-controller; - #gpio-cells = <2>; - }; + gpio-controller; + #gpio-cells = <2>; }; pwm: pwm@10048000 {
arch/arm/dts/mt7986a-bpi-r3-sd.dts +6 -6
@@ -38,12 +38,12 @@ factory { label = "reset"; - gpios = <&gpio 9 GPIO_ACTIVE_LOW>; + gpios = <&pio 9 GPIO_ACTIVE_LOW>; }; wps { label = "wps"; - gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + gpios = <&pio 10 GPIO_ACTIVE_LOW>; }; };
@@ -52,12 +52,12 @@ led_status_green: green { label = "green:status"; - gpios = <&gpio 69 GPIO_ACTIVE_HIGH>; + gpios = <&pio 69 GPIO_ACTIVE_HIGH>; }; led_status_blue: blue { label = "blue:status"; - gpios = <&gpio 86 GPIO_ACTIVE_HIGH>; + gpios = <&pio 86 GPIO_ACTIVE_HIGH>; }; };
@@ -78,7 +78,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;
@@ -86,7 +86,7 @@ }; }; -&pinctrl { +&pio { spic_pins: spi1-pins-func-1 { mux { function = "spi";
arch/arm/dts/mt7986a-rfb.dts +2 -2
@@ -57,7 +57,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;
@@ -65,7 +65,7 @@ }; }; -&pinctrl { +&pio { spi_flash_pins: spi0-pins-func-1 { mux { function = "flash";
arch/arm/dts/mt7986a-sd-rfb.dts +2 -2
@@ -49,7 +49,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;
@@ -57,7 +57,7 @@ }; }; -&pinctrl { +&pio { spi_flash_pins: spi0-pins-func-1 { mux { function = "flash";
arch/arm/dts/mt7986b-rfb.dts +2 -2
@@ -48,7 +48,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;
@@ -56,7 +56,7 @@ }; }; -&pinctrl { +&pio { spi_flash_pins: spi0-pins-func-1 { mux { function = "flash";
arch/arm/dts/mt7986b-sd-rfb.dts +2 -2
@@ -49,7 +49,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;
@@ -57,7 +57,7 @@ }; }; -&pinctrl { +&pio { spi_flash_pins: spi0-pins-func-1 { mux { function = "flash";
Signature · 1 line
2.47.1
Re: [PATCH 3/8] mediatek: mt7986: move gpio-controller up and rename pinctrl to pio
Quoted 193 lines · Christian Marangi
External email : Please do not click links or open attachments until you have verified the sender or the content.
Move gpio-controller up to pinctrl node and rename label to "pio" to match the label used in upstream kernel linux.
Update any DTS that reference the pinctrl to follow the new naming and
structure.Signed-off-by Christian Marangi <[email protected]>--- arch/arm/dts/mt7986.dtsi | 8 +++----- arch/arm/dts/mt7986a-bpi-r3-sd.dts | 12 ++++++------ 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 ++-- 6 files changed, 17 insertions(+), 19 deletions(-)arch/arm/dts/mt7986.dtsi +3
-5@@ -122,7 +122,7 @@ #clock-cells = <1>; }; - pinctrl: pinctrl@1001f000 { + pio: pinctrl@1001f000 { compatible = "mediatek,mt7986-pinctrl"; reg = <0x1001f000 0x1000>, <0x11c30000 0x1000>,@@ -135,10 +135,8 @@ reg-names = "gpio", "iocfg_rt", "iocfg_rb", "iocfg_lt", "iocfg_lb", "iocfg_tr", "iocfg_tl", "eint"; - gpio: gpio-controller { - gpio-controller; - #gpio-cells = <2>; - }; + gpio-controller; + #gpio-cells = <2>; }; pwm: pwm@10048000 {arch/arm/dts/mt7986a-bpi-r3-sd.dts +6
-6@@ -38,12 +38,12 @@ factory { label = "reset"; - gpios = <&gpio 9 GPIO_ACTIVE_LOW>; + gpios = <&pio 9 GPIO_ACTIVE_LOW>; }; wps { label = "wps"; - gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + gpios = <&pio 10 GPIO_ACTIVE_LOW>; }; };@@ -52,12 +52,12 @@ led_status_green: green { label = "green:status"; - gpios = <&gpio 69 GPIO_ACTIVE_HIGH>; + gpios = <&pio 69 GPIO_ACTIVE_HIGH>; }; led_status_blue: blue { label = "blue:status"; - gpios = <&gpio 86 GPIO_ACTIVE_HIGH>; + gpios = <&pio 86 GPIO_ACTIVE_HIGH>; }; };@@ -78,7 +78,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;@@ -86,7 +86,7 @@ }; }; -&pinctrl { +&pio { spic_pins: spi1-pins-func-1 { mux { function = "spi";arch/arm/dts/mt7986a- renamed from arch/arm/dts/mt7986a-rfb.dts +0
-0
rfb.dts
index67d14a99dae..d4bbb23204a100644arch/arm/dts/mt7986a-rfb.dts +2
-2@@ -57,7 +57,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;@@ -65,7 +65,7 @@ }; }; -&pinctrl { +&pio { spi_flash_pins: spi0-pins-func-1 { mux { function = "flash";arch/arm/dts/mt7986a- renamed from arch/arm/dts/mt7986a-sd-rfb.dts +0
-0
sd-rfb.dts
index4f8fa70ec99..11823e05bda100644arch/arm/dts/mt7986a-sd-rfb.dts +2
-2@@ -49,7 +49,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;@@ -57,7 +57,7 @@ }; }; -&pinctrl { +&pio { spi_flash_pins: spi0-pins-func-1 { mux { function = "flash";arch/arm/dts/mt7986b- renamed from arch/arm/dts/mt7986b-rfb.dts +0
-0
rfb.dts
indexf98b04ab140..0a731fe87fd100644arch/arm/dts/mt7986b-rfb.dts +2
-2@@ -48,7 +48,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;@@ -56,7 +56,7 @@ }; }; -&pinctrl { +&pio { spi_flash_pins: spi0-pins-func-1 { mux { function = "flash";arch/arm/dts/mt7986b- renamed from arch/arm/dts/mt7986b-sd-rfb.dts +0
-0
sd-rfb.dts
indexec80a2fb710..e5fb4d73e70100644arch/arm/dts/mt7986b-sd-rfb.dts +2
-3@@ -49,7 +49,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;@@ -57,7 +57,7 @@ }; }; -&pinctrl { +&pio { spi_flash_pins: spi0-pins-func-1 { mux { function = "flash"; --
Quoted 2 lines
2.47.1
Thanks!
PATCH 4/8 pinctrl: mediatek: mt7988: rename reg-names to upstream linux format
In reply to Christian MarangiRename reg-names to upstream linux format. Upstream linux drop the "_base". To make use of upstream DTSI, align to the upstream naming.
--- arch/arm/dts/mt7988.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/mt7988.dtsi +2 -2
@@ -119,8 +119,8 @@ <0 0x11e00000 0 0x1000>, <0 0x11f00000 0 0x1000>, <0 0x1000b000 0 0x1000>; - reg-names = "gpio_base", "iocfg_tr_base", "iocfg_br_base", - "iocfg_rb_base", "iocfg_lb_base", "iocfg_tl_base", + reg-names = "gpio", "iocfg_tr", "iocfg_br", + "iocfg_rb", "iocfg_lb", "iocfg_tl", "eint"; gpio: gpio-controller { gpio-controller;
Signature · 1 line
2.47.1
Re: [PATCH 4/8] pinctrl: mediatek: mt7988: rename reg-names to upstream linux format
Quoted 29 lines · Christian Marangi
External email : Please do not click links or open attachments until you have verified the sender or the content.
Rename reg-names to upstream linux format. Upstream linux drop the "
_base". To make use of upstream DTSI, align to the upstream naming.Signed-off-by Christian Marangi <[email protected]>--- arch/arm/dts/mt7988.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/dts/mt7988.dtsi +2
-2@@ -119,8 +119,8 @@ <0 0x11e00000 0 0x1000>, <0 0x11f00000 0 0x1000>, <0 0x1000b000 0 0x1000>; - reg-names = "gpio_base", "iocfg_tr_base", "iocfg_br_base", - "iocfg_rb_base", "iocfg_lb_base", "iocfg_tl_base", + reg-names = "gpio", "iocfg_tr", "iocfg_br", + "iocfg_rb", "iocfg_lb", "iocfg_tl", "eint";gpio: gpio-controller { gpio-controller;
Quoted 3 lines
--
2.47.1
Thanks!
PATCH 5/8 mediatek: mt7988: move gpio-controller up and rename pinctrl to pio
In reply to Christian MarangiMove gpio-controller up to pinctrl node and rename label to "pio" to match the label used in upstream kernel linux.
Update any DTS that reference the pinctrl to follow the new naming and structure.
--- arch/arm/dts/mt7988-rfb.dts | 2 +- arch/arm/dts/mt7988-sd-rfb.dts | 2 +- arch/arm/dts/mt7988.dtsi | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-)
arch/arm/dts/mt7988-rfb.dts +1 -1
@@ -80,7 +80,7 @@ status = "disabled"; }; -&pinctrl { +&pio { i2c1_pins: i2c1-pins { mux { function = "i2c";
arch/arm/dts/mt7988-sd-rfb.dts +1 -1
@@ -53,7 +53,7 @@ }; }; -&pinctrl { +&pio { i2c1_pins: i2c1-pins { mux { function = "i2c";
arch/arm/dts/mt7988.dtsi +3 -5
@@ -110,7 +110,7 @@ #clock-cells = <1>; }; - pinctrl: pinctrl@1001f000 { + pio: pinctrl@1001f000 { compatible = "mediatek,mt7988-pinctrl"; reg = <0 0x1001f000 0 0x1000>, <0 0x11c10000 0 0x1000>,
@@ -122,10 +122,8 @@ reg-names = "gpio", "iocfg_tr", "iocfg_br", "iocfg_rb", "iocfg_lb", "iocfg_tl", "eint"; - gpio: gpio-controller { - gpio-controller; - #gpio-cells = <2>; - }; + gpio-controller; + #gpio-cells = <2>; }; sgmiisys0: syscon@10060000 {
Signature · 1 line
2.47.1
Re: [PATCH 5/8] mediatek: mt7988: move gpio-controller up and rename pinctrl to pio
Quoted 73 lines · Christian Marangi
External email : Please do not click links or open attachments until you have verified the sender or the content.
Move gpio-controller up to pinctrl node and rename label to "pio" to match the label used in upstream kernel linux.
Update any DTS that reference the pinctrl to follow the new naming and
structure.Signed-off-by Christian Marangi <[email protected]>--- arch/arm/dts/mt7988-rfb.dts | 2 +- arch/arm/dts/mt7988-sd-rfb.dts | 2 +- arch/arm/dts/mt7988.dtsi | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-)arch/arm/dts/mt7988- renamed from arch/arm/dts/mt7988-rfb.dts +0
-0
rfb.dts
index2579d7099fb..1694ef8d9c3100644arch/arm/dts/mt7988-rfb.dts +1
-1@@ -80,7 +80,7 @@ status = "disabled"; }; -&pinctrl { +&pio { i2c1_pins: i2c1-pins { mux { function = "i2c";arch/arm/dts/mt7988-sd- renamed from arch/arm/dts/mt7988-sd-rfb.dts +0
-0
rfb.dts
index38727a271b2..63e923137c2100644arch/arm/dts/mt7988-sd-rfb.dts +1
-1@@ -53,7 +53,7 @@ }; }; -&pinctrl { +&pio { i2c1_pins: i2c1-pins { mux { function = "i2c";arch/arm/dts/mt7988.dtsi +3
-6@@ -110,7 +110,7 @@ #clock-cells = <1>; }; - pinctrl: pinctrl@1001f000 { + pio: pinctrl@1001f000 { compatible = "mediatek,mt7988-pinctrl"; reg = <0 0x1001f000 0 0x1000>, <0 0x11c10000 0 0x1000>,@@ -122,10 +122,8 @@ reg-names = "gpio", "iocfg_tr", "iocfg_br", "iocfg_rb", "iocfg_lb", "iocfg_tl", "eint"; - gpio: gpio-controller { - gpio-controller; - #gpio-cells = <2>; - }; + gpio-controller; + #gpio-cells = <2>; }; sgmiisys0: syscon@10060000 { --
Quoted 2 lines
2.47.1
Thanks!
PATCH 6/8 mediatek: mt7981: move gpio-controller up and rename pinctrl to pio
In reply to Christian MarangiMove gpio-controller up to pinctrl node and rename label to "pio" to match the label used in upstream kernel linux.
Update any DTS that reference the pinctrl to follow the new naming and structure.
--- 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/mt7981.dtsi | 8 +++----- 4 files changed, 9 insertions(+), 11 deletions(-)
arch/arm/dts/mt7981-emmc-rfb.dts +2 -2
@@ -48,7 +48,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;
@@ -56,7 +56,7 @@ }; }; -&pinctrl { +&pio { spic_pins: spi1-pins-func-1 { mux { function = "spi";
arch/arm/dts/mt7981-rfb.dts +2 -2
@@ -39,7 +39,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;
@@ -47,7 +47,7 @@ }; }; -&pinctrl { +&pio { spi_flash_pins: spi0-pins-func-1 { mux { function = "flash";
arch/arm/dts/mt7981-sd-rfb.dts +2 -2
@@ -48,7 +48,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;
@@ -56,7 +56,7 @@ }; }; -&pinctrl { +&pio { spic_pins: spi1-pins-func-1 { mux { function = "spi";
arch/arm/dts/mt7981.dtsi +3 -5
@@ -106,7 +106,7 @@ bootph-all; }; - pinctrl: pinctrl@11d00000 { + pio: pinctrl@11d00000 { compatible = "mediatek,mt7981-pinctrl"; reg = <0x11d00000 0x1000>, <0x11c00000 0x1000>,
@@ -120,10 +120,8 @@ reg-names = "gpio", "iocfg_rt", "iocfg_rm", "iocfg_rb", "iocfg_lb", "iocfg_bl", "iocfg_tm", "iocfg_tl", "eint"; - gpio: gpio-controller { - gpio-controller; - #gpio-cells = <2>; - }; + gpio-controller; + #gpio-cells = <2>; }; pwm: pwm@10048000 {
Signature · 1 line
2.47.1
Re: [PATCH 6/8] mediatek: mt7981: move gpio-controller up and rename pinctrl to pio
Quoted 115 lines · Christian Marangi
External email : Please do not click links or open attachments until you have verified the sender or the content.
Move gpio-controller up to pinctrl node and rename label to "pio" to match the label used in upstream kernel linux.
Update any DTS that reference the pinctrl to follow the new naming and
structure.Signed-off-by Christian Marangi <[email protected]>--- 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/mt7981.dtsi | 8 +++----- 4 files changed, 9 insertions(+), 11 deletions(-)arch/arm/dts/mt7981- renamed from arch/arm/dts/mt7981-emmc-rfb.dts +0
-0
emmc-rfb.dts
indexd6590f01cf8..67f178bc232100644arch/arm/dts/mt7981-emmc-rfb.dts +2
-2@@ -48,7 +48,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;@@ -56,7 +56,7 @@ }; }; -&pinctrl { +&pio { spic_pins: spi1-pins-func-1 { mux { function = "spi";arch/arm/dts/mt7981- renamed from arch/arm/dts/mt7981-rfb.dts +0
-0
rfb.dts
indexd6ebd6539c3..08e1b76b473100644arch/arm/dts/mt7981-rfb.dts +2
-2@@ -39,7 +39,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;@@ -47,7 +47,7 @@ }; }; -&pinctrl { +&pio { spi_flash_pins: spi0-pins-func-1 { mux { function = "flash";arch/arm/dts/mt7981-sd- renamed from arch/arm/dts/mt7981-sd-rfb.dts +0
-0
rfb.dts
index2adbc374725..2f43e65ac5b100644arch/arm/dts/mt7981-sd-rfb.dts +2
-2@@ -48,7 +48,7 @@ mediatek,gmac-id = <0>; phy-mode = "2500base-x"; mediatek,switch = "mt7531"; - reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>; fixed-link { speed = <2500>;@@ -56,7 +56,7 @@ }; }; -&pinctrl { +&pio { spic_pins: spi1-pins-func-1 { mux { function = "spi";arch/arm/dts/mt7981.dtsi +3
-6@@ -106,7 +106,7 @@ bootph-all; }; - pinctrl: pinctrl@11d00000 { + pio: pinctrl@11d00000 { compatible = "mediatek,mt7981-pinctrl"; reg = <0x11d00000 0x1000>, <0x11c00000 0x1000>,@@ -120,10 +120,8 @@ reg-names = "gpio", "iocfg_rt", "iocfg_rm", "iocfg_rb", "iocfg_lb", "iocfg_bl", "iocfg_tm", "iocfg_tl", "eint"; - gpio: gpio-controller { - gpio-controller; - #gpio-cells = <2>; - }; + gpio-controller; + #gpio-cells = <2>; }; pwm: pwm@10048000 { --
Quoted 2 lines
2.47.1
Thanks!
PATCH 7/8 arm: dts: mediatek: add USB nodes for MT7981
In reply to Christian MarangiFrom: John Crispin <[email protected]>
Add USB PHY nodes for MT7981. These are needed for USB support and also for PCIe support as the u3 PHY can also be used for PHY.
--- arch/arm/dts/mt7981.dtsi | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)
arch/arm/dts/mt7981.dtsi +48 -0
@@ -6,6 +6,7 @@ #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/phy/phy.h> #include <dt-bindings/clock/mt7981-clk.h> #include <dt-bindings/reset/mt7629-reset.h> #include <dt-bindings/pinctrl/mt65xx.h>
@@ -315,4 +316,51 @@ status = "disabled"; }; + xhci: xhci@11200000 { + compatible = "mediatek,mt7981-xhci", + "mediatek,mtk-xhci"; + reg = <0x11200000 0x2e00>, + <0x11203e00 0x0100>; + reg-names = "mac", "ippc"; + interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>; + phys = <&u2port0 PHY_TYPE_USB2>, + <&u3port0 PHY_TYPE_USB3>; + clocks = <&infracfg CLK_INFRA_IUSB_SYS_CK>, + <&infracfg CLK_INFRA_IUSB_CK>, + <&infracfg CLK_INFRA_IUSB_133_CK>, + <&infracfg CLK_INFRA_IUSB_66M_CK>, + <&topckgen CLK_TOP_U2U3_XHCI_SEL>; + clock-names = "sys_ck", + "ref_ck", + "mcu_ck", + "dma_ck", + "xhci_ck"; + mediatek,u3p-dis-msk = <0x1>; + status = "okay"; + }; + + usbtphy: usb-phy@11e10000 { + compatible = "mediatek,mt7981", + "mediatek,generic-tphy-v2"; + #address-cells = <1>; + #size-cells = <1>; + status = "okay"; + + u2port0: usb-phy@11e10000 { + reg = <0x11e10000 0x700>; + clocks = <&topckgen CLK_TOP_USB_FRMCNT_SEL>; + clock-names = "ref"; + #phy-cells = <1>; + status = "okay"; + }; + + u3port0: usb-phy@11e10700 { + reg = <0x11e10700 0x900>; + clocks = <&topckgen CLK_TOP_USB3_PHY_SEL>; + clock-names = "ref"; + #phy-cells = <1>; + mediatek,syscon-type = <&topmisc 0x218 0>; + status = "okay"; + }; + }; };
Signature · 1 line
2.47.1
Re: [PATCH 7/8] arm: dts: mediatek: add USB nodes for MT7981
Quoted 82 lines · Christian Marangi
External email : Please do not click links or open attachments until you have verified the sender or the content.
From: John Crispin <[email protected]>
Add USB PHY nodes for MT7981. These are needed for USB support and also
for PCIe support as the u3 PHY can also be used for PHY.Signed-off-by John Crispin <[email protected]>Signed-off-by Christian Marangi <[email protected]>--- arch/arm/dts/mt7981.dtsi | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)arch/arm/dts/mt7981.dtsi +48
-1@@ -6,6 +6,7 @@ #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/phy/phy.h> #include <dt-bindings/clock/mt7981-clk.h> #include <dt-bindings/reset/mt7629-reset.h> #include <dt-bindings/pinctrl/mt65xx.h>@@ -315,4 +316,51 @@ status = "disabled"; }; + xhci: xhci@11200000 { + compatible = "mediatek,mt7981-xhci", + "mediatek,mtk-xhci"; + reg = <0x11200000 0x2e00>, + <0x11203e00 0x0100>; + reg-names = "mac", "ippc"; + interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>; + phys = <&u2port0 PHY_TYPE_USB2>, + <&u3port0 PHY_TYPE_USB3>; + clocks = <&infracfg CLK_INFRA_IUSB_SYS_CK>, + <&infracfg CLK_INFRA_IUSB_CK>, + <&infracfg CLK_INFRA_IUSB_133_CK>, + <&infracfg CLK_INFRA_IUSB_66M_CK>, + <&topckgen CLK_TOP_U2U3_XHCI_SEL>; + clock-names = "sys_ck", + "ref_ck", + "mcu_ck", + "dma_ck", + "xhci_ck"; + mediatek,u3p-dis-msk = <0x1>; + status = "okay"; + }; + + usbtphy: usb-phy@11e10000 { + compatible = "mediatek,mt7981", + "mediatek,generic-tphy-v2"; + #address-cells = <1>; + #size-cells = <1>; + status = "okay"; + + u2port0: usb-phy@11e10000 { + reg = <0x11e10000 0x700>; + clocks = <&topckgen CLK_TOP_USB_FRMCNT_SEL>; + clock-names = "ref"; + #phy-cells = <1>; + status = "okay"; + }; + + u3port0: usb-phy@11e10700 { + reg = <0x11e10700 0x900>; + clocks = <&topckgen CLK_TOP_USB3_PHY_SEL>; + clock-names = "ref"; + #phy-cells = <1>; + mediatek,syscon-type = <&topmisc 0x218 0>; + status = "okay"; + }; + }; }; --
Quoted 2 lines
2.47.1
Thanks!
PATCH 8/8 arm: dts: mediatek: add PCIe node for MT7981
In reply to Christian MarangiAdd PCIe node for MT7981 with all the required properties to make PCIe work.
--- arch/arm/dts/mt7981.dtsi | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
arch/arm/dts/mt7981.dtsi +35 -0
@@ -339,6 +339,41 @@ status = "okay"; }; + pcie: pcie@11280000 { + compatible = "mediatek,mt8192-pcie"; + device_type = "pci"; + reg = <0x11280000 0x4000>; + reg-names = "pcie-mac"; + #address-cells = <3>; + #size-cells = <2>; + interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&infracfg CLK_INFRA_IPCIE_CK>, + <&infracfg CLK_INFRA_IPCIE_PIPE_CK>, + <&infracfg CLK_INFRA_IPCIER_CK>, + <&infracfg CLK_INFRA_IPCIEB_CK>; + clock-names = "pl_250m", "tl_26m", "peri_26m", "top_133m"; + phys = <&u3port0 PHY_TYPE_PCIE>; + phy-names = "pcie-phy"; + bus-range = <0x00 0xff>; + ranges = <0x82000000 0 0x20000000 0x20000000 0 0x10000000>; + + #interrupt-cells = <1>; + + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie_intc 0>, + <0 0 0 2 &pcie_intc 1>, + <0 0 0 3 &pcie_intc 2>, + <0 0 0 4 &pcie_intc 3>; + + status = "disabled"; + + pcie_intc: interrupt-controller { + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; + }; + }; + usbtphy: usb-phy@11e10000 { compatible = "mediatek,mt7981", "mediatek,generic-tphy-v2";
Signature · 1 line
2.47.1
Re: [PATCH 8/8] arm: dts: mediatek: add PCIe node for MT7981
Quoted 61 lines · Christian Marangi
External email : Please do not click links or open attachments until you have verified the sender or the content.
Add PCIe node for MT7981 with all the required properties to make PCIe
work.Signed-off-by Christian Marangi <[email protected]>--- arch/arm/dts/mt7981.dtsi | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)arch/arm/dts/mt7981.dtsi +35
-0@@ -339,6 +339,41 @@ status = "okay"; }; + pcie: pcie@11280000 { + compatible = "mediatek,mt8192-pcie"; + device_type = "pci"; + reg = <0x11280000 0x4000>; + reg-names = "pcie-mac"; + #address-cells = <3>; + #size-cells = <2>; + interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&infracfg CLK_INFRA_IPCIE_CK>, + <&infracfg CLK_INFRA_IPCIE_PIPE_CK>, + <&infracfg CLK_INFRA_IPCIER_CK>, + <&infracfg CLK_INFRA_IPCIEB_CK>; + clock-names = "pl_250m", "tl_26m", "peri_26m", "top_133m"; + phys = <&u3port0 PHY_TYPE_PCIE>; + phy-names = "pcie-phy"; + bus-range = <0x00 0xff>; + ranges = <0x82000000 0 0x20000000 0x20000000 0 0x10000000>; + + #interrupt-cells = <1>; + + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie_intc 0>, + <0 0 0 2 &pcie_intc 1>, + <0 0 0 3 &pcie_intc 2>, + <0 0 0 4 &pcie_intc 3>; + + status = "disabled"; + + pcie_intc: interrupt-controller { + interrupt-controller; + #interrupt-cells = <1>; + #address-cells = <0>; + }; + }; + usbtphy: usb-phy@11e10000 {compatible = "mediatek,mt7981", "mediatek,generic-tphy-v2";
Quoted 3 lines
--
2.47.1
Thanks!
Quoted 8 lines · Christian Marangi
This is the last batch of part to push actual support of
OF_UPSTREAMfor the mediatek SoC.The plan is to make the current downstream DTS on part with upstream implementation so we can permit a gradual transition to it while we don't cause any regression to any user.
[...]
Applied to u-boot/master, thanks!
Signature · 1 line
Tom