diff options
| author | Olof Johansson <olof@lixom.net> | 2011-11-09 13:38:52 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-11-09 13:38:52 -0800 |
| commit | 3c52b2be1804ed553df8df47213b58fedc93c5ab (patch) | |
| tree | a0186a1012a49ae81bf6b69f4fdc00fb6a854003 /arch/arm/mach-tegra/board-harmony-pinmux.c | |
| parent | c30c8f9f167cb9b40ca9e755c0d32087a2d415ff (diff) | |
| parent | 686448d7a253f9db836f4f44c6624461570e5026 (diff) | |
Merge branch 'for-3.2/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into fixes
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony-pinmux.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-harmony-pinmux.c b/arch/arm/mach-tegra/board-harmony-pinmux.c index e99b45618cd..7a4a26d5174 100644 --- a/arch/arm/mach-tegra/board-harmony-pinmux.c +++ b/arch/arm/mach-tegra/board-harmony-pinmux.c @@ -16,6 +16,8 @@ #include <linux/kernel.h> #include <linux/gpio.h> +#include <linux/of.h> + #include <mach/pinmux.h> #include "gpio-names.h" @@ -161,7 +163,9 @@ static struct tegra_gpio_table gpio_table[] = { void harmony_pinmux_init(void) { - platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices)); + if (!of_machine_is_compatible("nvidia,tegra20")) + platform_add_devices(pinmux_devices, + ARRAY_SIZE(pinmux_devices)); tegra_pinmux_config_table(harmony_pinmux, ARRAY_SIZE(harmony_pinmux)); |