Skip to contentSkip to conversation

Cumulative fixes and updates for MediaTek platform

PATCH In review Weijie Gao 2 participants 17 messages Jan 17, 2025 – Jan 23, 2025

Subsystems (6)
lore
Share & tools
lore

Weijie Gao

author
#0 lore raw

cover Cumulative fixes and updates for MediaTek platform

This patch series contains fixes and updates for MediaTek platform, including drivers, board and arch files.

Weijie Gao (15):
board: mediatek: mt7622: remove board_late_init
clk: mediatek: fix uninitialized fields issue in INFRA_MUX struct
configs: mt7629: move image load address to 0x42000000
configs: mt7988: move image load address to 0x44000000
spi: mtk_spim: add support to use DT live tree
spi: mtk_spim: check slave device mode in spi-mem's supports_op
arm: dts: mediatek: add quad mode capabilities for SPI flashes
pwm: mediatek: add pwm3 support for mt7981
pci: mediatek: add support for multiple ports in mediatek pcie gen3
driver
arm: dts: mediatek: add pcie support for mt7988
arm: dts: medaitek: fix internal switch link speed of mt7988
arm: dts: mediatek: add support for all three GMACs for mt7988
arm: dts: medaitek: add flash interface driving settings for mt7988
arm: dts: mediatek: update mt7981 mmc node
MAINTAINERS: update file list for MediaTek ARM platform

 MAINTAINERS                        |   5 +
 arch/arm/dts/mt7981-emmc-rfb.dts   |   8 ++
 arch/arm/dts/mt7981-rfb.dts        |  12 ++
 arch/arm/dts/mt7981-sd-rfb.dts     |  14 +-
 arch/arm/dts/mt7981.dtsi           |  22 ++--
 arch/arm/dts/mt7986a-rfb.dts       |   4 +
 arch/arm/dts/mt7986b-rfb.dts       |   4 +
 arch/arm/dts/mt7988-rfb.dts        |  59 ++++++++-
 arch/arm/dts/mt7988-sd-rfb.dts     |   5 +-
 arch/arm/dts/mt7988.dtsi           | 204 ++++++++++++++++++++++++++++-
 board/mediatek/mt7622/mt7622_rfb.c |   7 -
 configs/mt7629_rfb_defconfig       |   2 +-
 configs/mt7988_rfb_defconfig       |   2 +-
 drivers/clk/mediatek/clk-mt7981.c  |   1 +
 drivers/clk/mediatek/clk-mt7986.c  |   1 +
 drivers/clk/mediatek/clk-mt7988.c  |   1 +
 drivers/pci/pcie_mediatek_gen3.c   |  24 ++++
 drivers/pwm/pwm-mtk.c              |   2 +-
 drivers/spi/mtk_spim.c             |   5 +-
 19 files changed, 353 insertions(+), 29 deletions(-)
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 1/15 board: mediatek: mt7622: remove board_late_init

The function board_late_init defined for mt7622 is useless now. Just remove it.

---
 board/mediatek/mt7622/mt7622_rfb.c | 7 -------
 1 file changed, 7 deletions(-)
board/mediatek/mt7622/mt7622_rfb.c +0 -7
index e7f492a13bc..9d24c8cd412 100644
@@ -15,10 +15,3 @@ int board_init(void)
 {
 	return 0;
 }
-
-int board_late_init(void)
-{
-	gd->env_valid = 1; //to load environment variable from persistent store
-	env_relocate();
-	return 0;
-}
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH 2/15 clk: mediatek: fix uninitialized fields issue in INFRA_MUX struct

In reply to Weijie Gao

This patch adds missing initialization of fields in INFRA_MUX struct which caused uart broken after any other infra mux being enabled by 'clk_prepare_enable'

---
 drivers/clk/mediatek/clk-mt7981.c | 1 +
 drivers/clk/mediatek/clk-mt7986.c | 1 +
 drivers/clk/mediatek/clk-mt7988.c | 1 +
 3 files changed, 3 insertions(+)
