Commit bf5fd5bf authored by Stephen Warren's avatar Stephen Warren Committed by Arnd Bergmann

ARM: tegra: fix board DT pinmux setup

Neither Tegra114 nor Tegra124 allow "low power mode" to be configured
on SDIO1 or SDIO3 drive groups. Remove the attempt to configure that
option from the Dalmore and Venice2 DTs.

The Venice2 DT contained duplicate configurations for most sdmmc1_*
pins. Remove the duplicate pins from one of the nodes, and fix the
configuration since the remaining clk pin is output-only.
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 27addb96
...@@ -715,7 +715,6 @@ drive_sdio1 { ...@@ -715,7 +715,6 @@ drive_sdio1 {
nvidia,pins = "drive_sdio1"; nvidia,pins = "drive_sdio1";
nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>; nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
nvidia,schmitt = <TEGRA_PIN_DISABLE>; nvidia,schmitt = <TEGRA_PIN_DISABLE>;
nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
nvidia,pull-down-strength = <36>; nvidia,pull-down-strength = <36>;
nvidia,pull-up-strength = <20>; nvidia,pull-up-strength = <20>;
nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_SLOW>; nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_SLOW>;
...@@ -725,7 +724,6 @@ drive_sdio3 { ...@@ -725,7 +724,6 @@ drive_sdio3 {
nvidia,pins = "drive_sdio3"; nvidia,pins = "drive_sdio3";
nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>; nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
nvidia,schmitt = <TEGRA_PIN_DISABLE>; nvidia,schmitt = <TEGRA_PIN_DISABLE>;
nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
nvidia,pull-down-strength = <22>; nvidia,pull-down-strength = <22>;
nvidia,pull-up-strength = <36>; nvidia,pull-up-strength = <36>;
nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>; nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
......
...@@ -138,14 +138,9 @@ pk0 { ...@@ -138,14 +138,9 @@ pk0 {
nvidia,enable-input = <TEGRA_PIN_ENABLE>; nvidia,enable-input = <TEGRA_PIN_ENABLE>;
}; };
sdmmc1_clk_pz0 { sdmmc1_clk_pz0 {
nvidia,pins = "sdmmc1_clk_pz0", nvidia,pins = "sdmmc1_clk_pz0";
"sdmmc1_cmd_pz1",
"sdmmc1_dat0_py7",
"sdmmc1_dat1_py6",
"sdmmc1_dat2_py5",
"sdmmc1_dat3_py4";
nvidia,function = "sdmmc1"; nvidia,function = "sdmmc1";
nvidia,enable-input = <TEGRA_PIN_ENABLE>; nvidia,enable-input = <TEGRA_PIN_DISABLE>;
nvidia,pull = <TEGRA_PIN_PULL_NONE>; nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,tristate = <TEGRA_PIN_DISABLE>; nvidia,tristate = <TEGRA_PIN_DISABLE>;
}; };
...@@ -423,7 +418,6 @@ drive_sdio1 { ...@@ -423,7 +418,6 @@ drive_sdio1 {
nvidia,pins = "drive_sdio1"; nvidia,pins = "drive_sdio1";
nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>; nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
nvidia,schmitt = <TEGRA_PIN_DISABLE>; nvidia,schmitt = <TEGRA_PIN_DISABLE>;
nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
nvidia,pull-down-strength = <32>; nvidia,pull-down-strength = <32>;
nvidia,pull-up-strength = <42>; nvidia,pull-up-strength = <42>;
nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>; nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
...@@ -433,7 +427,6 @@ drive_sdio3 { ...@@ -433,7 +427,6 @@ drive_sdio3 {
nvidia,pins = "drive_sdio3"; nvidia,pins = "drive_sdio3";
nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>; nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
nvidia,schmitt = <TEGRA_PIN_DISABLE>; nvidia,schmitt = <TEGRA_PIN_DISABLE>;
nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
nvidia,pull-down-strength = <20>; nvidia,pull-down-strength = <20>;
nvidia,pull-up-strength = <36>; nvidia,pull-up-strength = <36>;
nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>; nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment