summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/pinmux.c
diff options
context:
space:
mode:
authorRay Poudrier <rapoudrier@nvidia.com>2012-10-18 16:34:03 -0700
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-10-18 23:39:55 -0700
commit940e29b814c9188818139bc8c08d18fcca2d4b3e (patch)
tree3f11c6f4e303df1398f6d8ed521f8a0b4f80889b /arch/arm/mach-tegra/pinmux.c
parent90287c2a0de618867f0068dd0338af01b8f68f74 (diff)
ARM: tegra: pinmux: don't use new name for t11x yet
Change-Id: Ia24c3876448c03b42bd11fb32b950eb67488cb2a Signed-off-by: Ray Poudrier <rapoudrier@nvidia.com> Reviewed-on: http://git-master/r/145754 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/pinmux.c')
-rw-r--r--arch/arm/mach-tegra/pinmux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c
index 135cae69935c..c7839703b0aa 100644
--- a/arch/arm/mach-tegra/pinmux.c
+++ b/arch/arm/mach-tegra/pinmux.c
@@ -888,7 +888,7 @@ static struct of_device_id tegra_pinmux_of_match[] __devinitdata = {
{ .compatible = "nvidia,tegra30-pinmux-ctlr", tegra30_pinmux_init },
#endif
#ifdef CONFIG_ARCH_TEGRA_11x_SOC
- { .compatible = "nvidia,tegra11x-pinmux-ctlr", tegra11x_pinmux_init },
+ { .compatible = "nvidia,tegra11x-pinmux", tegra11x_pinmux_init },
#endif
{ },
};
@@ -990,7 +990,7 @@ static struct platform_device_id __devinitdata tegra_pinmux_id[] = {
.driver_data = (kernel_ulong_t)tegra30_pinmux_init, },
#endif
#ifdef CONFIG_ARCH_TEGRA_11x_SOC
- { .name = "tegra11x-pinmux-ctlr",
+ { .name = "tegra11x-pinmux",
.driver_data = (kernel_ulong_t)tegra11x_pinmux_init, },
#endif
{},