drivers/clk/mediatek/clk-mt7981.c +1 -0
index 97073918006..60814652322 100644
@@ -359,6 +359,7 @@ static const struct mtk_parent infra_pcie_parents[] = {
 		.id = _id, .mux_reg = (_reg) + 0x8,                            \
 		.mux_set_reg = (_reg) + 0x0, .mux_clr_reg = (_reg) + 0x4,      \
 		.mux_shift = _shift, .mux_mask = BIT(_width) - 1,              \
+		.gate_shift = -1, .upd_shift = -1,			       \
 		.parent_flags = _parents, .num_parents = ARRAY_SIZE(_parents), \
 		.flags = CLK_MUX_SETCLR_UPD | CLK_PARENT_MIXED,                \
 	}
drivers/clk/mediatek/clk-mt7986.c +1 -0
index c5cc77243d0..f9d6f9c1749 100644
@@ -366,6 +366,7 @@ static const struct mtk_parent infra_pcie_parents[] = {
 		.id = _id, .mux_reg = (_reg) + 0x8,                            \
 		.mux_set_reg = (_reg) + 0x0, .mux_clr_reg = (_reg) + 0x4,      \
 		.mux_shift = _shift, .mux_mask = BIT(_width) - 1,              \
+		.gate_shift = -1, .upd_shift = -1,			       \
 		.parent_flags = _parents, .num_parents = ARRAY_SIZE(_parents), \
 		.flags = CLK_MUX_SETCLR_UPD | CLK_PARENT_MIXED,                \
 	}
drivers/clk/mediatek/clk-mt7988.c +1 -0
index 8f4e8f4e8c9..73fd9c6bea6 100644
@@ -485,6 +485,7 @@ static const int infra_pcie_gfmux_tl_ck_o_p3_parents[] = {
 		.id = _id, .mux_reg = _reg + 0x8, .mux_set_reg = _reg + 0x0,   \
 		.mux_clr_reg = _reg + 0x4, .mux_shift = _shift,                \
 		.mux_mask = BIT(_width) - 1, .parent = _parents,               \
+		.gate_shift = -1, .upd_shift = -1,			       \
 		.num_parents = ARRAY_SIZE(_parents),                           \
 		.flags = CLK_MUX_SETCLR_UPD | CLK_PARENT_TOPCKGEN,             \
 	}
Signature · 1 line
2.34.1
author
#3 lore raw

PATCH 3/15 configs: mt7629: move image load address to 0x42000000

In reply to Weijie Gao

Update the image load address to ensure it matches the mt7629 NOR controller's DMA alignment requirements.

---
 configs/mt7629_rfb_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/mt7629_rfb_defconfig +1 -1
index 4acf521e7fd..f69be08cc3f 100644
@@ -18,7 +18,7 @@ CONFIG_SPL_STACK=0x106000
 CONFIG_SPL_TEXT_BASE=0x201000
 CONFIG_SPL_STACK_R=y
 CONFIG_SYS_BOOTM_LEN=0x4000000
-CONFIG_SYS_LOAD_ADDR=0x42007f1c
+CONFIG_SYS_LOAD_ADDR=0x42000000
 CONFIG_SPL_PAYLOAD="u-boot-lzma.img"
 CONFIG_BUILD_TARGET="u-boot-mtk.bin"
 CONFIG_SPL_IMAGE="spl/u-boot-spl-mtk.bin"
Signature · 1 line
2.34.1
author
#4 lore raw

PATCH 4/15 configs: mt7988: move image load address to 0x44000000

In reply to Weijie Gao

This patch sets mt7988 image load address to 0x44000000 to support loading larger images.

---
 configs/mt7988_rfb_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/mt7988_rfb_defconfig +1 -1
index 4d7454d5d39..eebf7fb43ba 100644
@@ -7,7 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_DEFAULT_DEVICE_TREE="mt7988-rfb"
 CONFIG_TARGET_MT7988=y
-CONFIG_SYS_LOAD_ADDR=0x46000000
+CONFIG_SYS_LOAD_ADDR=0x44000000
 CONFIG_DEBUG_UART_BASE=0x11000000
 CONFIG_DEBUG_UART_CLOCK=40000000
 CONFIG_DEBUG_UART=y
Signature · 1 line
2.34.1
author
#5 lore raw

PATCH 5/15 spi: mtk_spim: add support to use DT live tree

In reply to Weijie Gao

Change devfdt_get_addr_ptr to dev_read_addr_ptr to support DT live tree.

---
 drivers/spi/mtk_spim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/mtk_spim.c +1 -1
