From 667d109d0fc8e3f64c6a47ca9cb40576a486a313 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 16 Feb 2024 13:37:17 +0800 Subject: [PATCH] mediatek: filogic: bpi-r3-mini: fix power on M.2 slot One of the pins requiered by M.2 slot is conflict with spi1, however, spi1 seems unused so simply disable it for now, this matches the factory behavior [1]. 1. https://github.com/BPI-SINOVOIP/BPI-R3MINI-OPENWRT-V21.02.3/commit/9bd78779f267a21c04c5bb4d16c32e83aae8d1d3 Signed-off-by: Tianling Shen --- .../mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts index fdf6b8818c..09a557c0cb 100644 --- a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts +++ b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts @@ -427,6 +427,11 @@ }; usb_ngff_pins: usb-ngff-pins { + ngff-gnss-off { + pins = "GPIO_6"; + drive-strength = <8>; + mediatek,pull-up-adv = <1>; + }; ngff-pe-rst { pins = "GPIO_7"; drive-strength = <8>; @@ -447,6 +452,11 @@ drive-strength = <8>; mediatek,pull-up-adv = <1>; }; + ngff-coex { + pins = "SPI1_CS"; + drive-strength = <8>; + mediatek,pull-up-adv = <1>; + }; }; wf_2g_5g_pins: wf-2g-5g-pins { @@ -534,7 +544,8 @@ &spi1 { pinctrl-names = "default"; pinctrl-0 = <&spic_pins>; - status = "okay"; + /* conflicts with M.2 pin */ + status = "disabled"; }; &ssusb { -- 2.30.2