xilinx: Add cap-mmc-hw-reset and no-sd, no-sdio property to eMMC

Add "cap-mmc-hw-reset" property to the eMMC DT node to perform the
eMMC device hardware reset.
Also, add "no-sd", "no-sdio" properties to eMMC DT node to skip
unwanted sd, sdio related commands during initialization for eMMC
device as this may lead to unnecessary register dump.

Signed-off-by: Paul Alvin <alvin.paulp@amd.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/b31554816a3378365143e9f5c266f6386af0a438.1727247785.git.michal.simek@amd.com

diff --git a/arch/arm/dts/versal-mini-emmc0.dts b/arch/arm/dts/versal-mini-emmc0.dts
index b98ed16..179060c 100644 (file)
--- a/arch/arm/dts/versal-mini-emmc0.dts
+++ b/arch/arm/dts/versal-mini-emmc0.dts
@@ -40,6 +40,9 @@
                        status = "okay";
                        non-removable;
                        disable-wp;
+                       no-sd;
+                       no-sdio;
+                       cap-mmc-hw-reset;
                        bus-width = <8>;
                        reg = <0x0 0xf1040000 0x0 0x10000>;
                        clock-names = "clk_xin", "clk_ahb";

diff --git a/arch/arm/dts/versal-mini-emmc1.dts b/arch/arm/dts/versal-mini-emmc1.dts
index e6a5c2b..ffcc333 100644 (file)
--- a/arch/arm/dts/versal-mini-emmc1.dts
+++ b/arch/arm/dts/versal-mini-emmc1.dts
@@ -40,6 +40,9 @@
                        status = "okay";
                        non-removable;
                        disable-wp;
+                       no-sd;
+                       no-sdio;
+                       cap-mmc-hw-reset;
                        bus-width = <8>;
                        reg = <0x0 0xf1050000 0x0 0x10000>;
                        clock-names = "clk_xin", "clk_ahb";

diff --git a/arch/arm/dts/versal-net-mini-emmc.dts b/arch/arm/dts/versal-net-mini-emmc.dts
index e200fb6..20e4e29 100644 (file)
--- a/arch/arm/dts/versal-net-mini-emmc.dts
+++ b/arch/arm/dts/versal-net-mini-emmc.dts
@@ -54,6 +54,9 @@
                        status = "okay";
                        non-removable;
                        disable-wp;
+                       no-sd;
+                       no-sdio;
+                       cap-mmc-hw-reset;
                        bus-width = <8>;
                        reg = <0 0xf1050000 0 0x10000>;
                        clock-names = "clk_xin", "clk_ahb";

diff --git a/arch/arm/dts/zynq-dlc20-rev1.0.dts b/arch/arm/dts/zynq-dlc20-rev1.0.dts
index 8d00737..8031488 100644 (file)
--- a/arch/arm/dts/zynq-dlc20-rev1.0.dts
+++ b/arch/arm/dts/zynq-dlc20-rev1.0.dts
@@ -83,6 +83,9 @@
        bootph-all;
        status = "okay"; /* EMMC MTFC4GACAJCN - MIO40-MIO45 */
        non-removable;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <4>;
 };
 

diff --git a/arch/arm/dts/zynq-minized.dts b/arch/arm/dts/zynq-minized.dts
index 96d2937..a8f3450 100644 (file)
--- a/arch/arm/dts/zynq-minized.dts
+++ b/arch/arm/dts/zynq-minized.dts
@@ -92,6 +92,9 @@
 &sdhci1 {
        status = "okay";
        non-removable;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <4>;
        max-frequency = <12000000>;
 

diff --git a/arch/arm/dts/zynqmp-dlc21-revA.dts b/arch/arm/dts/zynqmp-dlc21-revA.dts
index 293d8e9..d540f33 100644 (file)
--- a/arch/arm/dts/zynqmp-dlc21-revA.dts
+++ b/arch/arm/dts/zynqmp-dlc21-revA.dts
@@ -60,6 +60,9 @@
        status = "okay";
        non-removable;
        disable-wp;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <8>;
        xlnx,mio-bank = <0>;
 };

diff --git a/arch/arm/dts/zynqmp-g-a2197-00-revA.dts b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
index c439f77..6ef8b14 100644 (file)
--- a/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
+++ b/arch/arm/dts/zynqmp-g-a2197-00-revA.dts
@@ -68,6 +68,9 @@
        status = "okay";
        non-removable;
        disable-wp;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <8>;
        xlnx,mio-bank = <0>;
 };

diff --git a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
index d6cd193..c597adb 100644 (file)
--- a/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
+++ b/arch/arm/dts/zynqmp-m-a2197-01-revA.dts
@@ -88,6 +88,9 @@
        status = "okay";
        non-removable;
        disable-wp;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <8>;
        xlnx,mio-bank = <0>; /* FIXME tap delay */
 };

