summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/pinmux.c
diff options
context:
space:
mode:
authorPritesh Raithatha <praithatha@nvidia.com>2012-10-19 15:00:47 +0530
committerMrutyunjay Sawant <msawant@nvidia.com>2012-11-02 05:31:48 -0700
commit199476556e48427db181515ef7963dd9a4fc2612 (patch)
tree54bd9852c98117f16756b8bd9b4f634969395dc8 /arch/arm/mach-tegra/pinmux.c
parent8655b09cfcf71bdb7a8b679de5041b0357f749c4 (diff)
arm: tegra: rename pinmux device/driver name
rename all tegra pinmux device/driver with similar names. platform device name has size limit of 20 char. Bug 1003210 Change-Id: Idd162fad662a364812010630856c1657b9af9c35 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/145910 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'arch/arm/mach-tegra/pinmux.c')
-rw-r--r--arch/arm/mach-tegra/pinmux.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c
index 4eb5f96b4108..15c0d5f939dd 100644
--- a/arch/arm/mach-tegra/pinmux.c
+++ b/arch/arm/mach-tegra/pinmux.c
@@ -2,7 +2,7 @@
* linux/arch/arm/mach-tegra/pinmux.c
*
* Copyright (C) 2010 Google, Inc.
- * Copyright (C) 2011 NVIDIA Corporation.
+ * Copyright (C) 2011-2012 NVIDIA Corporation. All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -916,13 +916,13 @@ void tegra_pinmux_config_pullupdown_table(const struct tegra_pingroup_config *co
static struct of_device_id tegra_pinmux_of_match[] __devinitdata = {
#ifdef CONFIG_ARCH_TEGRA_2x_SOC
- { .compatible = "nvidia,tegra20-pinmux-ctlr", tegra20_pinmux_init },
+ { .compatible = "nvidia,tegra20-pinmux-ctl", tegra20_pinmux_init },
#endif
#ifdef CONFIG_ARCH_TEGRA_3x_SOC
- { .compatible = "nvidia,tegra30-pinmux-ctlr", tegra30_pinmux_init },
+ { .compatible = "nvidia,tegra30-pinmux-ctl", tegra30_pinmux_init },
#endif
#ifdef CONFIG_ARCH_TEGRA_11x_SOC
- { .compatible = "nvidia,tegra11x-pinmux", tegra11x_pinmux_init },
+ { .compatible = "nvidia,tegra11x-pinmux-ctl", tegra11x_pinmux_init },
#endif
{ },
};
@@ -1016,15 +1016,15 @@ static int __devinit tegra_pinmux_probe(struct platform_device *pdev)
static struct platform_device_id __devinitdata tegra_pinmux_id[] = {
#ifdef CONFIG_ARCH_TEGRA_2x_SOC
- { .name = "tegra20-pinmux-ctlr",
+ { .name = "tegra20-pinmux-ctl",
.driver_data = (kernel_ulong_t)tegra20_pinmux_init, },
#endif
#ifdef CONFIG_ARCH_TEGRA_3x_SOC
- { .name = "tegra30-pinmux-ctlr",
+ { .name = "tegra30-pinmux-ctl",
.driver_data = (kernel_ulong_t)tegra30_pinmux_init, },
#endif
#ifdef CONFIG_ARCH_TEGRA_11x_SOC
- { .name = "tegra11x-pinmux",
+ { .name = "tegra11x-pinmux-ctl",
.driver_data = (kernel_ulong_t)tegra11x_pinmux_init, },
#endif
{},
@@ -1032,7 +1032,7 @@ static struct platform_device_id __devinitdata tegra_pinmux_id[] = {
static struct platform_driver tegra_pinmux_driver = {
.driver = {
- .name = "tegra-pinmux-ctlr",
+ .name = "tegra-pinmux-ctl",
.owner = THIS_MODULE,
.of_match_table = tegra_pinmux_of_match,
},