index b66bcfc4233..cd9b9d305ef 100644
@@ -648,7 +648,7 @@ static int mtk_spim_probe(struct udevice *dev)
 	struct mtk_spim_priv *priv = dev_get_priv(dev);
 	int ret;
 
-	priv->base = devfdt_get_addr_ptr(dev);
+	priv->base = dev_read_addr_ptr(dev);
 	if (!priv->base)
 		return -EINVAL;
 
Signature · 1 line
2.34.1
author
#6 lore raw

PATCH 6/15 spi: mtk_spim: check slave device mode in spi-mem's supports_op

In reply to Weijie Gao

Call spi_mem_default_supports_op() in supports_op to honor the slave's supported single/dual/quad mode settings.

---
 drivers/spi/mtk_spim.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/spi/mtk_spim.c +3 -0
index cd9b9d305ef..2b2c31b4b3f 100644
@@ -359,6 +359,9 @@ static bool mtk_spim_supports_op(struct spi_slave *slave,
 	struct udevice *bus = dev_get_parent(slave->dev);
 	struct mtk_spim_priv *priv = dev_get_priv(bus);
 
+	if (!spi_mem_default_supports_op(slave, op))
+		return false;
+
 	if (op->cmd.buswidth == 0 || op->cmd.buswidth > 4 ||
 	    op->addr.buswidth > 4 || op->dummy.buswidth > 4 ||
 	    op->data.buswidth > 4)
Signature · 1 line
2.34.1
author
#7 lore raw

PATCH 7/15 arm: dts: mediatek: add quad mode capabilities for SPI flashes

In reply to Weijie Gao

Explicitly add quad mode capabilities or the SPI controller may start transfer in single mode.

---
 arch/arm/dts/mt7981-rfb.dts  | 4 ++++
 arch/arm/dts/mt7986a-rfb.dts | 4 ++++
 arch/arm/dts/mt7986b-rfb.dts | 4 ++++
 arch/arm/dts/mt7988-rfb.dts  | 4 ++++
 4 files changed, 16 insertions(+)
arch/arm/dts/mt7981-rfb.dts +4 -0
index a331b058625..0081d4ed032 100644
@@ -143,6 +143,8 @@
 		compatible = "spi-nand";
 		reg = <0>;
 		spi-max-frequency = <52000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <4>;
 	};
 };
 
@@ -164,6 +166,8 @@
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <52000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <4>;
 	};
 };
 
arch/arm/dts/mt7986a-rfb.dts +4 -0
index e5c9be7da82..67d14a99dae 100644
@@ -190,12 +190,16 @@
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <52000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <4>;
 	};
 
 	spi_nand@1 {
 		compatible = "spi-nand";
 		reg = <1>;
 		spi-max-frequency = <52000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <4>;
 	};
 };
 
arch/arm/dts/mt7986b-rfb.dts +4 -0
index 8196845a123..f98b04ab140 100644
@@ -177,12 +177,16 @@
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <52000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <4>;
 	};
 
 	spi_nand@1 {
 		compatible = "spi-nand";
 		reg = <1>;
 		spi-max-frequency = <52000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <4>;
 	};
 };
 
arch/arm/dts/mt7988-rfb.dts +4 -0
index 2c114284309..71a58a26f6c 100644
@@ -144,6 +144,8 @@
 		compatible = "spi-nand";
 		reg = <0>;
 		spi-max-frequency = <52000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <4>;
 	};
 };
 
@@ -165,6 +167,8 @@
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <52000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <4>;
 	};
 };
 
Signature · 1 line
2.34.1
author
#8 lore raw

PATCH 8/15 pwm: mediatek: add pwm3 support for mt7981

In reply to Weijie Gao

This patch adds pwm channel 2 (pwm3) support for mt7981

---
 arch/arm/dts/mt7981-emmc-rfb.dts |  8 ++++++++
 arch/arm/dts/mt7981-rfb.dts      |  8 ++++++++
 arch/arm/dts/mt7981-sd-rfb.dts   |  8 ++++++++
 arch/arm/dts/mt7981.dtsi         | 10 ++++++++--
 drivers/pwm/pwm-mtk.c            |  2 +-
 5 files changed, 33 insertions(+), 3 deletions(-)
arch/arm/dts/mt7981-emmc-rfb.dts +8 -0
index 303f6707efa..96ecead569b 100644
@@ -95,6 +95,14 @@
 		};
 	};
 
