From a22bdf7c09b9ee9288b68f830fe072742977d0ef Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Wed, 10 Jul 2024 00:16:36 +0800 Subject: [PATCH] ramips: mtk-mmc: use "cd-inverted" to set CD line polarity "cd-inverted" is an upstream documented property used to indicate the CD line is actived high. We will introduce a new upstream SDHC driver, and this change will make them compatible with each other. Signed-off-by: Shiji Yang --- target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts | 2 +- target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi | 1 - target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts | 2 +- target/linux/ramips/dts/mt7628an_minew_g1-c.dts | 2 +- target/linux/ramips/dts/mt7628an_onion_omega2.dtsi | 1 - target/linux/ramips/dts/mt7628an_widora_neo.dtsi | 1 - target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts | 2 +- target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c | 2 +- 8 files changed, 5 insertions(+), 8 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts index 940104d47e..bcd2cecb3a 100644 --- a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts +++ b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts @@ -171,5 +171,5 @@ &sdhci { status = "okay"; - mediatek,cd-high; + cd-inverted; }; diff --git a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi index 96d36f66e0..0aee4e408a 100644 --- a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi +++ b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi @@ -132,7 +132,6 @@ &sdhci { status = "okay"; - mediatek,cd-low; }; &wmac { diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts index 37b4b9baa5..fdce5cbec5 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts @@ -167,7 +167,7 @@ &sdhci { status = "okay"; - mediatek,cd-high; + cd-inverted; }; &wmac { diff --git a/target/linux/ramips/dts/mt7628an_minew_g1-c.dts b/target/linux/ramips/dts/mt7628an_minew_g1-c.dts index 3912f23a9e..603bc09fa6 100644 --- a/target/linux/ramips/dts/mt7628an_minew_g1-c.dts +++ b/target/linux/ramips/dts/mt7628an_minew_g1-c.dts @@ -151,5 +151,5 @@ &sdhci { status = "okay"; - mediatek,cd-high; + cd-inverted; }; diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi index 983c7fc03e..d279cbcfb8 100644 --- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi +++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi @@ -172,7 +172,6 @@ &sdhci { status = "okay"; - mediatek,cd-low; }; &wmac { diff --git a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi index de3b7d625e..74df529bd2 100644 --- a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi +++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi @@ -175,7 +175,6 @@ &sdhci { status = "okay"; - mediatek,cd-low; }; &wmac { diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts index 429b00c5b5..5714aaedc3 100644 --- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts +++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts @@ -168,7 +168,7 @@ &sdhci { status = "okay"; - mediatek,cd-high; + cd-inverted; }; &wmac { diff --git a/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c index 756a1c5b57..3a9c69cb37 100644 --- a/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c +++ b/target/linux/ramips/files/drivers/mmc/host/mtk-mmc/sd.c @@ -2245,7 +2245,7 @@ static int msdc_drv_probe(struct platform_device *pdev) //TODO: read this as bus-width from dt (via mmc_of_parse) mmc->caps |= MMC_CAP_4_BIT_DATA; - cd_active_low = !of_property_read_bool(pdev->dev.of_node, "mediatek,cd-high"); + cd_active_low = !of_property_read_bool(pdev->dev.of_node, "cd-inverted"); if (of_property_read_bool(pdev->dev.of_node, "mediatek,cd-poll")) mmc->caps |= MMC_CAP_NEEDS_POLL; -- 2.30.2