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 b98ed16bc5ff907ccc959c167539234be52690c8..179060c56eeeddc2a86bf5f38a7efd34f9ca63fc 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 e6a5c2b699e0eaaf44f1b1bf0b8b463a45d2053e..ffcc33345296598e5b03800d9255db1660428f65 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 e200fb694c6b6ee421c7b65a5467607a20bd2b2f..20e4e2994048e6ed4e09506b0a4b89aa9019f100 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 8d00737803368fc33d8102a8c12b53c819b3f98f..8031488d17a54270c7cfdd4710388550c3a0ebc9 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 96d2937de8bff21aa799179d3d07b37eba6723ee..a8f345032eafa7168c31bb6a8a27fec5baeb00d0 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 293d8e97b63ab3c1790f3534df828b6f007c66dc..d540f334f511603283f08ac7e187006010695f13 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 c439f778ca4604758294ff849262251e0a4b7b0d..6ef8b1462eb25b2b8004d52cce1bae25cf5d872f 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 d6cd193a4490ad27778899cacf33ae4765ab3f2a..c597adb80cb2e0b484813075c7292767cfc56e07 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 902fdd4de6cc6e84d1094a35c2a32c33d595e42c..eefe5ab61e77a446d93cdd965da7f98bafbf2080 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 f3994bca4a08ff381368d0ef3899aca15e61c513..7ea4eab6a376dc0de2e16d4a092ace5388729f17 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 cf2219797a585077fffa75f7e5822908ee3f969a..ad4b3c5f8b1dbbf17f12a8e602a82917b3c7dbc5 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 4c9f56a807635785a2311a5330a344a0468489fc..fd421b4fe7eddcaac8ba67d81178dac1aa623989 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 ae52e8e996a522ef5b72867bc5ccb4c80576e0da..f93167c412844b1442d3db918ca97bf522590e49 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 1fcb5bfb9286c50a340e0cae7bbb83f07c124d3d..1af3f643567e1d0b19307e81e4374a132b03632f 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 d95a05e215920bd9bc1a1162d7c9a213fed5204c..8056f6b176edbd3f1f7506ac8e69206e9bc6c63e 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 0d96c6f9f041e137d7177f5a9b1bf8a87b52a17a..2037686b9b4524cd7e18d0074d94aea3114e2c48 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 4768fac71d023bcead454f2ff3976e86b2238620..f281c7fb9fddf75cdf09bfb833f9a5e536056f79 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 c5945067cd5729f4423b52215c692361e45931ca..c9051360931b71e27f1360d23910430209a09b5f 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>;