+	/* pin13 as pwm0, pin15 as pwm1, pin7 as pwm2 */
+	three_pwm_pins_1: three-pwm-pins {
+		mux {
+			function = "pwm";
+			groups = "pwm0_0", "pwm1_1", "pwm2";
+		};
+	};
+
 	mmc0_pins_default: mmc0default {
 		mux {
 			function = "flash";
arch/arm/dts/mt7981-rfb.dts +8 -0
index 0081d4ed032..d684acf05c3 100644
@@ -123,6 +123,14 @@
 			groups = "pwm0_1", "pwm1_0", "pwm2";
 		};
 	};
+
+	/* pin13 as pwm0, pin15 as pwm1, pin7 as pwm2 */
+	three_pwm_pins_1: three-pwm-pins {
+		mux {
+			function = "pwm";
+			groups = "pwm0_0", "pwm1_1", "pwm2";
+		};
+	};
 };
 
 &spi0 {
arch/arm/dts/mt7981-sd-rfb.dts +8 -0
index 565929b6050..41cccf3bbe1 100644
@@ -95,6 +95,14 @@
 		};
 	};
 
+	/* pin13 as pwm0, pin15 as pwm1, pin7 as pwm2 */
+	three_pwm_pins_1: three-pwm-pins {
+		mux {
+			function = "pwm";
+			groups = "pwm0_0", "pwm1_1", "pwm2";
+		};
+	};
+
 	mmc0_pins_default: mmc0default {
 		mux {
 			function = "flash";
arch/arm/dts/mt7981.dtsi +8 -2
index a9991a121f1..43e505826f5 100644
@@ -137,8 +137,14 @@
 			 <&infracfg CLK_INFRA_PWM1_CK>,
 			 <&infracfg CLK_INFRA_PWM2_CK>,
 			 <&infracfg CLK_INFRA_PWM3_CK>;
-		assigned-clocks = <&topckgen CLK_TOP_PWM_SEL>;
-		assigned-clock-parents = <&topckgen CLK_TOP_CB_CKSQ_40M>;
+		assigned-clocks = <&topckgen CLK_TOP_PWM_SEL>,
+				  <&infracfg CLK_INFRA_PWM1_SEL>,
+				  <&infracfg CLK_INFRA_PWM2_SEL>,
+				  <&infracfg CLK_INFRA_PWM3_SEL>;
+		assigned-clock-parents = <&topckgen CLK_TOP_CB_CKSQ_40M>,
+					 <&topckgen CLK_TOP_PWM_SEL>,
+					 <&topckgen CLK_TOP_PWM_SEL>,
+					 <&topckgen CLK_TOP_PWM_SEL>;
 		clock-names = "top", "main", "pwm1", "pwm2", "pwm3";
 		status = "disabled";
 	};
drivers/pwm/pwm-mtk.c +1 -1
index 9776a41ff48..5cf2eba2ba0 100644
@@ -192,7 +192,7 @@ static const struct mtk_pwm_soc mt7629_data = {
 };
 
 static const struct mtk_pwm_soc mt7981_data = {
-	.num_pwms = 2,
+	.num_pwms = 3,
 	.pwm45_fixup = false,
 	.reg_ver = PWM_REG_V2,
 };
Signature · 1 line
2.34.1
author
#9 lore raw

PATCH 9/15 pci: mediatek: add support for multiple ports in mediatek pcie gen3 driver

In reply to Weijie Gao

One MediaTek PCIe Gen3 controller has only one port, where PCI bus 0 on this port represents the controller itself and bus 1 represents the external PCIe device.

If multiple PCIe controllers are probed in U-Boot, U-Boot will use bus numbers greater than 2 as input parameters. Therefore, we should convert the BDF bus number to either 0 or 1 by subtracting the offset by controller->seq_.

---
 drivers/pci/pcie_mediatek_gen3.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
drivers/pci/pcie_mediatek_gen3.c +24 -0
index 0149edae0bf..1818d4c1e30 100644
@@ -83,6 +83,28 @@ struct mtk_pcie {
 	struct phy phy;
 };
 
+static pci_dev_t convert_bdf(const struct udevice *controller, pci_dev_t bdf)
+{
+	int bdfs[3];
+
+	bdfs[0] = PCI_BUS(bdf);
+	bdfs[1] = PCI_DEV(bdf);
+	bdfs[2] = PCI_FUNC(bdf);
+
+	/*
+	 * One MediaTek PCIe Gen3 controller has only one port, where PCI bus 0 on
+	 * this port represents the controller itself and bus 1 represents the
+	 * external PCIe device. If multiple PCIe controllers are probed in U-Boot,
+	 * U-Boot will use bus numbers greater than 2 as input parameters. Therefore,
+	 * we should convert the BDF bus number to either 0 or 1 by subtracting the
+	 * offset by controller->seq_
+	 */
+
+	bdfs[0] = bdfs[0] - controller->seq_;
+
+	return PCI_BDF(bdfs[0], bdfs[1], bdfs[2]);
+}
+
 static void mtk_pcie_config_tlp_header(const struct udevice *bus,
 				       pci_dev_t devfn,
 				       int where, int size)
@@ -91,6 +113,8 @@ static void mtk_pcie_config_tlp_header(const struct udevice *bus,
 	int bytes;
 	u32 val;
 
+	devfn = convert_bdf(bus, devfn);
+
 	size = 1 << size;
 	bytes = (GENMASK(size - 1, 0) & 0xf) << (where & 0x3);
 
Signature · 1 line
2.34.1
author
#10 lore raw

PATCH 10/15 arm: dts: mediatek: add pcie support for mt7988

In reply to Weijie Gao

This patch adds PCIe support for mt7988

---
 arch/arm/dts/mt7988-rfb.dts |  18 ++++
 arch/arm/dts/mt7988.dtsi    | 162 ++++++++++++++++++++++++++++++++++++
 2 files changed, 180 insertions(+)
arch/arm/dts/mt7988-rfb.dts +18 -0
index 71a58a26f6c..14274e2375f 100644
@@ -63,6 +63,24 @@
 	};
 };
 
