From 44b441fab2c2138242f3c123c7950d771b91a24c Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 16 Sep 2024 17:35:19 +0800 Subject: [PATCH] mediatek: remove nmbm properties from cmcc a10 dts Fixes: e611b2d90ce4 ("mediatek: migrate CMCC A10 to fit layout") Signed-off-by: Tianling Shen --- .../linux/mediatek/dts/mt7981b-cmcc-a10.dts | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-a10.dts b/target/linux/mediatek/dts/mt7981b-cmcc-a10.dts index 719e069aaf..cc07f95283 100644 --- a/target/linux/mediatek/dts/mt7981b-cmcc-a10.dts +++ b/target/linux/mediatek/dts/mt7981b-cmcc-a10.dts @@ -7,7 +7,6 @@ #include #include #include - #include "mt7981.dtsi" / { @@ -28,7 +27,7 @@ stdout-path = "serial0:115200n8"; }; - memory@10000000 { + memory@40000000 { reg = <0 0x40000000 0 0x10000000>; }; @@ -102,6 +101,27 @@ }; }; +&pio { + spi0_flash_pins: spi0-pins { + mux { + function = "spi"; + groups = "spi0", "spi0_wp_hold"; + }; + + conf-pu { + pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP"; + drive-strength = <8>; + mediatek,pull-up-adv = <0>; /* bias-disable */ + }; + + conf-pd { + pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO"; + drive-strength = <8>; + mediatek,pull-up-adv = <0>; /* bias-disable */ + }; + }; +}; + &spi0 { pinctrl-names = "default"; pinctrl-0 = <&spi0_flash_pins>; @@ -116,9 +136,6 @@ spi-max-frequency = <52000000>; spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; - mediatek,nmbm; - mediatek,bmt-max-ratio = <1>; - mediatek,bmt-max-reserved-blocks = <64>; partitions { compatible = "fixed-partitions"; @@ -233,27 +250,6 @@ }; }; -&pio { - spi0_flash_pins: spi0-pins { - mux { - function = "spi"; - groups = "spi0", "spi0_wp_hold"; - }; - - conf-pu { - pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP"; - drive-strength = <8>; - mediatek,pull-up-adv = <0>; /* bias-disable */ - }; - - conf-pd { - pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO"; - drive-strength = <8>; - mediatek,pull-up-adv = <0>; /* bias-disable */ - }; - }; -}; - &uart0 { status = "okay"; };