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 <yangshiji66@qq.com>

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 940104d47eea69e1db6e2cabbe875078b9ab5a23..bcd2cecb3a2e75721c3f701a14233ec4cb8c1c97 100644 (file)
--- 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 96d36f66e079084a01e736a7c790da0099406e24..0aee4e408a77608fdfa888a54360dec347666f84 100644 (file)
--- 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 37b4b9baa5c3f7f882c31dbc63879b91d70c1e1d..fdce5cbec5ee3fc167cf4603562ee8d377a08447 100644 (file)
--- 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 3912f23a9e224706a2d1a876d7f190ac80ed67ff..603bc09fa6ee6c8ffa5814f8cf828f9d37de8623 100644 (file)
--- 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 983c7fc03e9e6c526aa02f6985727e37189312a4..d279cbcfb8e81ada5e215ea325d593b9395158d6 100644 (file)
--- 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 de3b7d625ef430498d2119eef869fadd1e05b374..74df529bd2201bba86ce3957e9577a0bf3651447 100644 (file)
--- 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 429b00c5b5697db50ea081019b03e3fdbdcb5f76..5714aaedc385534dd19127171e3a0c5b265d2b47 100644 (file)
--- 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 756a1c5b57b0e8a273ad20721028c700f6597b11..3a9c69cb378fdc38242b0b17d230fe7a493f4e97 100644 (file)
--- 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;