+&pcie0 {
+	status = "okay";
+};
+
+&pcie1 {
+	status = "okay";
+};
+
+/* PCIE2 not working in u-boot */
+&pcie2 {
+	status = "disabled";
+};
+
+/* PCIE3 not working in u-boot */
+&pcie3 {
+	status = "disabled";
+};
+
 &pinctrl {
 	i2c1_pins: i2c1-pins {
 		mux {
arch/arm/dts/mt7988.dtsi +162 -0

174 lines not on this page · raw message

Signature · 1 line
2.34.1
author
#11 lore raw

PATCH 11/15 arm: dts: medaitek: fix internal switch link speed of mt7988

In reply to Weijie Gao

The CPU port of mt7988 internal switch uses 10Gb link speed.

---
 arch/arm/dts/mt7988-rfb.dts    | 2 +-
 arch/arm/dts/mt7988-sd-rfb.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/mt7988-rfb.dts +1 -1
index 14274e2375f..f013e3e33c5 100644
@@ -57,7 +57,7 @@
 	mediatek,switch = "mt7988";
 
 	fixed-link {
-		speed = <1000>;
+		speed = <10000>;
 		full-duplex;
 		pause;
 	};
arch/arm/dts/mt7988-sd-rfb.dts +1 -1
index 9aa198b84ab..fd199308da2 100644
@@ -48,7 +48,7 @@
 	mediatek,switch = "mt7988";
 
 	fixed-link {
-		speed = <1000>;
+		speed = <10000>;
 		full-duplex;
 		pause;
 	};
Signature · 1 line
2.34.1
author
#12 lore raw

PATCH 12/15 arm: dts: mediatek: add support for all three GMACs for mt7988

In reply to Weijie Gao

This patch add all three GMACs nodes for mt7988. Each GMAC can be configured to connect to different ethernet switches/PHYs.

---
 arch/arm/dts/mt7988-rfb.dts    |  3 +--
 arch/arm/dts/mt7988-sd-rfb.dts |  3 +--
 arch/arm/dts/mt7988.dtsi       | 42 ++++++++++++++++++++++++++++++++--
 3 files changed, 42 insertions(+), 6 deletions(-)
arch/arm/dts/mt7988-rfb.dts +1 -2
index f013e3e33c5..817fe400db8 100644
@@ -50,9 +50,8 @@
 	status = "okay";
 };
 
-&eth {
+&eth0 {
 	status = "okay";
-	mediatek,gmac-id = <0>;
 	phy-mode = "usxgmii";
 	mediatek,switch = "mt7988";
 
arch/arm/dts/mt7988-sd-rfb.dts +1 -2
index fd199308da2..38727a271b2 100644
@@ -41,9 +41,8 @@
 	status = "okay";
 };
 
-&eth {
+&eth0 {
 	status = "okay";
-	mediatek,gmac-id = <0>;
 	phy-mode = "usxgmii";
 	mediatek,switch = "mt7988";
 
arch/arm/dts/mt7988.dtsi +40 -2

55 lines not on this page · raw message

Signature · 1 line
2.34.1
author
#13 lore raw

PATCH 13/15 arm: dts: medaitek: add flash interface driving settings for mt7988

In reply to Weijie Gao

Add driving settings for both SPI and SD/eMMC interfaces to support ensure flash devices is accessible for ram-booting.

---
 arch/arm/dts/mt7988-rfb.dts | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
arch/arm/dts/mt7988-rfb.dts +32 -0
index 817fe400db8..2579d7099fb 100644
@@ -101,6 +101,19 @@
 			function = "spi";
 			groups = "spi0", "spi0_wp_hold";
 		};
+
+		conf-pu {
+			pins = "SPI0_CSB", "SPI0_HOLD", "SPI0_WP";
+			drive-strength = <MTK_DRIVE_8mA>;
+			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
+		};
+
+		conf-pd {
+			pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
+			drive-strength = <MTK_DRIVE_8mA>;
+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
+		};
+
 	};
 
 	spi2_pins: spi2-pins {
@@ -108,6 +121,18 @@
 			function = "spi";
 			groups = "spi2", "spi2_wp_hold";
 		};
+
+		conf-pu {
+			pins = "SPI2_CSB", "SPI2_HOLD", "SPI2_WP";
+			drive-strength = <MTK_DRIVE_8mA>;
+			bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
+		};
+
+		conf-pd {
+			pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
+			drive-strength = <MTK_DRIVE_8mA>;
+			bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
+		};
 	};
 
 	mmc0_pins_default: mmc0default {
@@ -121,18 +146,25 @@
 			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
 			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
 			input-enable;
+			drive-strength = <MTK_DRIVE_4mA>;
+			mediatek,pull-up-adv = <1>;	/* pull-up 10K */
 		};
 
 		conf-clk {
 			pins = "EMMC_CK";
+			drive-strength = <MTK_DRIVE_6mA>;
+			mediatek,pull-down-adv = <2>;	/* pull-down 50K */
 		};
 
 		conf-dsl {
 			pins = "EMMC_DSL";
+			mediatek,pull-down-adv = <2>;	/* pull-down 50K */
 		};
 
 		conf-rst {
 			pins = "EMMC_RSTB";
+			drive-strength = <MTK_DRIVE_4mA>;
+			mediatek,pull-up-adv = <1>;	/* pull-up 10K */
 		};
 	};
 };
