diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-04-11 20:53:09 +0200 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-04-18 18:26:40 +0200 |
| commit | 52f48fe00fcad83cd5fc4c961d851a3530fe032b (patch) | |
| tree | 68fdb2a2580914f17b74374ad6b390027824c389 /arch/arm/mach-tegra | |
| parent | ARM: dt: tegra20: add pinmux to device tree (diff) | |
| download | linux-52f48fe00fcad83cd5fc4c961d851a3530fe032b.tar.xz linux-52f48fe00fcad83cd5fc4c961d851a3530fe032b.zip | |
pinctrl: tegra: refactor probe handling
Rather than having a single tegra-pinctrl driver that determines whether
it's running on Tegra20 or Tegra30, instead have separate drivers for
each that call into utility functions to implement the majority of the
driver. This change is based on review feedback of the SPEAr pinctrl
driver, which had originally copied to Tegra driver structure.
This requires that the two drivers have unique names. Update a couple
spots in arch/arm/mach-tegra for the name change.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/board-pinmux.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-pinmux.h b/arch/arm/mach-tegra/board-pinmux.h index 45b5ad8dc6de..c5f3f3381e86 100644 --- a/arch/arm/mach-tegra/board-pinmux.h +++ b/arch/arm/mach-tegra/board-pinmux.h @@ -19,7 +19,7 @@ #include <mach/pinconf-tegra.h> -#define PINMUX_DEV "tegra-pinmux" +#define PINMUX_DEV "tegra20-pinctrl" #define TEGRA_MAP_MUX(_group_, _function_) \ PIN_MAP_MUX_GROUP_HOG_DEFAULT(PINMUX_DEV, _group_, _function_) diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index 748b40cb7fcf..bd3035e0cea1 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -110,7 +110,7 @@ static struct resource pinmux_resource[] = { }; struct platform_device tegra_pinmux_device = { - .name = "tegra-pinmux", + .name = "tegra20-pinctrl", .id = -1, .resource = pinmux_resource, .num_resources = ARRAY_SIZE(pinmux_resource), |