diff --git a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
index 902fdd4..eefe5ab 100644 (file)
--- a/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
+++ b/arch/arm/dts/zynqmp-m-a2197-02-revA.dts
@@ -84,6 +84,9 @@
        status = "okay";
        non-removable;
        disable-wp;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <8>;
        xlnx,mio-bank = <0>; /* FIXME tap delay */
 };

diff --git a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
index f3994bc..7ea4eab 100644 (file)
--- a/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
+++ b/arch/arm/dts/zynqmp-m-a2197-03-revA.dts
@@ -84,6 +84,9 @@
        status = "okay";
        non-removable;
        disable-wp;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <8>;
        xlnx,mio-bank = <0>; /* FIXME tap delay */
 };

diff --git a/arch/arm/dts/zynqmp-mini-emmc0.dts b/arch/arm/dts/zynqmp-mini-emmc0.dts
index cf22197..ad4b3c5 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-emmc0.dts
+++ b/arch/arm/dts/zynqmp-mini-emmc0.dts
@@ -52,6 +52,9 @@
                        compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
                        status = "disabled";
                        non-removable;
+                       no-sd;
+                       no-sdio;
+                       cap-mmc-hw-reset;
                        bus-width = <8>;
                        reg = <0x0 0xff160000 0x0 0x1000>;
                        clock-names = "clk_xin", "clk_ahb";

diff --git a/arch/arm/dts/zynqmp-mini-emmc1.dts b/arch/arm/dts/zynqmp-mini-emmc1.dts
index 4c9f56a..fd421b4 100644 (file)
--- a/arch/arm/dts/zynqmp-mini-emmc1.dts
+++ b/arch/arm/dts/zynqmp-mini-emmc1.dts
@@ -52,6 +52,9 @@
                        compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
                        status = "disabled";
                        non-removable;
+                       no-sd;
+                       no-sdio;
+                       cap-mmc-hw-reset;
                        bus-width = <8>;
                        reg = <0x0 0xff170000 0x0 0x1000>;
                        clock-names = "clk_xin", "clk_ahb";

diff --git a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
index ae52e8e..f93167c 100644 (file)
--- a/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
+++ b/arch/arm/dts/zynqmp-p-a2197-00-revA.dts
@@ -60,6 +60,9 @@
        status = "okay";
        non-removable;
        disable-wp;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <8>;
        xlnx,mio-bank = <0>;
 };

diff --git a/arch/arm/dts/zynqmp-sc-revB.dts b/arch/arm/dts/zynqmp-sc-revB.dts
index 1fcb5bf..1af3f64 100644 (file)
--- a/arch/arm/dts/zynqmp-sc-revB.dts
+++ b/arch/arm/dts/zynqmp-sc-revB.dts
@@ -288,6 +288,9 @@
        status = "okay";
        non-removable;
        disable-wp;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <8>;
        xlnx,mio-bank = <0>;
 };

diff --git a/arch/arm/dts/zynqmp-sm-k26-revA.dts b/arch/arm/dts/zynqmp-sm-k26-revA.dts
index d95a05e..8056f6b 100644 (file)
--- a/arch/arm/dts/zynqmp-sm-k26-revA.dts
+++ b/arch/arm/dts/zynqmp-sm-k26-revA.dts
@@ -247,6 +247,9 @@
        pinctrl-0 = <&pinctrl_sdhci0_default>;
        non-removable;
        disable-wp;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <8>;
        xlnx,mio-bank = <0>;
        assigned-clock-rates = <187498123>;

diff --git a/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts b/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts
index 0d96c6f..2037686 100644 (file)
--- a/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts
+++ b/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts
@@ -93,6 +93,9 @@
        status = "okay";
        non-removable;
        disable-wp; /* We don't have a write-protect detection */
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <8>;
        xlnx,mio-bank = <0>;
 };

diff --git a/arch/arm/dts/zynqmp-vpk120-revA.dts b/arch/arm/dts/zynqmp-vpk120-revA.dts
index 4768fac..f281c7f 100644 (file)
--- a/arch/arm/dts/zynqmp-vpk120-revA.dts
+++ b/arch/arm/dts/zynqmp-vpk120-revA.dts
@@ -105,6 +105,9 @@
        status = "okay";
        non-removable;
        disable-wp;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        bus-width = <8>;
        xlnx,mio-bank = <0>;
 };

diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts
index c594506..c905136 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu100-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu100-revC.dts
@@ -509,6 +509,9 @@
        xlnx,mio-bank = <0>;
        non-removable;
        disable-wp;
+       no-sd;
+       no-sdio;
+       cap-mmc-hw-reset;
        cap-power-off-card;
        mmc-pwrseq = <&sdio_pwrseq>;
        vqmmc-supply = <&wmmcsdio_fixed>;