Commit 6e96aca3 authored by Stephen Warren's avatar Stephen Warren Committed by Olof Johansson

arm/tegra: Harmony PCIe: Don't touch pinmux

The Harmony pinmux table is already set up to mux the PCIe signals onto
the appropriate pin groups. Don't manually fiddle with the pinmux in the
Harmony PCIe setup code.

Merge note: This will have a merge conflict with Peter De Schrijver's
"arm/tegra: prepare pinmux code for multiple tegra variants" due to
context. When merging the two, make sure to also remove the include
of <mach/pinmux-tegra20.h> that his patch added, since it's no longer
needed after this patch.
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 1a4a30c8
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/pinmux.h>
#include "board.h" #include "board.h"
#include "board-harmony.h" #include "board-harmony.h"
...@@ -48,10 +47,6 @@ static int __init harmony_pcie_init(void) ...@@ -48,10 +47,6 @@ static int __init harmony_pcie_init(void)
regulator_enable(regulator); regulator_enable(regulator);
tegra_pinmux_set_tristate(TEGRA_PINGROUP_GPV, TEGRA_TRI_NORMAL);
tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_NORMAL);
tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_NORMAL);
err = tegra_pcie_init(true, true); err = tegra_pcie_init(true, true);
if (err) if (err)
goto err_pcie; goto err_pcie;
...@@ -59,10 +54,6 @@ static int __init harmony_pcie_init(void) ...@@ -59,10 +54,6 @@ static int __init harmony_pcie_init(void)
return 0; return 0;
err_pcie: err_pcie:
tegra_pinmux_set_tristate(TEGRA_PINGROUP_GPV, TEGRA_TRI_TRISTATE);
tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_TRISTATE);
tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_TRISTATE);
regulator_disable(regulator); regulator_disable(regulator);
regulator_put(regulator); regulator_put(regulator);
err_reg: err_reg:
......
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