ARM: tegra: beaver: Remove invalid uses of rsvd1

Remove invalid uses of rsvd1 from Beaver device tree. Replace by actual
function names of pinmux option 1.

Taken from https://github.com/NVIDIA/tegra-pinmux-scripts commit
b0aceda108c0 ("remove invalid uses of rsvd1 from beaver config").

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index 36b85a0..ae52a50 100644 (file)
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -260,14 +260,14 @@
                        };
                        sdmmc3_dat6_pd3 {
                                nvidia,pins = "sdmmc3_dat6_pd3";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "spdif";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                        };
                        sdmmc3_dat7_pd4 {
                                nvidia,pins = "sdmmc3_dat7_pd4";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "spdif";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -281,14 +281,14 @@
                        };
                        vi_vsync_pd6 {
                                nvidia,pins = "vi_vsync_pd6";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "ddr";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                        };
                        vi_hsync_pd7 {
                                nvidia,pins = "vi_hsync_pd7";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "ddr";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -806,7 +806,7 @@
                        };
                        hdmi_int_pn7 {
                                nvidia,pins = "hdmi_int_pn7";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "hdmi";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -841,7 +841,7 @@
                        };
                        ulpi_data3_po4 {
                                nvidia,pins = "ulpi_data3_po4";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "uarta";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1107,21 +1107,21 @@
                        };
                        vi_d10_pt2 {
                                nvidia,pins = "vi_d10_pt2";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "ddr";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                        };
                        vi_d11_pt3 {
                                nvidia,pins = "vi_d11_pt3";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "ddr";
                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                        };
                        vi_d0_pt4 {
                                nvidia,pins = "vi_d0_pt4";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "ddr";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1151,7 +1151,7 @@
                        };
                        pu0 {
                                nvidia,pins = "pu0";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "owr";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1172,7 +1172,7 @@
                        };
                        pu3 {
                                nvidia,pins = "pu3";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "pwm0";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1193,7 +1193,7 @@
                        };
                        pu6 {
                                nvidia,pins = "pu6";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "pwm3";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1221,7 +1221,7 @@
                        };
                        pv3 {
                                nvidia,pins = "pv3";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "clk_12m_out";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
@@ -1510,7 +1510,7 @@
                        };
                        pbb0 {
                                nvidia,pins = "pbb0";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "i2s4";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1575,7 +1575,7 @@
                        };
                        pcc1 {
                                nvidia,pins = "pcc1";
-                               nvidia,function = "rsvd1";
+                               nvidia,function = "i2s4";
                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;