diff options
| author | Pritesh Raithatha <praithatha@nvidia.com> | 2012-10-16 12:04:05 +0530 |
|---|---|---|
| committer | Mrutyunjay Sawant <msawant@nvidia.com> | 2012-10-18 03:53:38 -0700 |
| commit | 90287c2a0de618867f0068dd0338af01b8f68f74 (patch) | |
| tree | a2db58bfad115dc0481378c5563ff19aea371477 /arch/arm/mach-tegra/pinmux.c | |
| parent | abf2d41cbe301beb95ffc1fc75d575fa5ae2b78a (diff) | |
arm: tegra: rename pinmux device/driver name
To avoid confusion/conflict with dt pinmux driver, rename internal
pinmux device/driver name.
Bug 1003210
Change-Id: I7f061a893ad75727475cc9bf3436779a9b11047f
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Reviewed-on: http://git-master/r/144786
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/pinmux.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c index d02bf9593ab7..135cae69935c 100644 --- a/arch/arm/mach-tegra/pinmux.c +++ b/arch/arm/mach-tegra/pinmux.c @@ -882,13 +882,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", tegra20_pinmux_init }, + { .compatible = "nvidia,tegra20-pinmux-ctlr", tegra20_pinmux_init }, #endif #ifdef CONFIG_ARCH_TEGRA_3x_SOC - { .compatible = "nvidia,tegra30-pinmux", tegra30_pinmux_init }, + { .compatible = "nvidia,tegra30-pinmux-ctlr", tegra30_pinmux_init }, #endif #ifdef CONFIG_ARCH_TEGRA_11x_SOC - { .compatible = "nvidia,tegra11x-pinmux", tegra11x_pinmux_init }, + { .compatible = "nvidia,tegra11x-pinmux-ctlr", tegra11x_pinmux_init }, #endif { }, }; @@ -982,15 +982,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", + { .name = "tegra20-pinmux-ctlr", .driver_data = (kernel_ulong_t)tegra20_pinmux_init, }, #endif #ifdef CONFIG_ARCH_TEGRA_3x_SOC - { .name = "tegra30-pinmux", + { .name = "tegra30-pinmux-ctlr", .driver_data = (kernel_ulong_t)tegra30_pinmux_init, }, #endif #ifdef CONFIG_ARCH_TEGRA_11x_SOC - { .name = "tegra11x-pinmux", + { .name = "tegra11x-pinmux-ctlr", .driver_data = (kernel_ulong_t)tegra11x_pinmux_init, }, #endif {}, @@ -998,7 +998,7 @@ static struct platform_device_id __devinitdata tegra_pinmux_id[] = { static struct platform_driver tegra_pinmux_driver = { .driver = { - .name = "tegra-pinmux", + .name = "tegra-pinmux-ctlr", .owner = THIS_MODULE, .of_match_table = tegra_pinmux_of_match, }, |