ARM64: DT: tegra210: sdhci: remove max volt limit node

- Removed "limit-vddio-max-volt" dt entry from sdhci
to support SD2.0 (which runs at 3.3V) on A01Q chips
- Added is-sd-device entry in sdhci DT to identify
SD devices

Bug 200056821

Change-Id: I847946f03c684b968da0315922d552c83c38342c
Signed-off-by: R Raj Kumar <rrajk@nvidia.com>
Reviewed-on: http://git-master/r/655177
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>

diff --git a/Documentation/devicetree/bindings/mmc/sdhci-tegra.txt b/Documentation/devicetree/bindings/mmc/sdhci-tegra.txt
index bc029a4a334e2a7a07274bd7cc1f6fa4ce88a1a8..f3eec9987487790eb14e7558b41f7161343a3228 100644 (file)
--- a/Documentation/devicetree/bindings/mmc/sdhci-tegra.txt
+++ b/Documentation/devicetree/bindings/mmc/sdhci-tegra.txt
@@ -52,6 +52,7 @@ in HS400 mode.
 - nvidia,disable-auto-cal: This flag when set will disable auto calibration
 - nvidia,en-io-trim-volt: Enable IO trimmer voltage
 - nvidia,is-emmc: Enable this flag for eMMC devices
+- nvidia,sd-device: Enable this flag for SD devices
 - nvidia,enable-ext-loopback: flag when set, enables external loopback
 - nvidia,limit-vddio-max-volt: enable this flag for sdmmc1/3 if it has Vddio 3.3v support.
 - nvidia,enable-hs533-mode: Set this Flag toenable HS533 mode.

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-loki-sdhci.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-loki-sdhci.dtsi
index bded4f1cb84552a74f852ca7bb788ccf07e0642d..3e94835c4bcf1d43d8e6022af239c35a631e7e14 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-loki-sdhci.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-loki-sdhci.dtsi
@@ -96,6 +96,6 @@
                pinctrl-3 = <&sdmmc1_clk_schmitt_disable_state>;
                nvidia,en-io-trim-volt;
                nvidia,update-pinctrl-settings;
-               nvidia,limit-vddio-max-volt;
+               nvidia,sd-device;
        };
 };

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-sdhci-p2530-0930.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-sdhci-p2530-0930.dtsi
index d65ef2e93813710224812527590cc28c735cf542..f2e0a7f5d693bc60ac4644a9534c876288f9d76a 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-sdhci-p2530-0930.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-sdhci-p2530-0930.dtsi
@@ -81,6 +81,6 @@
                compad-vref-1v8 = <0x2>;
                cd-gpios = <&gpio TEGRA_GPIO_PZ1 0>;
                nvidia,en-io-trim-volt;
-               nvidia,limit-vddio-max-volt;
+               nvidia,sd-device;
        };
 };

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-sdhci.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-sdhci.dtsi
index 6526e944ef07b41932c9b9fbdc47a35646597ff5..4f37b730669741f191c70c42928f7388dc6119ce 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-sdhci.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-sdhci.dtsi
@@ -58,7 +58,6 @@
                pinctrl-1 = <&sdmmc3_schmitt_disable_state>;
                pinctrl-2 = <&sdmmc3_clk_schmitt_enable_state>;
                pinctrl-3 = <&sdmmc3_clk_schmitt_disable_state>;
-               nvidia,limit-vddio-max-volt;
                pll_source = "pll_p";
                nvidia,en-io-trim-volt;
                nvidia,enable-ext-loopback;
@@ -104,8 +103,8 @@
                pinctrl-1 = <&sdmmc1_schmitt_disable_state>;
                pinctrl-2 = <&sdmmc1_clk_schmitt_enable_state>;
                pinctrl-3 = <&sdmmc1_clk_schmitt_disable_state>;
-               nvidia,limit-vddio-max-volt;
                pll_source = "pll_p";
                nvidia,en-io-trim-volt;
+               nvidia,sd-device;
        };
 };