Signature · 1 line
2.34.1
author
#14 lore raw

PATCH 14/15 arm: dts: mediatek: update mt7981 mmc node

In reply to Weijie Gao

1. Fix mmc clock order of mt7981 to match the clock name
2. Limit the max clock of SD to 50MHz to meet SD Card Spec 2.0
3. Increase the CLK pin driving strength to 8mA

---
 arch/arm/dts/mt7981-sd-rfb.dts |  6 ++++--
 arch/arm/dts/mt7981.dtsi       | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)
arch/arm/dts/mt7981-sd-rfb.dts +4 -2
index 41cccf3bbe1..347c252af53 100644
@@ -118,7 +118,7 @@
 		};
 		conf-clk {
 			pins = "SPI1_CS";
-			drive-strength = <MTK_DRIVE_6mA>;
+			drive-strength = <MTK_DRIVE_8mA>;
 			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
 		};
 		conf-rst {
@@ -140,10 +140,12 @@
 };
 
 &mmc0 {
+	assigned-clock-parents = <&topckgen CLK_TOP_CB_NET2_D4>,
+				 <&topckgen CLK_TOP_CB_NET2_D2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_default>;
 	bus-width = <4>;
-	max-frequency = <52000000>;
+	max-frequency = <50000000>;
 	cap-sd-highspeed;
 	r_smpl = <0>;
 	vmmc-supply = <&reg_3p3v>;
arch/arm/dts/mt7981.dtsi +6 -6
index 43e505826f5..2844ab010de 100644
@@ -306,13 +306,13 @@
 		reg = <0x11230000 0x1000>,
 		      <0x11C20000 0x1000>;
 		interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&topckgen CLK_TOP_EMMC_400M>,
-			 <&topckgen CLK_TOP_EMMC_208M>,
+		clocks = <&topckgen CLK_TOP_EMMC_208M>,
+			 <&topckgen CLK_TOP_EMMC_400M>,
 			 <&infracfg CLK_INFRA_MSDC_CK>;
-		assigned-clocks = <&topckgen CLK_TOP_EMMC_400M_SEL>,
-				  <&topckgen CLK_TOP_EMMC_208M_SEL>;
-		assigned-clock-parents = <&topckgen CLK_TOP_CB_NET2_D2>,
-					 <&topckgen CLK_TOP_CB_M_D2>;
+		assigned-clocks = <&topckgen CLK_TOP_EMMC_208M_SEL>,
+				  <&topckgen CLK_TOP_EMMC_400M_SEL>;
+		assigned-clock-parents = <&topckgen CLK_TOP_CB_M_D2>,
+					 <&topckgen CLK_TOP_CB_NET2_D2>;
 		clock-names = "source", "hclk", "source_cg";
 		status = "disabled";
 	};
Signature · 1 line
2.34.1
author
#15 lore raw

PATCH 15/15 MAINTAINERS: update file list for MediaTek ARM platform

In reply to Weijie Gao

Add driver files for MediaTek ARM platform

---
 MAINTAINERS | 5 +++++
 1 file changed, 5 insertions(+)
MAINTAINERS +5 -0
index ba31f86feb6..c8f5a35b003 100644
@@ -412,9 +412,13 @@ F:	drivers/mmc/mtk-sd.c
 F:	drivers/phy/phy-mtk-*
 F:	drivers/pinctrl/mediatek/
 F:	drivers/power/domain/mtk-power-domain.c
+F:	drivers/pci/pcie_mediatek_gen3.c
+F:	drivers/pci/pcie_mediatek.c
+F:	drivers/pwm/pwm-mtk.c
 F:	drivers/ram/mediatek/
 F:	drivers/spi/mtk_snfi_spi.c
 F:	drivers/spi/mtk_spim.c
+F:	drivers/spi/mtk_snor.c
 F:	drivers/timer/mtk_timer.c
 F:	drivers/usb/host/xhci-mtk.c
 F:	drivers/usb/mtu3/
@@ -422,6 +426,7 @@ F:	drivers/watchdog/mtk_wdt.c
 F:	drivers/net/mtk_eth.c
 F:	drivers/net/mtk_eth.h
 F:	drivers/reset/reset-mediatek.c
+F:	drivers/serial/serial_mtk.c
 F:	include/dt-bindings/clock/mediatek,*
 F:	include/dt-bindings/power/mediatek,*
 F:	tools/mtk_image.c
Signature · 1 line
2.34.1
#16 lore raw
In reply to Weijie Gao
Quoted 21 lines · Weijie Gao

This patch series contains fixes and updates for MediaTek platform, including drivers, board and arch files.

Weijie Gao (15):
board: mediatek: mt7622: remove board_late_init
clk: mediatek: fix uninitialized fields issue in INFRA_MUX struct
configs: mt7629: move image load address to 0x42000000
configs: mt7988: move image load address to 0x44000000
spi: mtk_spim: add support to use DT live tree
spi: mtk_spim: check slave device mode in spi-mem's supports_op
arm: dts: mediatek: add quad mode capabilities for SPI flashes
pwm: mediatek: add pwm3 support for mt7981
pci: mediatek: add support for multiple ports in mediatek pcie gen3
driver
arm: dts: mediatek: add pcie support for mt7988
arm: dts: medaitek: fix internal switch link speed of mt7988
arm: dts: mediatek: add support for all three GMACs for mt7988
arm: dts: medaitek: add flash interface driving settings for mt7988
arm: dts: mediatek: update mt7981 mmc node
MAINTAINERS: update file list for MediaTek ARM platform

Quoted 1 line

[...]

Applied to u-boot/master, thanks!

Signature · 1 line
Tom